diff options
| author | Annabel Gray <annabel.m.gray@gmail.com> | 2018-06-07 23:25:26 +0300 |
|---|---|---|
| committer | Annabel Gray <annabel.m.gray@gmail.com> | 2018-06-07 23:25:26 +0300 |
| commit | c9e3a73efd6339706ad88837f78f017e0a55d809 (patch) | |
| tree | 368572cb85e1c839bc57aa0f1eb6c52e14425717 | |
| parent | ce57dc70d87102ed6f920b5c785917889074fd21 (diff) | |
| parent | 3192313fbcdd76fbc624a3d54e1c750a4de0b6df (diff) | |
Merge branch 'override-bootstrap4-font-hierarchy' into 'master'
Override default font family hierarchy of bootstrap 4
Closes #47493
See merge request gitlab-org/gitlab-ce!19542
| -rw-r--r-- | app/assets/stylesheets/framework/variables.scss | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/app/assets/stylesheets/framework/variables.scss b/app/assets/stylesheets/framework/variables.scss index 730a0192de0..497261f938f 100644 --- a/app/assets/stylesheets/framework/variables.scss +++ b/app/assets/stylesheets/framework/variables.scss @@ -814,3 +814,5 @@ $secondary: $gray-light; $input-disabled-bg: $gray-light; $input-border-color: $theme-gray-200; $input-color: $gl-text-color; +$font-family-sans-serif: $regular_font; +$font-family-monospace: $monospace_font; |