diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-01-27 05:56:56 +0300 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-01-27 05:56:56 +0300 |
| commit | e6b97d09470b01b5b65e87dab339c500f1bac45f (patch) | |
| tree | babf805dd6097621f4eccc0f334143bc3d9f266b | |
| parent | 0f52d259617c4fe82ca1377bba904b3297407dea (diff) | |
Improve font sizes for code and diff
| -rw-r--r-- | CHANGELOG | 4 | ||||
| -rw-r--r-- | app/assets/stylesheets/generic/highlight.scss | 4 | ||||
| -rw-r--r-- | app/assets/stylesheets/main/variables.scss | 1 | ||||
| -rw-r--r-- | app/assets/stylesheets/sections/diff.scss | 6 |
4 files changed, 8 insertions, 7 deletions
diff --git a/CHANGELOG b/CHANGELOG index 72ca2b529d5..91409707c87 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -17,8 +17,8 @@ v 7.8.0 - Show tags in commit view (Hannes Rosenögger) - Only count a user's vote once on a merge request or issue (Michael Clarke) - - - - - + - Increate font size when browse source files and diffs + - Create new file in empty repository using GitLab UI - - Upgrade Sidekiq gem to version 3.3.0 - Stop git zombie creation during force push check diff --git a/app/assets/stylesheets/generic/highlight.scss b/app/assets/stylesheets/generic/highlight.scss index 839551ca8da..e1ca86af816 100644 --- a/app/assets/stylesheets/generic/highlight.scss +++ b/app/assets/stylesheets/generic/highlight.scss @@ -11,7 +11,7 @@ border-radius: 0; font-family: $monospace_font; font-size: $code_font_size !important; - line-height: 1.4 !important; + line-height: $code_line_height !important; margin: 0; overflow: auto; overflow-y: hidden; @@ -39,7 +39,7 @@ font-family: $monospace_font; display: block; font-size: $code_font_size !important; - line-height: 1.4 !important; + line-height: $code_line_height !important; white-space: nowrap; i { diff --git a/app/assets/stylesheets/main/variables.scss b/app/assets/stylesheets/main/variables.scss index f2402a4fc30..acbf5be94a3 100644 --- a/app/assets/stylesheets/main/variables.scss +++ b/app/assets/stylesheets/main/variables.scss @@ -60,3 +60,4 @@ $sidebar_width: 230px; $avatar_radius: 50%; $code_font_size: 13px; +$code_line_height: 1.5; diff --git a/app/assets/stylesheets/sections/diff.scss b/app/assets/stylesheets/sections/diff.scss index 758f15c8013..da50dbe4715 100644 --- a/app/assets/stylesheets/sections/diff.scss +++ b/app/assets/stylesheets/sections/diff.scss @@ -37,7 +37,7 @@ overflow-y: hidden; background: #FFF; color: #333; - font-size: 12px; + font-size: $code_font_size; .old { span.idiff { background-color: #F99; @@ -64,8 +64,8 @@ margin: 0px; padding: 0px; td { - line-height: 18px; - font-size: 12px; + line-height: $code_line_height; + font-size: $code_font_size; } } |