diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-09-07 13:18:11 +0200 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-09-07 13:18:11 +0200 |
| commit | 700a342e0d2a92c8384ffa579bdf376d86a2d7c7 (patch) | |
| tree | 3f37b635f4f3de371b311833d1e93e5d54f96827 /app/assets | |
| parent | dad163b7ee1559f903c672da7165b700b999f970 (diff) | |
| download | gitlab-ce-700a342e0d2a92c8384ffa579bdf376d86a2d7c7.tar.gz | |
Restyle group pages. Merge header with page title
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Diffstat (limited to 'app/assets')
| -rw-r--r-- | app/assets/stylesheets/generic/blocks.scss | 5 | ||||
| -rw-r--r-- | app/assets/stylesheets/generic/common.scss | 1 |
2 files changed, 6 insertions, 0 deletions
diff --git a/app/assets/stylesheets/generic/blocks.scss b/app/assets/stylesheets/generic/blocks.scss index 61209f73a2e..abf4657dd58 100644 --- a/app/assets/stylesheets/generic/blocks.scss +++ b/app/assets/stylesheets/generic/blocks.scss @@ -27,6 +27,11 @@ border-bottom: 1px solid #e7e9ed; color: $gl-gray; + &.second-block { + margin-top: -1px; + margin-bottom: 0; + } + &.footer-block { margin-top: 0; margin-bottom: -$gl-padding; diff --git a/app/assets/stylesheets/generic/common.scss b/app/assets/stylesheets/generic/common.scss index 096698e8466..b995486588f 100644 --- a/app/assets/stylesheets/generic/common.scss +++ b/app/assets/stylesheets/generic/common.scss @@ -7,6 +7,7 @@ /** COMMON CLASSES **/ .prepend-top-10 { margin-top:10px } +.prepend-top-default { margin-top: $gl-padding; } .prepend-top-20 { margin-top:20px } .prepend-left-10 { margin-left:10px } .prepend-left-20 { margin-left:20px } |