diff --git a/package-lock.json b/package-lock.json index d3ef4ca..c01297e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -17,15 +17,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" @@ -145,6 +144,11 @@ "resolved": "https://registry.npmjs.org/@jcubic/tagger/-/tagger-0.4.2.tgz", "integrity": "sha512-A0lGN4lJIUcGGl7+SBNM7rh46G/j03DENon+yZ80Dc7IMZ9dvIEFRReLbLTv53O8qDz6/PVM2MbP0+Cs8E/T4Q==" }, + "node_modules/@next/font": { + "version": "13.5.6", + "resolved": "https://registry.npmjs.org/@next/font/-/font-13.5.6.tgz", + "integrity": "sha512-urmUq05uCVJsBqAAJEV+xK5OTTodrSxdiG+351SOSjlWctywdBM6qX+K9pIe3K48RxjfnxlBbXjGyOJAji+pfw==" + }, "node_modules/@popperjs/core": { "version": "2.11.5", "resolved": "https://registry.npmjs.org/@popperjs/core/-/core-2.11.5.tgz", @@ -1049,6 +1053,14 @@ "integrity": "sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc=", "dev": true }, + "node_modules/geist": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/geist/-/geist-1.0.0.tgz", + "integrity": "sha512-7hqXZqIdSiFbXjlMZ8Ag0fBAW8RzUjIXPkh160rT4m4ECMtsKdFX+06e0mK28oRCpU+lOB1C5Es8qxzvv7H2Hg==", + "dependencies": { + "@next/font": "^13.5.6" + } + }, "node_modules/get-intrinsic": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.1.tgz", @@ -1709,11 +1721,6 @@ "wrappy": "1" } }, - "node_modules/open-sans-fontface": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/open-sans-fontface/-/open-sans-fontface-1.4.0.tgz", - "integrity": "sha1-A8xtG/XmqLW0eRCIhWL3IsXdNCg=" - }, "node_modules/optionator": { "version": "0.9.1", "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.1.tgz", @@ -1944,11 +1951,6 @@ "url": "https://github.com/sponsors/isaacs" } }, - "node_modules/roboto-fontface": { - "version": "0.8.0", - "resolved": "https://registry.npmjs.org/roboto-fontface/-/roboto-fontface-0.8.0.tgz", - "integrity": "sha1-AxqDyPeZMoAaV9g790PzclAWNJk=" - }, "node_modules/scheduler": { "version": "0.23.0", "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.23.0.tgz", diff --git a/package.json b/package.json index d18d661..5a3db59 100644 --- a/package.json +++ b/package.json @@ -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" diff --git a/public/themes/modern.css b/public/themes/modern.css index e4ee72c..522e28a 100644 --- a/public/themes/modern.css +++ b/public/themes/modern.css @@ -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; @@ -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; @@ -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; @@ -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; @@ -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 { diff --git a/public/themes/modern_clear.css b/public/themes/modern_clear.css index 09b7748..47aacbf 100644 --- a/public/themes/modern_clear.css +++ b/public/themes/modern_clear.css @@ -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 { diff --git a/public/themes/modern_red.css b/public/themes/modern_red.css index 74c9087..9573197 100644 --- a/public/themes/modern_red.css +++ b/public/themes/modern_red.css @@ -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; @@ -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; @@ -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; @@ -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; @@ -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; @@ -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 { @@ -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; } diff --git a/tools/install.pl b/tools/install.pl index 341dccb..0fb709c 100755 --- a/tools/install.pl +++ b/tools/install.pl @@ -38,10 +38,8 @@ my @vendor_js = ( 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", );