diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-12-20 17:22:11 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-12-20 17:22:11 +0300 |
commit | 0c872e02b2c822e3397515ec324051ff540f0cd5 (patch) | |
tree | ce2fb6ce7030e4dad0f4118d21ab6453e5938cdd /app/assets/stylesheets/framework/typography.scss | |
parent | f7e05a6853b12f02911494c4b3fe53d9540d74fc (diff) |
Add latest changes from gitlab-org/gitlab@15-7-stable-eev15.7.0-rc42
Diffstat (limited to 'app/assets/stylesheets/framework/typography.scss')
-rw-r--r-- | app/assets/stylesheets/framework/typography.scss | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/app/assets/stylesheets/framework/typography.scss b/app/assets/stylesheets/framework/typography.scss index 2c2d8a2b592..0a475845fd3 100644 --- a/app/assets/stylesheets/framework/typography.scss +++ b/app/assets/stylesheets/framework/typography.scss @@ -81,6 +81,7 @@ word-wrap: break-word; overflow-wrap: break-word; word-break: keep-all; + @include gl-font-base; } h1 { @@ -322,7 +323,6 @@ pre { margin-bottom: 16px; - font-size: 13px; line-height: 1.6em; overflow-x: auto; border-radius: $border-radius-default; @@ -587,7 +587,7 @@ } } - .gl-new-dropdown-item { + .gl-dropdown-item { margin: 0; padding: 0; line-height: 1rem; @@ -658,7 +658,7 @@ pre { display: block; padding: $gl-padding-8 $input-horizontal-padding; margin: 0 0 $gl-padding-8; - font-size: $gl-font-size-monospace; + @include gl-font-base; word-break: break-all; word-wrap: break-word; color: $gl-text-color; @@ -680,7 +680,7 @@ code { } .monospace { - font-family: $monospace-font; + @include gl-font-monospace; } .weight-normal { @@ -706,7 +706,7 @@ code { */ textarea.js-gfm-input { font-family: $monospace-font; - font-size: $gl-font-size-monospace; + @include gl-font-base; } h1, @@ -772,3 +772,8 @@ textarea { wbr { display: inline-block; } + +// The font used in Monaco editor - Web IDE, Snippets, single file editor +:root { + --code-editor-font: #{$monospace-font}; +} |