diff --git a/src/renderer/app.tsx b/src/renderer/app.tsx index 125ec7c6..7faafdf4 100644 --- a/src/renderer/app.tsx +++ b/src/renderer/app.tsx @@ -22,13 +22,11 @@ initSimpleImg({ threshold: 0.05 }, true); export const App = () => { const theme = useTheme(); const contentFont = useSettingsStore((state) => state.general.fontContent); - const headerFont = useSettingsStore((state) => state.general.fontHeader); useEffect(() => { const root = document.documentElement; root.style.setProperty('--content-font-family', contentFont); - root.style.setProperty('--header-font-family', headerFont); - }, [contentFont, headerFont]); + }, [contentFont]); return ( @@ -66,7 +64,7 @@ export const App = () => { xl: 18, xs: 10, }, - headings: { fontFamily: 'var(--header-font-family)' }, + headings: { fontFamily: 'var(--content-font-family)' }, other: {}, spacing: { lg: 12, diff --git a/src/renderer/components/virtual-table/headers/generic-table-header.tsx b/src/renderer/components/virtual-table/headers/generic-table-header.tsx index 7badbf10..d718a871 100644 --- a/src/renderer/components/virtual-table/headers/generic-table-header.tsx +++ b/src/renderer/components/virtual-table/headers/generic-table-header.tsx @@ -21,7 +21,7 @@ const HeaderWrapper = styled.div<{ position: 'left' | 'center' | 'right' }>` ? 'center' : 'flex-start'}; width: 100%; - font-family: var(--header-font-family); + font-family: var(--content-font-family); text-transform: uppercase; `; diff --git a/src/renderer/features/settings/components/general-tab.tsx b/src/renderer/features/settings/components/general-tab.tsx index b6812269..ceead05c 100644 --- a/src/renderer/features/settings/components/general-tab.tsx +++ b/src/renderer/features/settings/components/general-tab.tsx @@ -11,23 +11,12 @@ import { import { AppTheme } from '/@/renderer/themes/types'; const FONT_OPTIONS = [ - { label: 'AnekTamil', value: 'AnekTamil' }, { label: 'Archivo', value: 'Archivo' }, - { label: 'Circular STD', value: 'Circular STD' }, - { label: 'Didact Gothic', value: 'Didact Gothic' }, - { label: 'DM Sans', value: 'DM Sans' }, - { label: 'Encode Sans', value: 'Encode Sans' }, - { label: 'Epilogue', value: 'Epilogue' }, - { label: 'Gotham', value: 'Gotham' }, - { label: 'Inconsolata', value: 'Inconsolata' }, - { label: 'Inter', value: 'Inter' }, - { label: 'JetBrains Mono', value: 'JetBrainsMono' }, - { label: 'Manrope', value: 'Manrope' }, - { label: 'Montserrat', value: 'Montserrat' }, - { label: 'Oxygen', value: 'Oxygen' }, + { label: 'Fredoka', value: 'Fredoka' }, + { label: 'League Spartan', value: 'League Spartan' }, + { label: 'Lexend', value: 'Lexend' }, { label: 'Poppins', value: 'Poppins' }, { label: 'Raleway', value: 'Raleway' }, - { label: 'Roboto', value: 'Roboto' }, { label: 'Sora', value: 'Sora' }, { label: 'Work Sans', value: 'Work Sans' }, ]; @@ -68,6 +57,7 @@ export const GeneralTab = () => { { control: ( { - if (!e) return; - setSettings({ - general: { - ...settings, - fontHeader: e, - }, - }); - }} - /> - ), - description: 'Sets the application header font', - isHidden: false, - title: 'Font (Header)', - }, ]; const themeOptions = [ diff --git a/src/renderer/fonts/AnekTamil-Regular.ttf b/src/renderer/fonts/AnekTamil-Regular.ttf deleted file mode 100644 index af3a9d78..00000000 Binary files a/src/renderer/fonts/AnekTamil-Regular.ttf and /dev/null differ diff --git a/src/renderer/fonts/Archivo-Regular.ttf b/src/renderer/fonts/Archivo-Regular.ttf deleted file mode 100644 index 45fbad17..00000000 Binary files a/src/renderer/fonts/Archivo-Regular.ttf and /dev/null differ diff --git a/src/renderer/fonts/Archivo-VariableFont_wdth,wght.ttf b/src/renderer/fonts/Archivo-VariableFont_wdth,wght.ttf new file mode 100644 index 00000000..620c0d6e Binary files /dev/null and b/src/renderer/fonts/Archivo-VariableFont_wdth,wght.ttf differ diff --git a/src/renderer/fonts/CircularSTD-Regular.ttf b/src/renderer/fonts/CircularSTD-Regular.ttf deleted file mode 100644 index 931bdb1c..00000000 Binary files a/src/renderer/fonts/CircularSTD-Regular.ttf and /dev/null differ diff --git a/src/renderer/fonts/DMSans-Regular.ttf b/src/renderer/fonts/DMSans-Regular.ttf deleted file mode 100644 index cad73f07..00000000 Binary files a/src/renderer/fonts/DMSans-Regular.ttf and /dev/null differ diff --git a/src/renderer/fonts/DidactGothic-Regular.ttf b/src/renderer/fonts/DidactGothic-Regular.ttf deleted file mode 100644 index 3bd22110..00000000 Binary files a/src/renderer/fonts/DidactGothic-Regular.ttf and /dev/null differ diff --git a/src/renderer/fonts/EncodeSans-Regular.ttf b/src/renderer/fonts/EncodeSans-Regular.ttf deleted file mode 100644 index c48388b6..00000000 Binary files a/src/renderer/fonts/EncodeSans-Regular.ttf and /dev/null differ diff --git a/src/renderer/fonts/Epilogue-Regular.ttf b/src/renderer/fonts/Epilogue-Regular.ttf deleted file mode 100644 index 6c41a050..00000000 Binary files a/src/renderer/fonts/Epilogue-Regular.ttf and /dev/null differ diff --git a/src/renderer/fonts/Fredoka-VariableFont_wdth,wght.ttf b/src/renderer/fonts/Fredoka-VariableFont_wdth,wght.ttf new file mode 100644 index 00000000..f1abe030 Binary files /dev/null and b/src/renderer/fonts/Fredoka-VariableFont_wdth,wght.ttf differ diff --git a/src/renderer/fonts/Gotham-Regular.ttf b/src/renderer/fonts/Gotham-Regular.ttf deleted file mode 100644 index 6cdde859..00000000 Binary files a/src/renderer/fonts/Gotham-Regular.ttf and /dev/null differ diff --git a/src/renderer/fonts/Inconsolata-Regular.ttf b/src/renderer/fonts/Inconsolata-Regular.ttf deleted file mode 100644 index 457d262c..00000000 Binary files a/src/renderer/fonts/Inconsolata-Regular.ttf and /dev/null differ diff --git a/src/renderer/fonts/Inter-Regular.ttf b/src/renderer/fonts/Inter-Regular.ttf deleted file mode 100644 index cc73944a..00000000 Binary files a/src/renderer/fonts/Inter-Regular.ttf and /dev/null differ diff --git a/src/renderer/fonts/JetBrainsMono-Regular.ttf b/src/renderer/fonts/JetBrainsMono-Regular.ttf deleted file mode 100644 index 9a5202eb..00000000 Binary files a/src/renderer/fonts/JetBrainsMono-Regular.ttf and /dev/null differ diff --git a/src/renderer/fonts/LeagueSpartan-VariableFont_wght.ttf b/src/renderer/fonts/LeagueSpartan-VariableFont_wght.ttf new file mode 100644 index 00000000..d5bac49a Binary files /dev/null and b/src/renderer/fonts/LeagueSpartan-VariableFont_wght.ttf differ diff --git a/src/renderer/fonts/Lexend-VariableFont_wght.ttf b/src/renderer/fonts/Lexend-VariableFont_wght.ttf new file mode 100644 index 00000000..e9c7a9ff Binary files /dev/null and b/src/renderer/fonts/Lexend-VariableFont_wght.ttf differ diff --git a/src/renderer/fonts/Manrope-Regular.ttf b/src/renderer/fonts/Manrope-Regular.ttf deleted file mode 100644 index 7cf09bf8..00000000 Binary files a/src/renderer/fonts/Manrope-Regular.ttf and /dev/null differ diff --git a/src/renderer/fonts/Montserrat-Regular.ttf b/src/renderer/fonts/Montserrat-Regular.ttf deleted file mode 100644 index 1cd02596..00000000 Binary files a/src/renderer/fonts/Montserrat-Regular.ttf and /dev/null differ diff --git a/src/renderer/fonts/Oxygen-Regular.ttf b/src/renderer/fonts/Oxygen-Regular.ttf deleted file mode 100644 index d03f43af..00000000 Binary files a/src/renderer/fonts/Oxygen-Regular.ttf and /dev/null differ diff --git a/src/renderer/fonts/Poppins-Italic.ttf b/src/renderer/fonts/Poppins-Italic.ttf new file mode 100644 index 00000000..12b7b3c4 Binary files /dev/null and b/src/renderer/fonts/Poppins-Italic.ttf differ diff --git a/src/renderer/fonts/Poppins-Light.ttf b/src/renderer/fonts/Poppins-Light.ttf new file mode 100644 index 00000000..bc36bcc2 Binary files /dev/null and b/src/renderer/fonts/Poppins-Light.ttf differ diff --git a/src/renderer/fonts/Raleway-Regular.ttf b/src/renderer/fonts/Raleway-Regular.ttf deleted file mode 100644 index acb57156..00000000 Binary files a/src/renderer/fonts/Raleway-Regular.ttf and /dev/null differ diff --git a/src/renderer/fonts/Raleway-VariableFont_wght.ttf b/src/renderer/fonts/Raleway-VariableFont_wght.ttf new file mode 100644 index 00000000..424fb0e8 Binary files /dev/null and b/src/renderer/fonts/Raleway-VariableFont_wght.ttf differ diff --git a/src/renderer/fonts/Roboto-Regular.ttf b/src/renderer/fonts/Roboto-Regular.ttf deleted file mode 100644 index 3d6861b4..00000000 Binary files a/src/renderer/fonts/Roboto-Regular.ttf and /dev/null differ diff --git a/src/renderer/fonts/Sora-Regular.ttf b/src/renderer/fonts/Sora-Regular.ttf deleted file mode 100644 index b1f11eaf..00000000 Binary files a/src/renderer/fonts/Sora-Regular.ttf and /dev/null differ diff --git a/src/renderer/fonts/Sora-VariableFont_wght.ttf b/src/renderer/fonts/Sora-VariableFont_wght.ttf new file mode 100644 index 00000000..f3e34ded Binary files /dev/null and b/src/renderer/fonts/Sora-VariableFont_wght.ttf differ diff --git a/src/renderer/fonts/WorkSans-Regular.ttf b/src/renderer/fonts/WorkSans-Regular.ttf deleted file mode 100644 index 82072f19..00000000 Binary files a/src/renderer/fonts/WorkSans-Regular.ttf and /dev/null differ diff --git a/src/renderer/fonts/WorkSans-VariableFont_wght.ttf b/src/renderer/fonts/WorkSans-VariableFont_wght.ttf new file mode 100644 index 00000000..c8d05412 Binary files /dev/null and b/src/renderer/fonts/WorkSans-VariableFont_wght.ttf differ diff --git a/src/renderer/store/settings.store.ts b/src/renderer/store/settings.store.ts index 6273b75e..4ebcaad8 100644 --- a/src/renderer/store/settings.store.ts +++ b/src/renderer/store/settings.store.ts @@ -83,7 +83,7 @@ export const useSettingsStore = create()( }, general: { followSystemTheme: false, - fontContent: 'Poppins', + fontContent: 'Sora', showQueueDrawerButton: false, sideQueueType: 'sideDrawerQueue', theme: AppTheme.DEFAULT_DARK, diff --git a/src/renderer/styles/global.scss b/src/renderer/styles/global.scss index 56ca6ec6..fda2eb42 100644 --- a/src/renderer/styles/global.scss +++ b/src/renderer/styles/global.scss @@ -121,74 +121,46 @@ button { animation: fadeOut 0.2s forwards; } -@font-face { - font-family: "AnekTamil"; - src: url("../fonts/AnekTamil-Regular.ttf") format("truetype"); -} - @font-face { font-family: "Archivo"; - src: url("../fonts/Archivo-Regular.ttf") format("truetype"); + src: url("../fonts/Archivo-VariableFont_wdth,wght.ttf") format("truetype-variations"); + font-weight: 100 1000; } @font-face { - font-family: "Circular STD"; - src: url("../fonts/CircularSTD-Regular.ttf") format("truetype"); + font-family: "Raleway"; + src: url("../fonts/Raleway-VariableFont_wght.ttf") format("truetype-variations"); + font-weight: 100 1000; } @font-face { - font-family: "Didact Gothic"; - src: url("../fonts/DidactGothic-Regular.ttf") format("truetype"); + font-family: "Fredoka"; + src: url("../fonts/Fredoka-VariableFont_wdth,wght.ttf") format("truetype-variations"); + font-weight: 100 1000; } @font-face { - font-family: "DM Sans"; - src: url("../fonts/DMSans-Regular.ttf") format("truetype"); + font-family: "League Spartan"; + src: url("../fonts/LeagueSpartan-VariableFont_wght.ttf") format("truetype-variations"); + font-weight: 100 1000; } @font-face { - font-family: "Encode Sans"; - src: url("../fonts/EncodeSans-Regular.ttf") format("truetype"); + font-family: "Lexend"; + src: url("../fonts/Lexend-VariableFont_wght.ttf") format("truetype-variations"); + font-weight: 100 1000; } @font-face { - font-family: "Epilogue"; - src: url("../fonts/Epilogue-Regular.ttf") format("truetype"); + font-family: "Sora"; + src: url("../fonts/Sora-VariableFont_wght.ttf") format("truetype-variations"); + font-weight: 100 1000; } @font-face { - font-family: "Gotham"; - src: url("../fonts/Gotham-Regular.ttf") format("truetype"); -} - -@font-face { - font-family: "Inconsolata"; - src: url("../fonts/Inconsolata-Regular.ttf") format("truetype"); -} - -@font-face { - font-family: "Inter"; - src: url("../fonts/Inter-Regular.ttf") format("truetype"); -} - -@font-face { - font-family: "JetBrainsMono"; - src: url("../fonts/JetBrainsMono-Regular.ttf") format("truetype"); -} - -@font-face { - font-family: "Manrope"; - src: url("../fonts/Manrope-Regular.ttf") format("truetype"); -} - -@font-face { - font-family: "Montserrat"; - src: url("../fonts/Montserrat-Regular.ttf") format("truetype"); -} - -@font-face { - font-family: "Oxygen"; - src: url("../fonts/Oxygen-Regular.ttf") format("truetype"); + font-family: "Work Sans"; + src: url("../fonts/WorkSans-VariableFont_wght.ttf") format("truetype-variations"); + font-weight: 100 1000; } @font-face { @@ -217,22 +189,8 @@ button { @font-face { font-family: "Raleway"; - src: url("../fonts/Raleway-Regular.ttf") format("truetype"); -} - -@font-face { - font-family: "Roboto"; - src: url("../fonts/Roboto-Regular.ttf") format("truetype"); -} - -@font-face { - font-family: "Sora"; - src: url("../fonts/Sora-Regular.ttf") format("truetype"); -} - -@font-face { - font-family: "Work Sans"; - src: url("../fonts/WorkSans-Regular.ttf") format("truetype"); + src: url("../fonts/Raleway-VariableFont_wght.ttf") format("truetype-variations"); + font-weight: 100 1000; } @font-face { diff --git a/src/renderer/themes/default.scss b/src/renderer/themes/default.scss index ab28b52a..fe0d1092 100644 --- a/src/renderer/themes/default.scss +++ b/src/renderer/themes/default.scss @@ -115,7 +115,7 @@ } .ag-header-cell-label { - font-family: var(--header-font-family); + font-family: var(--content-font-family); font-weight: 600; text-transform: uppercase; }