diff options
| author | Douwe Maan <douwe@gitlab.com> | 2015-12-03 13:26:02 +0100 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2015-12-03 13:26:02 +0100 |
| commit | 00ebe2239b7834fd754fa2ab8fd14b2ef6074f63 (patch) | |
| tree | 3764d5a709b2b0dd066abb59dc6e062a33d6224a /app/assets/stylesheets/framework/common.scss | |
| parent | f10bd7df90cd509848dfcc9a574d7e4569a0428e (diff) | |
| parent | 6689224a90f3d2500be5d927ea1ed9656fc7b1b6 (diff) | |
| download | gitlab-ce-00ebe2239b7834fd754fa2ab8fd14b2ef6074f63.tar.gz | |
Merge branch 'master' into ui/issuable-list-itemui/issuable-list-item
Diffstat (limited to 'app/assets/stylesheets/framework/common.scss')
| -rw-r--r-- | app/assets/stylesheets/framework/common.scss | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/app/assets/stylesheets/framework/common.scss b/app/assets/stylesheets/framework/common.scss index 1c7c31b02a9..d2f491daf78 100644 --- a/app/assets/stylesheets/framework/common.scss +++ b/app/assets/stylesheets/framework/common.scss @@ -7,7 +7,7 @@ /** COMMON CLASSES **/ .prepend-top-10 { margin-top:10px } -.prepend-top-default { margin-top: $gl-padding; } +.prepend-top-default { margin-top: $gl-padding !important; } .prepend-top-20 { margin-top:20px } .prepend-left-10 { margin-left:10px } .prepend-left-20 { margin-left:20px } @@ -52,6 +52,10 @@ pre { } } +hr { + margin: $gl-padding 0; +} + .dropdown-menu > li > a { text-shadow: none; } @@ -429,3 +433,7 @@ table { .space-right { margin-right: 10px; } + +.alert, .progress { + margin-bottom: $gl-padding; +} |