diff --git a/public/index.html b/public/index.html index 0110b01..d7d1875 100644 --- a/public/index.html +++ b/public/index.html @@ -2,6 +2,47 @@ + + + + + + diff --git a/public/public-sans-latin-400-normal.woff2 b/public/public-sans-latin-400-normal.woff2 new file mode 100644 index 0000000..e303dab Binary files /dev/null and b/public/public-sans-latin-400-normal.woff2 differ diff --git a/public/public-sans-latin-500-normal.woff2 b/public/public-sans-latin-500-normal.woff2 new file mode 100644 index 0000000..b763efb Binary files /dev/null and b/public/public-sans-latin-500-normal.woff2 differ diff --git a/public/public-sans-latin-600-normal.woff2 b/public/public-sans-latin-600-normal.woff2 new file mode 100644 index 0000000..86089d1 Binary files /dev/null and b/public/public-sans-latin-600-normal.woff2 differ diff --git a/public/public-sans-latin-700-normal.woff2 b/public/public-sans-latin-700-normal.woff2 new file mode 100644 index 0000000..79c2c45 Binary files /dev/null and b/public/public-sans-latin-700-normal.woff2 differ diff --git a/src/assets/fonts.css b/src/assets/fonts.css index 249b9ff..428c819 100644 --- a/src/assets/fonts.css +++ b/src/assets/fonts.css @@ -1,19 +1,20 @@ /* Self-hosted fonts (bundled via @fontsource; no Google Fonts CDN — CSP-friendly). */ +/* All @fontsource v5 packages already use font-display: swap by default. */ /* Public Sans — MUI theme (`themeConst.js`), charts, config */ -@import "@fontsource/public-sans/400.css"; -@import "@fontsource/public-sans/500.css"; -@import "@fontsource/public-sans/600.css"; -@import "@fontsource/public-sans/700.css"; +@import url("@fontsource/public-sans/400.css"); +@import url("@fontsource/public-sans/500.css"); +@import url("@fontsource/public-sans/600.css"); +@import url("@fontsource/public-sans/700.css"); -/* Noto Sans HK — `styles.css` / navbar (Latin + Hong Kong glyphs) */ -@import "@fontsource/noto-sans-hk/latin-400.css"; -@import "@fontsource/noto-sans-hk/chinese-hongkong-400.css"; -@import "@fontsource/noto-sans-hk/latin-600.css"; -@import "@fontsource/noto-sans-hk/chinese-hongkong-600.css"; +/* Noto Sans HK — navbar (Latin + Hong Kong glyphs) */ +@import url("@fontsource/noto-sans-hk/latin-400.css"); +@import url("@fontsource/noto-sans-hk/chinese-hongkong-400.css"); +@import url("@fontsource/noto-sans-hk/latin-600.css"); +@import url("@fontsource/noto-sans-hk/chinese-hongkong-600.css"); /* Noto Sans SC — fallback for simplified Chinese */ -@import "@fontsource/noto-sans-sc/latin-400.css"; -@import "@fontsource/noto-sans-sc/chinese-simplified-400.css"; -@import "@fontsource/noto-sans-sc/latin-600.css"; -@import "@fontsource/noto-sans-sc/chinese-simplified-600.css"; +@import url("@fontsource/noto-sans-sc/latin-400.css"); +@import url("@fontsource/noto-sans-sc/chinese-simplified-400.css"); +@import url("@fontsource/noto-sans-sc/latin-600.css"); +@import url("@fontsource/noto-sans-sc/chinese-simplified-600.css"); diff --git a/src/themes/buttonConst.js b/src/themes/buttonConst.js index 5e89661..9944d07 100644 --- a/src/themes/buttonConst.js +++ b/src/themes/buttonConst.js @@ -20,7 +20,7 @@ export const PNSPS_BUTTON_THEME = createTheme({ }, save:{ - main: '#448DF2', + main: '#0c489e', contrastText: '#FFFFFF', }, export:{ @@ -44,7 +44,7 @@ export const PNSPS_BUTTON_THEME = createTheme({ contrastText: '#FFFFFF', }, success:{ - main: '#448DF2', + main: '#0c489e', contrastText: '#FFFFFF', }, green:{ @@ -194,7 +194,7 @@ export const PNSPS_LONG_BUTTON_THEME = createTheme({ }, save:{ - main: '#448DF2', + main: '#0c489e', contrastText: '#FFFFFF', }, export:{ diff --git a/src/themes/colorConst.js b/src/themes/colorConst.js index 8ebc9ae..cecd4c9 100644 --- a/src/themes/colorConst.js +++ b/src/themes/colorConst.js @@ -28,7 +28,7 @@ export const piechartColor2 = [ ]; export const cardBorderColor = [ - '#efb142', '#4bb641', '#448df2', '#e03c04' + '#efb142', '#4bb641', '#0c489e', '#e03c04' ]; export const chartLineColor = [ @@ -39,7 +39,7 @@ export const GENERAL_RED_COLOR = '#e03c04'; export const TABLE_HEADER_TEXT_COLOR = "#1565C0"; -export const GENERAL_INFO_COLOR = '#448df2'; +export const GENERAL_INFO_COLOR = '#0c489e'; export const GENERAL_SETTING_COLOR = '#666666';