Skip to content

Commit 18fe1ad

Browse files
committed
🎨 #17861
1 parent 8eb4de6 commit 18fe1ad

2 files changed

Lines changed: 35 additions & 30 deletions

File tree

app/src/assets/scss/component/_select.scss

Lines changed: 31 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -23,42 +23,44 @@
2323
box-shadow: inset 0 0 0 .6px var(--b3-theme-primary-light), 0 0 0 2px var(--b3-theme-primary-lighter);
2424
}
2525

26-
// 与 .b3-menu 的样式一致
27-
@supports (appearance: base-select) {
28-
appearance: base-select;
29-
30-
&::picker(select) {
26+
// 仅 Windows 桌面端与浏览器启用 base-select 统一样式
27+
.body--win32 &, .body--win32-browser & {
28+
@supports (appearance: base-select) {
3129
appearance: base-select;
32-
color: var(--b3-theme-on-background);
33-
border-radius: var(--b3-border-radius-b);
34-
box-shadow: var(--b3-dialog-shadow);
35-
border: 1px solid var(--b3-theme-surface-lighter);
36-
background-color: var(--b3-menu-background);
37-
padding: 8px;
38-
scrollbar-width: thin;
39-
scrollbar-color: var(--b3-scroll-color) transparent;
40-
}
41-
42-
&::picker-icon {
43-
display: none;
44-
}
4530

46-
option {
47-
padding: 0 8px;
48-
margin: 1px 0;
49-
border-radius: var(--b3-border-radius);
50-
line-height: 28px;
31+
&::picker(select) {
32+
appearance: base-select;
33+
color: var(--b3-theme-on-background);
34+
border-radius: var(--b3-border-radius-b);
35+
box-shadow: var(--b3-dialog-shadow);
36+
border: 1px solid var(--b3-theme-surface-lighter);
37+
background-color: var(--b3-menu-background);
38+
padding: 8px;
39+
scrollbar-width: thin;
40+
scrollbar-color: var(--b3-scroll-color) transparent;
41+
}
5142

52-
&::checkmark {
43+
&::picker-icon {
5344
display: none;
5445
}
5546

56-
&:checked {
57-
color: var(--b3-theme-primary);
58-
}
47+
option {
48+
padding: 0 8px;
49+
margin: 1px 0;
50+
border-radius: var(--b3-border-radius);
51+
line-height: 28px;
52+
53+
&::checkmark {
54+
display: none;
55+
}
56+
57+
&:checked {
58+
color: var(--b3-theme-primary);
59+
}
5960

60-
&:hover {
61-
background-color: var(--b3-list-hover);
61+
&:hover {
62+
background-color: var(--b3-list-hover);
63+
}
6264
}
6365
}
6466
}

app/src/boot/onGetConfig.ts

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import {adjustLayout, exportLayout, JSONToLayout, resetLayout, resizeTopBar} from "../layout/util";
22
import {resizeTabs, setTabPosition} from "../layout/tabUtil";
3-
import {initNativeDialogOverride, setStorageVal} from "../protyle/util/compatibility";
3+
import {initNativeDialogOverride, isWindows, setStorageVal} from "../protyle/util/compatibility";
44
/// #if !BROWSER
55
import {ipcRenderer, webFrame} from "electron";
66
import * as fs from "fs";
@@ -413,5 +413,8 @@ ${response.data.replace("%pages", "<span class=totalPages></span>").replace("%pa
413413
if (!isWindow()) {
414414
document.querySelector(".toolbar").classList.add("toolbar--browser");
415415
}
416+
if (isWindows()) {
417+
document.body.classList.add("body--win32-browser");
418+
}
416419
/// #endif
417420
};

0 commit comments

Comments
 (0)