diff options
| author | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2016-12-21 20:09:36 +0000 |
|---|---|---|
| committer | Douglas Barbosa Alexandre <dbalexandre@gmail.com> | 2016-12-21 19:31:06 -0200 |
| commit | 1255cb4fd4dd7799004192bbc9e4920d1980d928 (patch) | |
| tree | da895dbaddbec1c8b6448cf969a80663f7c69389 /app | |
| parent | 587ff77128d7d869c1eebf911cf08747fe369f79 (diff) | |
| download | gitlab-ce-1255cb4fd4dd7799004192bbc9e4920d1980d928.tar.gz | |
Merge branch 'change-code-font-size-to-12px' into 'master'
Change code font size to 12px
See merge request !8157
Diffstat (limited to 'app')
| -rw-r--r-- | app/assets/stylesheets/framework/blocks.scss | 2 | ||||
| -rw-r--r-- | app/assets/stylesheets/framework/variables.scss | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/app/assets/stylesheets/framework/blocks.scss b/app/assets/stylesheets/framework/blocks.scss index 9f02749f5ab..e9aadffc73c 100644 --- a/app/assets/stylesheets/framework/blocks.scss +++ b/app/assets/stylesheets/framework/blocks.scss @@ -9,7 +9,7 @@ padding: 20px; color: $gl-gray; font-weight: normal; - font-size: 16px; + font-size: 14px; line-height: 36px; &.diff-collapsed { diff --git a/app/assets/stylesheets/framework/variables.scss b/app/assets/stylesheets/framework/variables.scss index 460c5d995be..dca828851f3 100644 --- a/app/assets/stylesheets/framework/variables.scss +++ b/app/assets/stylesheets/framework/variables.scss @@ -134,8 +134,8 @@ $md-area-border: #ddd; /* * Code */ -$code_font_size: 13px; -$code_line_height: 1.5; +$code_font_size: 12px; +$code_line_height: 1.6; /* * Padding |