diff options
| author | Douwe Maan <douwe@gitlab.com> | 2015-12-03 13:32:16 +0100 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2015-12-03 13:32:16 +0100 |
| commit | 3b70d5b207e7f9fbd20584d0a42d06609b61e751 (patch) | |
| tree | 925234438a2a7fb0508cdfa551dcfe1068a0de39 /app/assets/stylesheets/framework/common.scss | |
| parent | a8e463c8aca571ede3691c98f7f3990d3d880d0b (diff) | |
| parent | 6689224a90f3d2500be5d927ea1ed9656fc7b1b6 (diff) | |
| download | gitlab-ce-3b70d5b207e7f9fbd20584d0a42d06609b61e751.tar.gz | |
Merge branch 'master' into fork-eventfork-event
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 61689aff57e..61ecd58e6c5 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; } @@ -433,3 +437,7 @@ table { .space-right { margin-right: 10px; } + +.alert, .progress { + margin-bottom: $gl-padding; +} |