Skip to content
This repository has been archived by the owner on Jun 7, 2024. It is now read-only.

Commit

Permalink
用 Geist 替换 OpenSans 和 Roboto 字体
Browse files Browse the repository at this point in the history
  • Loading branch information
@WindyCloudCute
WindyCloudCute committed Nov 12, 2023
1 parent 09f4d45 commit 145ea5a
Show file tree
Hide file tree
Showing 6 changed files with 39 additions and 47 deletions.
26 changes: 14 additions & 12 deletions package-lock.json
View file

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

3 changes: 1 addition & 2 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,15 +35,14 @@
"clsx": "^1.1.1",
"datatables.net": "^1.11.5",
"fscreen": "^1.2.0",
"geist": "^1.0.0",
"inter-ui": "^3.19.3",
"jqcloud2": "^2.0.3",
"jquery": "^3.6.0",
"jquery-contextmenu": "^2.9.2",
"marked": "^4.0.14",
"open-sans-fontface": "^1.4.0",
"preact": "^10.7.1",
"react-toastify": "^9.0.0-rc-2",
"roboto-fontface": "^0.8.0",
"sweetalert2": "^11.6.14",
"swiper": "^8.4.5",
"tippy.js": "^6.3.7"
Expand Down
20 changes: 10 additions & 10 deletions public/themes/modern.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,23 +10,23 @@ img {
}

@font-face {
font-family: "Open Sans";
font-family: "Geist";
font-style: normal;
font-weight: 400;
src: local("Open Sans"), local("OpenSans"), url(../css/webfonts/OpenSans-Regular.woff) format("woff");
src: url(../css/webfonts/Geist-Regular.woff2) format("woff2");
}

@font-face {
font-family: "Open Sans";
font-family: "Geist";
font-style: normal;
font-weight: 700;
src: local("Open Sans Bold"), local("OpenSans-Bold"), url(../css/webfonts/OpenSans-Bold.woff) format("woff");
font-weight: 600;
src: url(../css/webfonts/Geist-SemiBold.woff2) format("woff2");
}

