Andreas/siyuan
1
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2025-12-19 16:10:12 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

💄 top

Browse source
This commit is contained in:
Vanessa 2022-10-19 09:53:08 +08:00
parent 2e160b93fd
commit ec08b13224
3 changed files with 14 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/electron/main.js
View file

@ -181,7 +181,7 @@ const boot = () => {
y, y,
fullscreenable: true, fullscreenable: true,
fullscreen: windowState.fullscreen, fullscreen: windowState.fullscreen,
trafficLightPosition: {x: 13, y: 13}, trafficLightPosition: {x: 8, y: 8},
webPreferences: { webPreferences: {
nodeIntegration: true, nodeIntegration: true,
nativeWindowOpen: true, nativeWindowOpen: true,

28
app/src/assets/scss/base.scss
View file

@ -99,8 +99,7 @@ progressLoading: 400
border-radius: 0; border-radius: 0;
& > .protyle-breadcrumb { & > .protyle-breadcrumb {
padding-left: 84px; padding-left: 69px;
height: 42px;
} }
} }
@ -161,9 +160,9 @@ progressLoading: 400
.toolbar { .toolbar {
background-color: var(--b3-toolbar-background); background-color: var(--b3-toolbar-background);
box-sizing: border-box; box-sizing: border-box;
height: 42px; height: 32px;
line-height: 22px; line-height: 32px;
padding-left: 84px; padding-left: 69px;
border-bottom: .5px solid var(--b3-border-color); border-bottom: .5px solid var(--b3-border-color);
&--browser { &--browser {
@ -183,7 +182,6 @@ progressLoading: 400
#drag { #drag {
-webkit-app-region: drag; -webkit-app-region: drag;
font-size: 14px;
color: var(--b3-toolbar-color); color: var(--b3-toolbar-color);
user-select: none; user-select: none;
text-align: center; text-align: center;
@ -195,7 +193,7 @@ progressLoading: 400
flex-shrink: 0; flex-shrink: 0;
cursor: pointer; cursor: pointer;
color: var(--b3-toolbar-color); color: var(--b3-toolbar-color);
padding: 12px; padding: 9px;
box-sizing: border-box; box-sizing: border-box;
transition: var(--b3-transition); transition: var(--b3-transition);
display: flex; display: flex;
@ -210,8 +208,8 @@ progressLoading: 400
} }
svg { svg {
height: 18px; height: 14px;
width: 18px; width: 14px;
} }
&--disabled, &--disabled,
@ -221,10 +219,8 @@ progressLoading: 400
} }
&--close { &--close {
padding: 16px 12px;
svg { svg {
height: 10px; width: 10px !important;
} }
&:hover { &:hover {
@ -238,19 +234,13 @@ progressLoading: 400
.status { .status {
background-color: var(--b3-theme-surface); background-color: var(--b3-theme-surface);
box-sizing: border-box; box-sizing: border-box;
z-index: 2;
height: 32px; height: 32px;
line-height: 32px; line-height: 32px;
z-index: 2;
border-top: .5px solid var(--b3-border-color); border-top: .5px solid var(--b3-border-color);
.toolbar__item { .toolbar__item {
padding: 9px;
color: var(--b3-theme-on-surface); color: var(--b3-theme-on-surface);
svg {
height: 14px;
width: 14px;
}
} }
&__msg { &__msg {

8
app/src/util/onGetConfig.ts
View file

@ -171,16 +171,16 @@ const initBar = () => {
<svg><use xlink:href="#iconCalendar"></use></svg> <svg><use xlink:href="#iconCalendar"></use></svg>
</div> </div>
<div class="fn__flex-1 fn__ellipsis" id="drag"><span class="fn__none">开发版，使用前请进行备份 Development version, please backup before use</span></div> <div class="fn__flex-1 fn__ellipsis" id="drag"><span class="fn__none">开发版，使用前请进行备份 Development version, please backup before use</span></div>
<div id="barSearch" class="toolbar__item b3-tooltips b3-tooltips__se" aria-label="${window.siyuan.languages.globalSearch} ${updateHotkeyTip(window.siyuan.config.keymap.general.globalSearch.custom)}"> <div id="barSearch" class="toolbar__item b3-tooltips b3-tooltips__sw" aria-label="${window.siyuan.languages.globalSearch} ${updateHotkeyTip(window.siyuan.config.keymap.general.globalSearch.custom)}">
<svg><use xlink:href="#iconSearch"></use></svg> <svg><use xlink:href="#iconSearch"></use></svg>
</div> </div>
<div id="barReadonly" class="toolbar__item b3-tooltips b3-tooltips__se" aria-label="${window.siyuan.languages.use} ${window.siyuan.config.editor.readOnly ? window.siyuan.languages.editMode : window.siyuan.languages.editReadonly}"> <div id="barReadonly" class="toolbar__item b3-tooltips b3-tooltips__sw" aria-label="${window.siyuan.languages.use} ${window.siyuan.config.editor.readOnly ? window.siyuan.languages.editMode : window.siyuan.languages.editReadonly}">
<svg><use xlink:href="#icon${window.siyuan.config.editor.readOnly ? "Preview" : "Edit"}"></use></svg> <svg><use xlink:href="#icon${window.siyuan.config.editor.readOnly ? "Preview" : "Edit"}"></use></svg>
</div> </div>
<div id="barMode" class="toolbar__item b3-tooltips b3-tooltips__se" aria-label="${window.siyuan.languages.appearanceMode}"> <div id="barMode" class="toolbar__item b3-tooltips b3-tooltips__sw" aria-label="${window.siyuan.languages.appearanceMode}">
<svg><use xlink:href="#icon${window.siyuan.config.appearance.modeOS ? "Mode" : (window.siyuan.config.appearance.mode === 0 ? "Light" : "Dark")}"></use></svg> <svg><use xlink:href="#icon${window.siyuan.config.appearance.modeOS ? "Mode" : (window.siyuan.config.appearance.mode === 0 ? "Light" : "Dark")}"></use></svg>
</div> </div>
<div id="barSetting" class="toolbar__item b3-tooltips b3-tooltips__se${window.siyuan.config.readonly ? " fn__none" : ""}" aria-label="${window.siyuan.languages.config} ${updateHotkeyTip(window.siyuan.config.keymap.general.config.custom)}"> <div id="barSetting" class="toolbar__item b3-tooltips b3-tooltips__sw${window.siyuan.config.readonly ? " fn__none" : ""}" aria-label="${window.siyuan.languages.config} ${updateHotkeyTip(window.siyuan.config.keymap.general.config.custom)}">
<svg><use xlink:href="#iconSettings"></use></svg> <svg><use xlink:href="#iconSettings"></use></svg>
</div> </div>
<div class="fn__flex" id="windowControls"></div>`; <div class="fn__flex" id="windowControls"></div>`;