diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2016-07-19 07:02:53 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2016-07-19 07:02:53 +0000 |
| commit | 78cd5b8d0e0a69d7b1681bf98b17ccb7a22dde5f (patch) | |
| tree | 1e7ff33dbc0d777f84a441d2c27c2d237d16cf8b | |
| parent | 092d974087a124baf5cf6272b812b34748d06a15 (diff) | |
| parent | df8e4f3ae2097241761e4997dbd2b964895d9b0f (diff) | |
| download | gitlab-ce-78cd5b8d0e0a69d7b1681bf98b17ccb7a22dde5f.tar.gz | |
Merge branch 'dz-small-ui-improvements' into 'master'
Small ui improvements
* make file tree row 2px smaller for more compact view
* make sub navigation background a bit darker for better contrast with main navigation
cc @hazelyang @alfredo1
See merge request !5315
| -rw-r--r-- | app/assets/stylesheets/framework/variables.scss | 2 | ||||
| -rw-r--r-- | app/assets/stylesheets/pages/tree.scss | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/assets/stylesheets/framework/variables.scss b/app/assets/stylesheets/framework/variables.scss index f0e7002e4cd..1882d4e888d 100644 --- a/app/assets/stylesheets/framework/variables.scss +++ b/app/assets/stylesheets/framework/variables.scss @@ -16,7 +16,7 @@ $border-color: #e5e5e5; $focus-border-color: #3aabf0; $table-border-color: #f0f0f0; $background-color: #fafafa; -$dark-background-color: #f7f7f7; +$dark-background-color: #f5f5f5; $table-text-gray: #8f8f8f; /* diff --git a/app/assets/stylesheets/pages/tree.scss b/app/assets/stylesheets/pages/tree.scss index 42a20e9775f..390977297fb 100644 --- a/app/assets/stylesheets/pages/tree.scss +++ b/app/assets/stylesheets/pages/tree.scss @@ -19,7 +19,7 @@ border-top: 1px solid $table-border-gray; td, th { - line-height: 23px; + line-height: 21px; } &:hover { |