Skip to content

G
gitlab-ce
Commit 1255cb4f authored by Annabel Dunstone Gray's avatar Annabel Dunstone Gray Committed by Douglas Barbosa Alexandre
Browse files
Options

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

Change code font size to 12px

See merge request !8157
parent 587ff771
Show whitespace changes
Inline Side-by-side
Showing with 3 additions and 3 deletions
app/assets/stylesheets/framework/blocks.scss
View file @ 1255cb4f
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
padding: 20px; padding: 20px;
color: $gl-gray; color: $gl-gray;
font-weight: normal; font-weight: normal;
font-size: 16px; font-size: 14px;
line-height: 36px; line-height: 36px;
&.diff-collapsed { &.diff-collapsed {
......
app/assets/stylesheets/framework/variables.scss
View file @ 1255cb4f
...@@ -134,8 +134,8 @@ $md-area-border: #ddd; ...@@ -134,8 +134,8 @@ $md-area-border: #ddd;
/* /*
* Code * Code
*/ */
$code_font_size: 13px; $code_font_size: 12px;
$code_line_height: 1.5; $code_line_height: 1.6;
/* /*
* Padding * Padding
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7