Automatic merge of gitlab-org/gitlab-ce master

ea2025b0 · GitLab Bot · 4f4e3e26 · 78048629 · ea2025b0
Commit ea2025b0 authored Jan 17, 2019 by GitLab Bot
Show whitespace changes
Inline Side-by-side

Showing with 9 additions and 0 deletions

app/assets/stylesheets/framework/variables_overrides.scss app/assets/stylesheets/framework/variables_overrides.scss +9 -0

No files found.
--- 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)
+);