Skip to content

Commit

Permalink
fix: font-family adapted to different platforms
Browse files Browse the repository at this point in the history
Signed-off-by: 1111mp <[email protected]>
  • Loading branch information
1111mp committed Oct 15, 2024
1 parent de4d587 commit a6b933c
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 10 deletions.
2 changes: 1 addition & 1 deletion src-tauri/src/utils/resolve.rs
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ pub fn create_window(app_handle: &AppHandle) -> Result<()> {
.visible(false)
.fullscreen(false)
.inner_size(1024.0, 728.0)
// .resizable(false)
.resizable(false)
.center();

#[cfg(target_os = "windows")]
Expand Down
7 changes: 4 additions & 3 deletions src/global.css
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,11 @@ a {
-webkit-user-drag: none;
}


@layer base {
html {
font-family: sans-serif;
font-family: 'Helvetica Neue', Helvetica, Arial, 'PingFang SC',
'Hiragino Sans GB', 'Heiti SC', 'Microsoft YaHei', 'WenQuanYi Micro Hei',
sans-serif;
font-weight: 300;
overflow: hidden;
}
Expand Down Expand Up @@ -691,4 +692,4 @@ a {

.dark ::-webkit-scrollbar-thumb:hover {
background-color: #b9b9b9;
}
}
9 changes: 3 additions & 6 deletions src/pages/home/intro.css
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,7 @@ tr.introjs-showElement > th {
box-sizing: content-box;
}
.introjs-tooltipReferenceLayer {
font-family: "Helvetica Neue", Inter, ui-sans-serif, "Apple Color Emoji", Helvetica, Arial,
sans-serif;
font-family: "Helvetica Neue", Helvetica, Arial, "PingFang SC", "Hiragino Sans GB", "Heiti SC", "Microsoft YaHei", "WenQuanYi Micro Hei", sans-serif;
box-sizing: content-box;
position: absolute;
visibility: hidden;
Expand All @@ -53,12 +52,10 @@ tr.introjs-showElement > th {
transition: all 0.3s ease-out;
}
.introjs-tooltipReferenceLayer * {
font-family: "Helvetica Neue", Inter, ui-sans-serif, "Apple Color Emoji", Helvetica, Arial,
sans-serif;
font-family: "Helvetica Neue", Helvetica, Arial, "PingFang SC", "Hiragino Sans GB", "Heiti SC", "Microsoft YaHei", "WenQuanYi Micro Hei", sans-serif;
}
.introjs-helperNumberLayer {
font-family: "Helvetica Neue", Inter, ui-sans-serif, "Apple Color Emoji", Helvetica, Arial,
sans-serif;
font-family: "Helvetica Neue", Helvetica, Arial, "PingFang SC", "Hiragino Sans GB", "Heiti SC", "Microsoft YaHei", "WenQuanYi Micro Hei", sans-serif;
color: #9e9e9e;
text-align: center;
padding-top: 10px;
Expand Down

0 comments on commit a6b933c

Please sign in to comment.