Skip to content

Commit

Permalink
fix: fix macos style error
Browse files Browse the repository at this point in the history
  • Loading branch information
Pylogmon committed Aug 29, 2023
1 parent 01624ef commit 1c0e53f
Show file tree
Hide file tree
Showing 7 changed files with 8 additions and 22 deletions.
2 changes: 1 addition & 1 deletion build.sh
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# pnpm install --resolution-only
pnpm install
pnpm prettier --write .
sed -i "s/#openssl/openssl={version=\"0.10.55\",features=[\"vendore"]}/g" src-tauri/Cargo.toml
pnpm tauri build --target $INPUT_TARGET -b deb
cd src-tauri/target/$INPUT_TARGET/release/bundle/deb
11 changes: 0 additions & 11 deletions src-tauri/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion src-tauri/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ window-shadows = "0.2"
window-vibrancy = "0.4.0"

[target.'cfg(target_os = "linux")'.dependencies]
openssl = {version="0.10.55",features = ["vendored"] }
#openssl

[features]
# this feature is used for production builds or when `devPath` points to the filesystem
Expand Down
7 changes: 2 additions & 5 deletions src-tauri/src/tray.rs
Original file line number Diff line number Diff line change
Expand Up @@ -134,11 +134,8 @@ fn on_check_update_click() {
updater_window();
}
fn on_view_log_click(app: &AppHandle) {
use dirs::config_dir;

let config_path = config_dir().unwrap();
let config_path = config_path.join(app.config().tauri.bundle.identifier.clone());
let log_path = config_path.join("logs");
use tauri::api::path::app_log_dir;
let log_path = app_log_dir(&app.config()).unwrap();
tauri::api::shell::open(&app.shell_scope(), log_path.to_str().unwrap(), None).unwrap();
}
fn on_restart_click(app: &AppHandle) {
Expand Down
2 changes: 2 additions & 0 deletions src/window/Translate/components/SourceArea/index.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -106,12 +106,14 @@ export default function SourceArea() {
<CardBody className='bg-content1 p-0'>
<Textarea
autoFocus
fullWidth
variant='bordered'
minRows={1}
value={sourceText}
classNames={{
inputWrapper: 'border-0',
label: 'hidden',
helperWrapper: 'hidden',
}}
onKeyDown={keyDown}
onValueChange={(v) => {
Expand Down
4 changes: 1 addition & 3 deletions src/window/Translate/index.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -77,9 +77,7 @@ export default function Translate() {
className='fixed top-[5px] left-[5px] right-[5px] h-[30px]'
data-tauri-drag-region='true'
/>
<div
className={`px-[8px] h-[35px] w-full flex ${osType === 'Darwin' ? 'justify-right' : 'justify-between'}`}
>
<div className={`px-[8px] h-[35px] w-full flex ${osType === 'Darwin' ? 'justify-end' : 'justify-between'}`}>
<Button
isIconOnly
size='sm'
Expand Down
2 changes: 1 addition & 1 deletion src/window/Updater/index.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ export default function Updater() {
<div className='p-[5px] h-[35px] w-full'>
<div
data-tauri-drag-region='true'
className='h-full w-full flex'
className={`h-full w-full flex ${osType === 'Darwin' ? 'justify-end' : 'justify-start'}`}
>
<img
src='icon.png'
Expand Down

0 comments on commit 1c0e53f

Please sign in to comment.