Merge branch 'change-code-font-size-to-12px' into 'master'

Change code font size to 12px See merge request !8157

Merge branch 'change-code-font-size-to-12px' into 'master'
Change code font size to 12px See merge request !8157
8229aedf · Annabel Dunstone Gray · 580220c6 · 5a4b3e8e · 8229aedf · 8229aedf
Commit 8229aedf authored Dec 21, 2016 by Annabel Dunstone Gray
Showing with 3 additions and 3 deletions

app/assets/stylesheets/framework/blocks.scss app/assets/stylesheets/framework/blocks.scss +1 -1

app/assets/stylesheets/framework/variables.scss app/assets/stylesheets/framework/variables.scss +2 -2

No files found.
--- 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 {

--- 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