diff --git a/AquaNet/index.html b/AquaNet/index.html index 8788bb8e..2a68596a 100644 --- a/AquaNet/index.html +++ b/AquaNet/index.html @@ -15,6 +15,10 @@ + + + +
diff --git a/AquaNet/package.json b/AquaNet/package.json index 07196129..a9be5af5 100644 --- a/AquaNet/package.json +++ b/AquaNet/package.json @@ -32,6 +32,7 @@ "dependencies": { "cal-heatmap": "^4.2.4", "chart.js": "^4.4.1", + "lxgw-wenkai-lite-webfont": "^1.7.0", "modern-normalize": "^2.0.0", "moment": "^2.30.1", "svelte-chartjs": "^3.1.5" diff --git a/AquaNet/public/assets/fonts/Quicksand.400.css b/AquaNet/public/assets/fonts/Quicksand.400.css new file mode 100644 index 00000000..9b12fa71 --- /dev/null +++ b/AquaNet/public/assets/fonts/Quicksand.400.css @@ -0,0 +1,27 @@ +/* vietnamese */ +@font-face { + font-family: 'Quicksand'; + font-style: normal; + font-weight: 400; + font-display: swap; + src: url(Quicksand.400.vietnamese.woff2) format('woff2'); + unicode-range: U+0102-0103, U+0110-0111, U+0128-0129, U+0168-0169, U+01A0-01A1, U+01AF-01B0, U+0300-0301, U+0303-0304, U+0308-0309, U+0323, U+0329, U+1EA0-1EF9, U+20AB; +} +/* latin-ext */ +@font-face { + font-family: 'Quicksand'; + font-style: normal; + font-weight: 400; + font-display: swap; + src: url(Quicksand.400.latin-ext.woff2) format('woff2'); + unicode-range: U+0100-02AF, U+0304, U+0308, U+0329, U+1E00-1E9F, U+1EF2-1EFF, U+2020, U+20A0-20AB, U+20AD-20C0, U+2113, U+2C60-2C7F, U+A720-A7FF; +} +/* latin */ +@font-face { + font-family: 'Quicksand'; + font-style: normal; + font-weight: 400; + font-display: swap; + src: url(Quicksand.400.latin.woff2) format('woff2'); + unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+0304, U+0308, U+0329, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD; +} diff --git a/AquaNet/public/assets/fonts/Quicksand.400.latin-ext.woff2 b/AquaNet/public/assets/fonts/Quicksand.400.latin-ext.woff2 new file mode 100644 index 00000000..757139d4 Binary files /dev/null and b/AquaNet/public/assets/fonts/Quicksand.400.latin-ext.woff2 differ diff --git a/AquaNet/public/assets/fonts/Quicksand.400.latin.woff2 b/AquaNet/public/assets/fonts/Quicksand.400.latin.woff2 new file mode 100644 index 00000000..b295e9f4 Binary files /dev/null and b/AquaNet/public/assets/fonts/Quicksand.400.latin.woff2 differ diff --git a/AquaNet/public/assets/fonts/Quicksand.400.vietnamese.woff2 b/AquaNet/public/assets/fonts/Quicksand.400.vietnamese.woff2 new file mode 100644 index 00000000..21670a93 Binary files /dev/null and b/AquaNet/public/assets/fonts/Quicksand.400.vietnamese.woff2 differ diff --git a/AquaNet/public/assets/fonts/Quicksand.500.css b/AquaNet/public/assets/fonts/Quicksand.500.css new file mode 100644 index 00000000..aa7d1ca6 --- /dev/null +++ b/AquaNet/public/assets/fonts/Quicksand.500.css @@ -0,0 +1,27 @@ +/* vietnamese */ +@font-face { + font-family: 'Quicksand'; + font-style: normal; + font-weight: 500; + font-display: swap; + src: url(Quicksand.500.vietnamese.woff2) format('woff2'); + unicode-range: U+0102-0103, U+0110-0111, U+0128-0129, U+0168-0169, U+01A0-01A1, U+01AF-01B0, U+0300-0301, U+0303-0304, U+0308-0309, U+0323, U+0329, U+1EA0-1EF9, U+20AB; +} +/* latin-ext */ +@font-face { + font-family: 'Quicksand'; + font-style: normal; + font-weight: 500; + font-display: swap; + src: url(Quicksand.500.latin-ext.woff2) format('woff2'); + unicode-range: U+0100-02AF, U+0304, U+0308, U+0329, U+1E00-1E9F, U+1EF2-1EFF, U+2020, U+20A0-20AB, U+20AD-20C0, U+2113, U+2C60-2C7F, U+A720-A7FF; +} +/* latin */ +@font-face { + font-family: 'Quicksand'; + font-style: normal; + font-weight: 500; + font-display: swap; + src: url(Quicksand.400.latin.woff2) format('woff2'); + unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+0304, U+0308, U+0329, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD; +} diff --git a/AquaNet/public/assets/fonts/Quicksand.500.latin-ext.woff2 b/AquaNet/public/assets/fonts/Quicksand.500.latin-ext.woff2 new file mode 100644 index 00000000..195833ec Binary files /dev/null and b/AquaNet/public/assets/fonts/Quicksand.500.latin-ext.woff2 differ diff --git a/AquaNet/public/assets/fonts/Quicksand.500.latin.woff2 b/AquaNet/public/assets/fonts/Quicksand.500.latin.woff2 new file mode 100644 index 00000000..35edee60 Binary files /dev/null and b/AquaNet/public/assets/fonts/Quicksand.500.latin.woff2 differ diff --git a/AquaNet/public/assets/fonts/Quicksand.500.vietnamese.woff2 b/AquaNet/public/assets/fonts/Quicksand.500.vietnamese.woff2 new file mode 100644 index 00000000..47ae2e7c Binary files /dev/null and b/AquaNet/public/assets/fonts/Quicksand.500.vietnamese.woff2 differ diff --git a/AquaNet/src/app.sass b/AquaNet/src/app.sass index 36497f83..d9ff6069 100644 --- a/AquaNet/src/app.sass +++ b/AquaNet/src/app.sass @@ -1,6 +1,5 @@ @import "vars" -@import url('https://fonts.googleapis.com/css2?family=Quicksand&display=swap') -@import url('https://fonts.googleapis.com/css2?family=Quicksand:wght@500&display=swap') +@import 'lxgw-wenkai-lite-webfont/style.css' html height: 100% diff --git a/AquaNet/src/vars.sass b/AquaNet/src/vars.sass index 2bafb838..4eb5069b 100644 --- a/AquaNet/src/vars.sass +++ b/AquaNet/src/vars.sass @@ -1,4 +1,4 @@ -$font: Quicksand, Inter, Microsoft YaHei, -apple-system, BlinkMacSystemFont, "Segoe UI", system-ui, Avenir, Helvetica, Arial, sans-serif +$font: Quicksand, Inter, LXGW Wenkai, Microsoft YaHei, -apple-system, BlinkMacSystemFont, "Segoe UI", system-ui, Avenir, Helvetica, Arial, sans-serif $c-main: #b3c6ff $c-good: #b3ffb9 $c-darker: #646cff diff --git a/AquaNet/yarn.lock b/AquaNet/yarn.lock index 3c1cb8fc..25131ea9 100644 --- a/AquaNet/yarn.lock +++ b/AquaNet/yarn.lock @@ -1776,6 +1776,11 @@ lru-cache@^6.0.0: dependencies: yallist "^4.0.0" +lxgw-wenkai-lite-webfont@^1.7.0: + version "1.7.0" + resolved "https://registry.yarnpkg.com/lxgw-wenkai-lite-webfont/-/lxgw-wenkai-lite-webfont-1.7.0.tgz#2f6404d92d47e0b97d5e8f327a3061ab5fa393e5" + integrity sha512-VcQYNRpdXAxaZsJ18rfT1mmAreGqkIFNZ/9pdVLbT2Tkb+2lLWJDXq4zYxMEk9AcecSnxO31R2LHh5ieLlxjRg== + magic-string@^0.30.4, magic-string@^0.30.5: version "0.30.7" resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.30.7.tgz#0cecd0527d473298679da95a2d7aeb8c64048505"