diff options
Diffstat (limited to 'app/assets/stylesheets/fonts.scss')
-rw-r--r-- | app/assets/stylesheets/fonts.scss | 54 |
1 files changed, 13 insertions, 41 deletions
diff --git a/app/assets/stylesheets/fonts.scss b/app/assets/stylesheets/fonts.scss index bc49d17fcbb..0d87d49ac18 100644 --- a/app/assets/stylesheets/fonts.scss +++ b/app/assets/stylesheets/fonts.scss @@ -9,15 +9,26 @@ Usage: font-weight: 100 900; font-display: optional; font-style: normal; - font-named-instance: 'Regular'; /* stylelint-disable property-no-unknown */ + /* stylelint-disable-next-line property-no-unknown */ + font-named-instance: 'Regular'; src: font-url('gitlab-sans/GitLabSans.woff2') format('woff2'); } +@font-face { + font-family: 'GitLab Sans'; + font-weight: 100 900; + font-display: optional; + font-style: italic; + /* stylelint-disable-next-line property-no-unknown */ + font-named-instance: 'Regular'; + src: font-url('gitlab-sans/GitLabSans-Italic.woff2') format('woff2'); +} + /* ------------------------------------------------------- Monospaced font: GitLab Mono. Usage: - html { font-family: 'GitLab Mono', sans-serif; } + html { font-family: 'GitLab Mono', monospace; } */ @font-face { font-family: 'GitLab Mono'; @@ -35,45 +46,6 @@ Usage: src: font-url('gitlab-mono/GitLabMono-Italic.woff2') format('woff2'); } -/* ------------------------------------------------------- -Monospaced font: JetBrains Mono. - -All of the definitions below can be removed once -`GitLab Mono` is properly rolled out. - -Usage: - html { font-family: 'JetBrains Mono', sans-serif; } -*/ -@font-face { - font-family: 'JetBrains Mono'; - font-display: optional; - font-style: normal; - src: font-url('jetbrains-mono/JetBrainsMono.woff2') format('woff2'); -} - -@font-face { - font-family: 'JetBrains Mono'; - font-display: optional; - font-weight: bold; - src: font-url('jetbrains-mono/JetBrainsMono-Bold.woff2') format('woff2'); -} - -@font-face { - font-family: 'JetBrains Mono'; - font-display: optional; - font-weight: normal; - font-style: italic; - src: font-url('jetbrains-mono/JetBrainsMono-Italic.woff2') format('woff2'); -} - -@font-face { - font-family: 'JetBrains Mono'; - font-display: optional; - font-weight: bold; - font-style: italic; - src: font-url('jetbrains-mono/JetBrainsMono-BoldItalic.woff2') format('woff2'); -} - // This isn't the best solution, but we needed a quick fix // https://gitlab.com/gitlab-org/gitlab/-/merge_requests/107592/ * { |