summaryrefslogtreecommitdiff
path: root/app/assets/stylesheets/framework/blocks.scss
diff options
context:
space:
mode:
authorClement Ho <ClemMakesApps@gmail.com>2018-05-08 10:49:30 -0500
committerClement Ho <ClemMakesApps@gmail.com>2018-05-08 10:49:30 -0500
commit5955caed321e242bfebe52a4b47346a01a50e4f6 (patch)
treed9710c0732ce21801b4a79a281bec0bd39582a95 /app/assets/stylesheets/framework/blocks.scss
parentf9e2b4730f58ba630344c9554eb907ab003abbd5 (diff)
parent533593e95cd3a922a2ec2ea43b345862361dfd67 (diff)
downloadgitlab-ce-5955caed321e242bfebe52a4b47346a01a50e4f6.tar.gz
Merge branch 'master' into bootstrap4
Diffstat (limited to 'app/assets/stylesheets/framework/blocks.scss')
-rw-r--r--app/assets/stylesheets/framework/blocks.scss4
1 files changed, 2 insertions, 2 deletions
diff --git a/app/assets/stylesheets/framework/blocks.scss b/app/assets/stylesheets/framework/blocks.scss
index 4505fd53618..c5be27f2d29 100644
--- a/app/assets/stylesheets/framework/blocks.scss
+++ b/app/assets/stylesheets/framework/blocks.scss
@@ -46,7 +46,7 @@
}
&.middle-block {
- margin-top: 0;
+ margin-top: $gl-padding-24;
margin-bottom: 0;
}
@@ -61,7 +61,7 @@
}
&.footer-block {
- margin-top: 0;
+ margin-top: $gl-padding-24;
border-bottom: 0;
margin-bottom: -$gl-padding;
}