summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhil Hughes <me@iamphill.com>2018-12-04 08:48:22 +0000
committerPhil Hughes <me@iamphill.com>2018-12-04 08:48:22 +0000
commit03d900b6df5f6f700ffb8425f880c141cddacd3e (patch)
tree0c3e2ab185d6da34a0a816eb3c52e566c9136db5
parentf31b784c3f2d8e313edc5fbd9fc8b237ec09fff7 (diff)
parent9798703cc45cddf4545b21d33c1b1f77ede8f370 (diff)
downloadgitlab-ce-03d900b6df5f6f700ffb8425f880c141cddacd3e.tar.gz
Merge branch 'update-variable-name' into 'master'
Update -font-size variable name See merge request gitlab-org/gitlab-ce!23519
-rw-r--r--app/assets/stylesheets/framework/highlight.scss2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/assets/stylesheets/framework/highlight.scss b/app/assets/stylesheets/framework/highlight.scss
index a0bf6907b5f..73533571a2f 100644
--- a/app/assets/stylesheets/framework/highlight.scss
+++ b/app/assets/stylesheets/framework/highlight.scss
@@ -47,7 +47,7 @@
a {
font-family: $monospace-font;
display: block;
- font-size: $code_font_size !important;
+ font-size: $code-font-size !important;
min-height: 19px;
white-space: nowrap;