diff options
| author | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2016-12-21 23:09:36 +0300 |
|---|---|---|
| committer | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2016-12-21 23:09:36 +0300 |
| commit | 8229aedf0d545d42da2c510ee5103065d14d1200 (patch) | |
| tree | 7a96894557014d5808fccc89ddffbb02a4943d2a /app/assets | |
| parent | 580220c6ccf2b541e46c4c8a1b3830195c3b5a8b (diff) | |
| parent | 5a4b3e8e302eaa263203d84e93862a89b5e90d90 (diff) | |
Merge branch 'change-code-font-size-to-12px' into 'master'
Change code font size to 12px
See merge request !8157
Diffstat (limited to 'app/assets')
| -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 a5fb097a47f..3e1fded6b6b 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 |