From f65b5e10e1d24e2968d283ef7801ea75d813d6f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Kout?= Date: Fri, 12 May 2017 13:22:27 +0200 Subject: [PATCH 1/3] Move the gap between inline checkboxes to right Prevents vertical missalignment on teh lefthand side when the row of checkboxes wraps. --- scss/_forms.scss | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/scss/_forms.scss b/scss/_forms.scss index 55e8cb43a491..9a6939cd7547 100644 --- a/scss/_forms.scss +++ b/scss/_forms.scss @@ -236,7 +236,10 @@ select.form-control-lg { } + .form-check-inline { - margin-left: $form-check-inline-margin-x; + + &:not(:last-child) { + margin-right: $form-check-inline-margin-x; + } } } From 368577f78a2d4d92b159e26bc49024d5c01e0f08 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Kout?= Date: Fri, 12 May 2017 13:26:57 +0200 Subject: [PATCH 2/3] Remove trailing whitespace --- scss/_forms.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scss/_forms.scss b/scss/_forms.scss index 9a6939cd7547..7f66c5e1150b 100644 --- a/scss/_forms.scss +++ b/scss/_forms.scss @@ -236,7 +236,7 @@ select.form-control-lg { } + .form-check-inline { - + &:not(:last-child) { margin-right: $form-check-inline-margin-x; } From a00cf2661ab3aaf55392cd87a8cfe320818579b2 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 18 Jun 2017 00:50:41 -0700 Subject: [PATCH 3/3] no need to the sibling selector, just put margin-right on the checkbox --- scss/_forms.scss | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/scss/_forms.scss b/scss/_forms.scss index 7f66c5e1150b..553ab843dc81 100644 --- a/scss/_forms.scss +++ b/scss/_forms.scss @@ -230,17 +230,11 @@ select.form-control-lg { // Radios and checkboxes on same line .form-check-inline { display: inline-block; + margin-right: $form-check-inline-margin-x; .form-check-label { vertical-align: middle; } - - + .form-check-inline { - - &:not(:last-child) { - margin-right: $form-check-inline-margin-x; - } - } }