diff options
| author | Jacob Schatz <jschatz1@gmail.com> | 2016-01-23 05:41:00 +0000 |
|---|---|---|
| committer | Jacob Schatz <jschatz1@gmail.com> | 2016-01-23 05:41:00 +0000 |
| commit | 0ee2d50eee2d1054a30c353c6a07c9c1a54b7486 (patch) | |
| tree | 913910fa2e2067d523c08dba434edff2e3e63ea1 /app/assets | |
| parent | dfc7bfd3e395a6d55b3b6f45166258fc3127724e (diff) | |
| parent | 367cd8ac75eb53b0d7a94e9803fe2f881bd86313 (diff) | |
| download | gitlab-ce-0ee2d50eee2d1054a30c353c6a07c9c1a54b7486.tar.gz | |
Merge branch 'issuable-white-bg' into 'master'
Remove gray background from issue/mr/milestone background
Fixes #6062
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
cc @skyruler @creamzy
See merge request !2573
Diffstat (limited to 'app/assets')
| -rw-r--r-- | app/assets/stylesheets/framework/blocks.scss | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/app/assets/stylesheets/framework/blocks.scss b/app/assets/stylesheets/framework/blocks.scss index d0f5d33bf4d..bd89cc7dc1d 100644 --- a/app/assets/stylesheets/framework/blocks.scss +++ b/app/assets/stylesheets/framework/blocks.scss @@ -146,6 +146,10 @@ border-bottom: 1px solid $border-color; &.oneline-block { - line-height: 42px; + line-height: 36px; + } + + > .controls { + float: right; } } |