summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnnabel Dunstone Gray <annabel.m.gray@gmail.com>2019-01-17 21:02:19 +0000
committerAnnabel Dunstone Gray <annabel.m.gray@gmail.com>2019-01-17 21:02:19 +0000
commit7804862923d855b37cc548156c9201069d9bce20 (patch)
treeeee0ec6b94e34de8944bec545672c1657378ab20
parent49e538d0af3d7615ab4bc08441f967a3f8ad542f (diff)
parent57d2bf04cf9828fdcad3d8a8cb3c09889ab6de69 (diff)
downloadgitlab-ce-7804862923d855b37cc548156c9201069d9bce20.tar.gz
Merge branch '55256-bs-spacer' into 'master'
Add spacer and spacers as overrides Closes #55256 See merge request gitlab-org/gitlab-ce!24459
-rw-r--r--app/assets/stylesheets/framework/variables_overrides.scss9
1 files changed, 9 insertions, 0 deletions
diff --git a/app/assets/stylesheets/framework/variables_overrides.scss b/app/assets/stylesheets/framework/variables_overrides.scss
index d5f8e3fb4ee..1dfe2a69a2f 100644
--- a/app/assets/stylesheets/framework/variables_overrides.scss
+++ b/app/assets/stylesheets/framework/variables_overrides.scss
@@ -34,3 +34,12 @@ $h3-font-size: 14px * 1.75;
$h4-font-size: 14px * 1.5;
$h5-font-size: 14px * 1.25;
$h6-font-size: 14px;
+$spacer: $grid-size;
+$spacers: (
+ 0: 0,
+ 1: ($spacer * .5),
+ 2: ($spacer),
+ 3: ($spacer * 2),
+ 4: ($spacer * 3),
+ 5: ($spacer * 4)
+);