summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnnabel Dunstone Gray <annabel.dunstone@gmail.com>2016-12-21 08:25:59 -0600
committerAnnabel Dunstone Gray <annabel.dunstone@gmail.com>2016-12-21 08:37:20 -0600
commit5a4b3e8e302eaa263203d84e93862a89b5e90d90 (patch)
tree3d28399856487afa3527bec9a4d361124a5edf83
parent24dd95756e267413a6f4e238eef06f8378dcaf63 (diff)
downloadgitlab-ce-change-code-font-size-to-12px.tar.gz
Increase code line height and decrease empty diff font sizechange-code-font-size-to-12px
-rw-r--r--app/assets/stylesheets/framework/blocks.scss2
-rw-r--r--app/assets/stylesheets/framework/variables.scss2
2 files changed, 2 insertions, 2 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 d85d3f968d3..fcf7b8c2d36 100644
--- a/app/assets/stylesheets/framework/variables.scss
+++ b/app/assets/stylesheets/framework/variables.scss
@@ -134,7 +134,7 @@ $md-area-border: #ddd;
* Code
*/
$code_font_size: 12px;
-$code_line_height: 1.5;
+$code_line_height: 1.6;
/*
* Padding