body {
background-color: #34353B;
color: #DDDDDD;
font-family: "Open Sans", arial, sans-serif;
font-family: "Geist", arial, sans-serif;
height: 100%;
text-align: center;
padding: 2px;
Expand Down Expand Up @@ -247,7 +247,7 @@ tr.gtr1 {
border: 0 none;
border-radius: 3px;
color: #FFFFFF;
font-family: "Open Sans", arial, sans-serif;
font-family: "Geist", arial, sans-serif;
font-size: 9pt;
height: 28px;
margin: 1px;
Expand Down Expand Up @@ -277,7 +277,7 @@ tr.gtr1 {

.stdinput {
background: none repeat scroll 0 0 #ECF0F1;
font-family: "Open Sans", arial, sans-serif;
font-family: "Geist", arial, sans-serif;
border: medium none;
color: #34353B;
font-size: 9pt;
Expand All @@ -289,7 +289,7 @@ tr.gtr1 {

.tagger {
background: none repeat scroll 0 0 #ECF0F1;
font-family: "Open Sans", arial, sans-serif;
font-family: "Geist", arial, sans-serif;
border: medium none;
color: #34353B;
max-width: 768px;
Expand Down Expand Up @@ -505,7 +505,7 @@ div#toppane {

/* Tag Cloud */
div.jqcloud {
font-family: "Open Sans", arial, sans-serif !important;
font-family: "Geist", arial, sans-serif !important;
}

div.jqcloud span.w1 {
Expand Down
4 changes: 2 additions & 2 deletions public/themes/modern_clear.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,14 @@ img {
font-family: 'Inter UI';
font-style: normal;
font-weight: 400;
src: local('Inter'), local('Inter'), url(../css/webfonts/Inter-Regular.woff) format('woff');
src: url(../css/webfonts/Inter-Regular.woff) format('woff');
}

@font-face {
font-family: 'Inter UI';
font-style: normal;
font-weight: 700;
src: local('Inter'), local('Inter-Bold'), url(../css/webfonts/Inter-Bold.woff) format('woff');
src: url(../css/webfonts/Inter-Bold.woff) format('woff');
}

body {
Expand Down
27 changes: 10 additions & 17 deletions public/themes/modern_red.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,23 +8,16 @@ img {
}

@font-face {
font-family: "Roboto";
font-family: "Geist";
font-style: normal;
font-weight: 400;
src: local("Roboto"), local("Roboto-Regular"), url(../css/webfonts/Roboto-Regular.woff) format("woff");
}

@font-face {
font-family: "Roboto";
font-style: normal;
font-weight: 700;
src: local("Roboto Bold"), local("Roboto-Bold"), url(../css/webfonts/Roboto-Bold.woff) format("woff");
src: url(../css/webfonts/Geist-Regular.woff2) format("woff2");
}

body {
background-color: #E9BBC5;
color: #EFEAEA;
font-family: "Roboto", arial, sans-serif;
font-family: "Geist", arial, sans-serif;
font-size: 8pt;
height: 100%;
margin: 0;
Expand Down Expand Up @@ -202,7 +195,7 @@ table.itc {
border: 0 none;
border-radius: 3px 3px 3px 3px;
color: #F1F1F1;
font-family: "Roboto", arial, sans-serif;
font-family: "Geist", arial, sans-serif;
margin: 1px;
outline: 0 none;
padding: 0 4px 1px;
Expand Down Expand Up @@ -255,7 +248,7 @@ tr.gtr1 {
border-radius: 3px;
color: #F1F1F1;
cursor: pointer;
font-family: "Roboto", arial, sans-serif;
font-family: "Geist", arial, sans-serif;
font-size: 9pt;
height: 28px;
margin: 1px;
Expand All @@ -276,7 +269,7 @@ tr.gtr1 {
background: none repeat scroll 0 0 #FCFCFC;
border: medium none;
color: #ED2553;
font-family: "Roboto", arial, sans-serif;
font-family: "Geist", arial, sans-serif;
font-size: 9pt;
height: 21px;
margin: 4px 1px 0;
Expand All @@ -289,7 +282,7 @@ tr.gtr1 {
background: none repeat scroll 0 0 #FCFCFC;
border: medium none;
color: #ED2553;
font-family: "Roboto", arial, sans-serif;
font-family: "Geist", arial, sans-serif;
max-width: 768px;
margin: 4px 4px 0;
font-size: 9pt;
Expand Down Expand Up @@ -565,12 +558,12 @@ input[type='checkbox']:checked::before {
/* Toasts */
.jq-toast-single,
.jq-toast-single h2 {
font-family: "Roboto", arial, sans-serif !important;
font-family: "Geist", arial, sans-serif !important;
}

/* Tag Cloud */
div.jqcloud {
font-family: "Roboto", arial, sans-serif !important;
font-family: "Geist", arial, sans-serif !important;
}

div.jqcloud span.w1 {
Expand Down Expand Up @@ -688,7 +681,7 @@ div.id4 a:hover {

/** Toasts **/
.Toastify {
--toastify-font-family: "Roboto", arial, sans-serif;
--toastify-font-family: "Geist", arial, sans-serif;
--toastify-text-color-light: #414135;
--toastify-color-light: #d7d4c5;
}
Expand Down
6 changes: 2 additions & 4 deletions tools/install.pl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,8 @@
my @vendor_woff = (
"/\@fortawesome/fontawesome-free/webfonts/fa-solid-900.woff2",
"/\@fortawesome/fontawesome-free/webfonts/fa-regular-400.woff2",
"/open-sans-fontface/fonts/Regular/OpenSans-Regular.woff",
"/open-sans-fontface/fonts/Bold/OpenSans-Bold.woff",
"/roboto-fontface/fonts/roboto/Roboto-Regular.woff",
"/roboto-fontface/fonts/roboto/Roboto-Bold.woff",
"/geist/dist/fonts/geist-sans/Geist-Regular.woff2",
"/geist/dist/fonts/geist-sans/Geist-SemiBold.woff2",
"/inter-ui/Inter (web)/Inter-Regular.woff",
"/inter-ui/Inter (web)/Inter-Bold.woff",
);
Expand Down

0 comments on commit 145ea5a

Please sign in to comment.