diff --git a/client/src/components/Header/components/universal-nav.css b/client/src/components/Header/components/universal-nav.css index de0b3b02a17..b7c1aa46d34 100644 --- a/client/src/components/Header/components/universal-nav.css +++ b/client/src/components/Header/components/universal-nav.css @@ -437,7 +437,7 @@ button.nav-link[aria-disabled='true'] { max-height: calc(var(--header-height) - 6px); padding: 4px 12px; margin-left: 2px; - font-family: 'Roboto Mono', monospace !important; + font-family: 'Hack-ZeroSlash', monospace !important; display: flex; align-items: center; justify-content: center; diff --git a/client/src/components/layouts/default.tsx b/client/src/components/layouts/default.tsx index 557738f4ad7..34d92382647 100644 --- a/client/src/components/layouts/default.tsx +++ b/client/src/components/layouts/default.tsx @@ -8,9 +8,10 @@ import { createSelector } from 'reselect'; import latoBoldURL from '../../../static/fonts/lato/Lato-Bold.woff'; import latoLightURL from '../../../static/fonts/lato/Lato-Light.woff'; import latoRegularURL from '../../../static/fonts/lato/Lato-Regular.woff'; -import robotoBoldURL from '../../../static/fonts/roboto-mono/RobotoMono-Bold.woff'; -import robotoItalicURL from '../../../static/fonts/roboto-mono/RobotoMono-Italic.woff'; -import robotoRegularURL from '../../../static/fonts/roboto-mono/RobotoMono-Regular.woff'; +import hackZeroSlashBoldURL from '../../../static/fonts/hack-zeroslash/Hack-ZeroSlash-Bold.woff'; +import hackZeroSlashItalicURL from '../../../static/fonts/hack-zeroslash/Hack-ZeroSlash-Italic.woff'; +import hackZeroSlashRegularURL from '../../../static/fonts/hack-zeroslash/Hack-ZeroSlash-Regular.woff'; + import { isBrowser } from '../../../utils'; import { fetchUser, @@ -186,21 +187,21 @@ class DefaultLayout extends Component { diff --git a/client/src/components/layouts/fonts.css b/client/src/components/layouts/fonts.css index 8dc0c78d254..53653144e4b 100644 --- a/client/src/components/layouts/fonts.css +++ b/client/src/components/layouts/fonts.css @@ -38,31 +38,30 @@ font-display: fallback; } -/* roboto mono */ +/* hack zeroslash */ @font-face { - font-family: 'Roboto Mono'; - src: url('../../../static/fonts/roboto-mono/RobotoMono-Regular.woff') - format('woff'); - font-weight: normal; - font-style: normal; - font-display: fallback; + font-family: 'Hack-ZeroSlash'; + src: url('../../../static/fonts/hack-zeroslash/Hack-ZeroSlash-Regular.woff2') + format('woff2'), + url('../../../static/fonts/hack-zeroslash/Hack-ZeroSlash-Regular.woff') + format('woff'); } @font-face { - font-family: 'Roboto Mono'; - src: url('../../../static/fonts/roboto-mono/RobotoMono-Italic.woff') - format('woff'); - font-weight: normal; - font-style: italic; - font-display: fallback; -} - -@font-face { - font-family: 'Roboto Mono'; - src: url('../../../static/fonts/roboto-mono/RobotoMono-Bold.woff') - format('woff'); + font-family: 'Hack-ZeroSlash'; + src: url('../../../static/fonts/hack-zeroslash/Hack-ZeroSlash-Bold.woff2') + format('woff2'), + url('../../../static/fonts/hack-zeroslash/Hack-ZeroSlash-Bold.woff') + format('woff'); font-weight: bold; - font-style: normal; - font-display: fallback; +} + +@font-face { + font-family: 'Hack-ZeroSlash'; + src: url('../../../static/fonts/hack-zeroslash/Hack-ZeroSlash-Italic.woff2') + format('woff2'), + url('../../../static/fonts/hack-zeroslash/Hack-ZeroSlash-Italic.woff') + format('woff'); + font-style: italic; } diff --git a/client/src/components/layouts/global.css b/client/src/components/layouts/global.css index 86d7b8b222e..405b7b54d14 100644 --- a/client/src/components/layouts/global.css +++ b/client/src/components/layouts/global.css @@ -6,7 +6,7 @@ html { body { height: 100%; - font-family: 'Roboto Mono', monospace; + font-family: 'Hack-ZeroSlash', monospace; color: var(--secondary-color); background: var(--secondary-background); } @@ -62,21 +62,21 @@ h1 { color: var(--secondary-color); font-weight: 700; font-size: 1.5rem; - font-family: 'Roboto Mono', monospace; + font-family: 'Hack-ZeroSlash', monospace; margin: 0.6rem 0; } h2 { color: var(--secondary-color); font-weight: 700; font-size: 1.25rem; - font-family: 'Roboto Mono', monospace; + font-family: 'Hack-ZeroSlash', monospace; margin: 0.6rem 0; } h3 { color: var(--secondary-color); font-weight: 700; font-size: 1.1rem; - font-family: 'Roboto Mono', monospace; + font-family: 'Hack-ZeroSlash', monospace; margin: 0 0 0.6rem; } @@ -89,7 +89,7 @@ th { color: var(--secondary-color); font-weight: 400; font-size: 1rem; - font-family: 'Roboto Mono', monospace; + font-family: 'Hack-ZeroSlash', monospace; margin: 0 0 1.2rem; } @@ -418,7 +418,7 @@ code { background-color: var(--quaternary-background); color: var(--tertiary-color); border-radius: 0; - font-family: 'Roboto Mono', monospace; + font-family: 'Hack-ZeroSlash', monospace; overflow-wrap: anywhere; } diff --git a/client/src/templates/Challenges/classic/editor.css b/client/src/templates/Challenges/classic/editor.css index 18b82f49e35..f1370abaf66 100644 --- a/client/src/templates/Challenges/classic/editor.css +++ b/client/src/templates/Challenges/classic/editor.css @@ -57,7 +57,7 @@ textarea.inputarea { .description-container h1 { color: var(--secondary-color); - font-family: Roboto Mono, monospace; + font-family: Hack-ZeroSlash, monospace; font-size: 1.1rem; font-weight: 700; line-height: 1.1; diff --git a/client/src/templates/Challenges/classic/editor.tsx b/client/src/templates/Challenges/classic/editor.tsx index 4a42b207082..ea7e3df2feb 100644 --- a/client/src/templates/Challenges/classic/editor.tsx +++ b/client/src/templates/Challenges/classic/editor.tsx @@ -281,6 +281,7 @@ const Editor = (props: EditorProps): JSX.Element => { const options: editor.IStandaloneEditorConstructionOptions = { fontSize: 18, + fontFamily: 'Hack-ZeroSlash, monospace', scrollBeyondLastLine: true, selectionHighlight: false, overviewRulerBorder: false, diff --git a/client/static/fonts/hack-zeroslash/Hack-ZeroSlash-Bold.woff b/client/static/fonts/hack-zeroslash/Hack-ZeroSlash-Bold.woff new file mode 100644 index 00000000000..55b4e81eade Binary files /dev/null and b/client/static/fonts/hack-zeroslash/Hack-ZeroSlash-Bold.woff differ diff --git a/client/static/fonts/hack-zeroslash/Hack-ZeroSlash-Bold.woff2 b/client/static/fonts/hack-zeroslash/Hack-ZeroSlash-Bold.woff2 new file mode 100644 index 00000000000..3229e0bfe26 Binary files /dev/null and b/client/static/fonts/hack-zeroslash/Hack-ZeroSlash-Bold.woff2 differ diff --git a/client/static/fonts/hack-zeroslash/Hack-ZeroSlash-BoldItalic.woff b/client/static/fonts/hack-zeroslash/Hack-ZeroSlash-BoldItalic.woff new file mode 100644 index 00000000000..f26f18f0eb9 Binary files /dev/null and b/client/static/fonts/hack-zeroslash/Hack-ZeroSlash-BoldItalic.woff differ diff --git a/client/static/fonts/hack-zeroslash/Hack-ZeroSlash-BoldItalic.woff2 b/client/static/fonts/hack-zeroslash/Hack-ZeroSlash-BoldItalic.woff2 new file mode 100644 index 00000000000..6d5a40d6bca Binary files /dev/null and b/client/static/fonts/hack-zeroslash/Hack-ZeroSlash-BoldItalic.woff2 differ diff --git a/client/static/fonts/hack-zeroslash/Hack-ZeroSlash-Italic.woff b/client/static/fonts/hack-zeroslash/Hack-ZeroSlash-Italic.woff new file mode 100644 index 00000000000..7e0b1f68351 Binary files /dev/null and b/client/static/fonts/hack-zeroslash/Hack-ZeroSlash-Italic.woff differ diff --git a/client/static/fonts/hack-zeroslash/Hack-ZeroSlash-Italic.woff2 b/client/static/fonts/hack-zeroslash/Hack-ZeroSlash-Italic.woff2 new file mode 100644 index 00000000000..21c948c8e5b Binary files /dev/null and b/client/static/fonts/hack-zeroslash/Hack-ZeroSlash-Italic.woff2 differ diff --git a/client/static/fonts/hack-zeroslash/Hack-ZeroSlash-Regular.woff b/client/static/fonts/hack-zeroslash/Hack-ZeroSlash-Regular.woff new file mode 100644 index 00000000000..ed61bcb86be Binary files /dev/null and b/client/static/fonts/hack-zeroslash/Hack-ZeroSlash-Regular.woff differ diff --git a/client/static/fonts/hack-zeroslash/Hack-ZeroSlash-Regular.woff2 b/client/static/fonts/hack-zeroslash/Hack-ZeroSlash-Regular.woff2 new file mode 100644 index 00000000000..51b06df63ec Binary files /dev/null and b/client/static/fonts/hack-zeroslash/Hack-ZeroSlash-Regular.woff2 differ diff --git a/client/static/fonts/roboto-mono/RobotoMono-Bold.woff b/client/static/fonts/roboto-mono/RobotoMono-Bold.woff deleted file mode 100644 index 63c1a51d0fa..00000000000 Binary files a/client/static/fonts/roboto-mono/RobotoMono-Bold.woff and /dev/null differ diff --git a/client/static/fonts/roboto-mono/RobotoMono-BoldItalic.woff b/client/static/fonts/roboto-mono/RobotoMono-BoldItalic.woff deleted file mode 100644 index 41d261f9b4c..00000000000 Binary files a/client/static/fonts/roboto-mono/RobotoMono-BoldItalic.woff and /dev/null differ diff --git a/client/static/fonts/roboto-mono/RobotoMono-Italic.woff b/client/static/fonts/roboto-mono/RobotoMono-Italic.woff deleted file mode 100644 index 85e9e18fcfb..00000000000 Binary files a/client/static/fonts/roboto-mono/RobotoMono-Italic.woff and /dev/null differ diff --git a/client/static/fonts/roboto-mono/RobotoMono-Light.woff b/client/static/fonts/roboto-mono/RobotoMono-Light.woff deleted file mode 100644 index 98486d1a35e..00000000000 Binary files a/client/static/fonts/roboto-mono/RobotoMono-Light.woff and /dev/null differ diff --git a/client/static/fonts/roboto-mono/RobotoMono-LightItalic.woff b/client/static/fonts/roboto-mono/RobotoMono-LightItalic.woff deleted file mode 100644 index 2a7e951bc00..00000000000 Binary files a/client/static/fonts/roboto-mono/RobotoMono-LightItalic.woff and /dev/null differ diff --git a/client/static/fonts/roboto-mono/RobotoMono-Medium.woff b/client/static/fonts/roboto-mono/RobotoMono-Medium.woff deleted file mode 100644 index 48bc82ad357..00000000000 Binary files a/client/static/fonts/roboto-mono/RobotoMono-Medium.woff and /dev/null differ diff --git a/client/static/fonts/roboto-mono/RobotoMono-MediumItalic.woff b/client/static/fonts/roboto-mono/RobotoMono-MediumItalic.woff deleted file mode 100644 index af5cb552c57..00000000000 Binary files a/client/static/fonts/roboto-mono/RobotoMono-MediumItalic.woff and /dev/null differ diff --git a/client/static/fonts/roboto-mono/RobotoMono-Regular.woff b/client/static/fonts/roboto-mono/RobotoMono-Regular.woff deleted file mode 100644 index e17d5ebfa54..00000000000 Binary files a/client/static/fonts/roboto-mono/RobotoMono-Regular.woff and /dev/null differ diff --git a/client/static/fonts/roboto-mono/RobotoMono-Thin.woff b/client/static/fonts/roboto-mono/RobotoMono-Thin.woff deleted file mode 100644 index 6159ff3071b..00000000000 Binary files a/client/static/fonts/roboto-mono/RobotoMono-Thin.woff and /dev/null differ diff --git a/client/static/fonts/roboto-mono/RobotoMono-ThinItalic.woff b/client/static/fonts/roboto-mono/RobotoMono-ThinItalic.woff deleted file mode 100644 index d0785d5fe64..00000000000 Binary files a/client/static/fonts/roboto-mono/RobotoMono-ThinItalic.woff and /dev/null differ