diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-11-07 10:43:00 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-11-07 10:43:00 +0000 |
| commit | 0d9fb211f3f842d10e1c57dcb9d3d42a9c11cd0b (patch) | |
| tree | 3e06d7992d537faeeea4f3291dd4085c789fc173 /app/assets | |
| parent | f57d59226d5ba5de45b710876f2689da9cc2e0f4 (diff) | |
| parent | c5ec2a23a466f45127b6056693e1a473ae7e503e (diff) | |
| download | gitlab-ce-0d9fb211f3f842d10e1c57dcb9d3d42a9c11cd0b.tar.gz | |
Merge branch 'small-ui-improvements' into 'master'
Small UI improvements to merge request page
Make gray block under tabs identical height. Also same height have blocks on pages like `Groups` etc. So this improvement is targeted for consistency in UI too
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Fixes internal issues
* https://dev.gitlab.org/gitlab/gitlabhq/issues/2591
* https://dev.gitlab.org/gitlab/gitlabhq/issues/2592
cc @DouweM
See merge request !1759
Diffstat (limited to 'app/assets')
| -rw-r--r-- | app/assets/stylesheets/framework/blocks.scss | 4 | ||||
| -rw-r--r-- | app/assets/stylesheets/pages/diff.scss | 1 |
2 files changed, 4 insertions, 1 deletions
diff --git a/app/assets/stylesheets/framework/blocks.scss b/app/assets/stylesheets/framework/blocks.scss index 8917c53b1f5..1635df9c97b 100644 --- a/app/assets/stylesheets/framework/blocks.scss +++ b/app/assets/stylesheets/framework/blocks.scss @@ -28,6 +28,10 @@ border-bottom: 1px solid $border-color; color: $gl-gray; + &.oneline-block { + line-height: 42px; + } + &.white { background-color: white; } diff --git a/app/assets/stylesheets/pages/diff.scss b/app/assets/stylesheets/pages/diff.scss index d9ef06dc6b6..afd6fb73675 100644 --- a/app/assets/stylesheets/pages/diff.scss +++ b/app/assets/stylesheets/pages/diff.scss @@ -367,7 +367,6 @@ .inline-parallel-buttons { float: right; - margin-top: -5px; } // Mobile |