From 7b19e64bedbfd2e1ba0aa9ce9ca8f5559f7c6163 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jacob=20M=C3=BCller?= Date: Tue, 4 Dec 2018 14:58:22 +0100 Subject: [PATCH 1/3] Make form grid gutter width configurable --- scss/_forms.scss | 8 ++++---- scss/_variables.scss | 2 ++ 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/scss/_forms.scss b/scss/_forms.scss index a83e04d6577a..3212875013e9 100644 --- a/scss/_forms.scss +++ b/scss/_forms.scss @@ -190,13 +190,13 @@ textarea.form-control { .form-row { display: flex; flex-wrap: wrap; - margin-right: -5px; - margin-left: -5px; + margin-right: -($form-grid-gutter-width / 2); + margin-left: -($form-grid-gutter-width / 2); > .col, > [class*="col-"] { - padding-right: 5px; - padding-left: 5px; + padding-right: ($form-grid-gutter-width / 2); + padding-left: ($form-grid-gutter-width / 2); } } diff --git a/scss/_variables.scss b/scss/_variables.scss index 988624451b0f..5170ec61fa51 100644 --- a/scss/_variables.scss +++ b/scss/_variables.scss @@ -499,6 +499,8 @@ $input-transition: border-color .15s ease-in-out, box-shado $form-text-margin-top: .25rem !default; +$form-grid-gutter-width: 10px !default; + $form-check-input-gutter: 1.25rem !default; $form-check-input-margin-y: .3rem !default; $form-check-input-margin-x: .25rem !default; From 8de9e2e8ce7135f6094f643b9b33f75c200f03c2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jacob=20M=C3=BCller?= Date: Tue, 4 Dec 2018 22:58:26 +0100 Subject: [PATCH 2/3] Remove redudant brackets --- scss/_forms.scss | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/scss/_forms.scss b/scss/_forms.scss index 3212875013e9..3622db4c404e 100644 --- a/scss/_forms.scss +++ b/scss/_forms.scss @@ -190,13 +190,13 @@ textarea.form-control { .form-row { display: flex; flex-wrap: wrap; - margin-right: -($form-grid-gutter-width / 2); - margin-left: -($form-grid-gutter-width / 2); + margin-right: -$form-grid-gutter-width / 2; + margin-left: -$form-grid-gutter-width / 2; > .col, > [class*="col-"] { - padding-right: ($form-grid-gutter-width / 2); - padding-left: ($form-grid-gutter-width / 2); + padding-right: $form-grid-gutter-width / 2; + padding-left: $form-grid-gutter-width / 2; } } From 3deb7ed734c9ff43c2bb82a0a71077ac56cc72bb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jacob=20M=C3=BCller?= Date: Tue, 4 Dec 2018 22:58:45 +0100 Subject: [PATCH 3/3] Move varibale to other location --- scss/_variables.scss | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/scss/_variables.scss b/scss/_variables.scss index 5170ec61fa51..3cb0299a308d 100644 --- a/scss/_variables.scss +++ b/scss/_variables.scss @@ -499,8 +499,6 @@ $input-transition: border-color .15s ease-in-out, box-shado $form-text-margin-top: .25rem !default; -$form-grid-gutter-width: 10px !default; - $form-check-input-gutter: 1.25rem !default; $form-check-input-margin-y: .3rem !default; $form-check-input-margin-x: .25rem !default; @@ -508,6 +506,7 @@ $form-check-input-margin-x: .25rem !default; $form-check-inline-margin-x: .75rem !default; $form-check-inline-input-margin-x: .3125rem !default; +$form-grid-gutter-width: 10px !default; $form-group-margin-bottom: 1rem !default; $input-group-addon-color: $input-color !default;