This commit is contained in:
Vanessa 2022-10-14 12:13:38 +08:00
parent b6b0f0c7b4
commit cef2072d92
5 changed files with 43 additions and 28 deletions

View file

@ -86,8 +86,10 @@ try {
}
} catch (e) {
console.error(e)
require('electron').dialog.showErrorBox('创建配置目录失败 Failed to create config directory',
'思源需要在用户家目录下创建配置文件夹(~/.config/siyuan请确保该路径具有写入权限。\n\nSiYuan needs to create a configuration folder (~/.config/siyuan) in the user\'s home directory. Please make sure that the path has write permissions.')
require('electron').
dialog.
showErrorBox('创建配置目录失败 Failed to create config directory',
'思源需要在用户家目录下创建配置文件夹(~/.config/siyuan请确保该路径具有写入权限。\n\nSiYuan needs to create a configuration folder (~/.config/siyuan) in the user\'s home directory. Please make sure that the path has write permissions.')
app.exit()
}
@ -179,6 +181,7 @@ const boot = () => {
y,
fullscreenable: true,
fullscreen: windowState.fullscreen,
trafficLightPosition: {x: 13, y: 13},
webPreferences: {
nodeIntegration: true,
nativeWindowOpen: true,
@ -464,7 +467,7 @@ const boot = () => {
label: 'Reset Window on restart',
type: 'checkbox',
click: v => {
resetWindowStateOnRestart = v.checked;
resetWindowStateOnRestart = v.checked
},
},
{

View file

@ -229,9 +229,9 @@
}
.dock {
height: 30px;
height: 42px;
display: flex;
padding: 0 30px;
padding: 0 42px;
user-select: none;
background-color: var(--b3-theme-surface);
@ -250,21 +250,19 @@
}
svg {
height: 16px;
width: 16px;
height: 18px;
width: 18px;
}
&--vertical {
width: 30px;
width: 42px;
flex-direction: column;
height: 100%;
padding: 0;
.dock__item {
margin: 8px 3px;
&[data-index="0"]:after {
top: -26px;
top: -32px;
bottom: auto;
}
@ -275,11 +273,11 @@
}
&__item {
padding: 4px;
padding: 7px;
color: var(--b3-theme-on-surface-light);
display: flex;
border-radius: 2px;
margin: 3px 8px;
border-radius: 4px;
margin: 5px;
&:hover {
color: var(--b3-theme-on-background);

View file

@ -8,6 +8,12 @@
}
::-webkit-scrollbar-thumb {
background-color: var(--b3-scroll-color);
border-radius: 4px;
box-sizing: content-box;
border: 3px solid transparent;
border-radius: 1024px;
box-shadow: inset 0 0 6px 6px var(--b3-scroll-color);
&:hover {
border-width: 1.5px;
}
}

View file

@ -161,9 +161,9 @@ progressLoading: 400
.toolbar {
background-color: var(--b3-theme-surface);
box-sizing: border-box;
height: 22px;
height: 42px;
line-height: 22px;
padding-left: 70px;
padding-left: 84px;
&--browser {
padding-left: 0;
@ -178,26 +178,25 @@ progressLoading: 400
#drag {
-webkit-app-region: drag;
font-size: 12px;
font-size: 14px;
color: var(--b3-theme-on-surface);
user-select: none;
text-align: center;
white-space: nowrap;
align-self: center;
}
&__item {
flex-shrink: 0;
cursor: pointer;
color: var(--b3-theme-on-surface);
padding: 2px;
padding: 12px;
box-sizing: border-box;
transition: var(--b3-transition);
display: flex;
align-self: center;
background-color: transparent;
border: 0;
border-radius: 2px;
margin: 0 8px;
flex-shrink: 0;
&:hover,
&--active {
@ -206,8 +205,8 @@ progressLoading: 400
}
svg {
height: 14px;
width: 14px;
height: 18px;
width: 18px;
}
&--disabled,
@ -242,10 +241,19 @@ progressLoading: 400
.status {
background-color: var(--b3-theme-surface);
box-sizing: border-box;
height: 22px;
line-height: 22px;
height: 32px;
line-height: 32px;
z-index: 2;
.toolbar__item {
padding: 9px;
svg {
height: 14px;
width: 14px;
}
}
&__msg {
font-size: 12px;
color: var(--b3-theme-on-surface);

View file

@ -21,7 +21,7 @@ export const initStatus = () => {
<svg>
<use xlink:href="#${window.siyuan.config.uiLayout.hideDock ? "iconDock" : "iconHideDock"}"></use>
</svg>
<div class="b3-menu fn__none" style="bottom: 21px;left: 4px">
<div class="b3-menu fn__none" style="bottom: 32px;left: 9px">
${menuHTML}
</div>
</div>