summaryrefslogtreecommitdiff
path: root/app/assets/stylesheets/framework/common.scss
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2015-12-02 14:46:15 +0100
committerDouwe Maan <douwe@gitlab.com>2015-12-02 14:46:15 +0100
commit3ae7dba931b880b8090edffb247ebfe32d26648e (patch)
tree11b681080e41dc6a859f73069db1702d1eb8ff28 /app/assets/stylesheets/framework/common.scss
parent58dad2a9dadea647b5665e1de6a6e997484b96b1 (diff)
downloadgitlab-ce-3ae7dba931b880b8090edffb247ebfe32d26648e.tar.gz
Use gl-padding instead of 15px/20px where appropriate
Diffstat (limited to 'app/assets/stylesheets/framework/common.scss')
-rw-r--r--app/assets/stylesheets/framework/common.scss10
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;
+}