diff options
| author | Brad Kent <[email protected]> | 2016-11-28 22:56:49 -0600 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2016-11-28 20:56:49 -0800 |
| commit | 8250bd1b2175fcab70401dcc987cee6054b25556 (patch) | |
| tree | a58dc3b67f940482d572500f65b50d45f75a6233 /scss | |
| parent | af937836d95ebf7bc100288bef7a7f99b637d7f9 (diff) | |
| download | bootstrap-8250bd1b2175fcab70401dcc987cee6054b25556.tar.xz bootstrap-8250bd1b2175fcab70401dcc987cee6054b25556.zip | |
Fix #20936 make inline checkbox/radio markup same as stacked (#20995)
* #20936 make inline checkbox/radio markup same as stacked
* tweak language and remove extra blank line in snippet
Diffstat (limited to 'scss')
| -rw-r--r-- | scss/_forms.scss | 14 | ||||
| -rw-r--r-- | scss/mixins/_forms.scss | 1 |
2 files changed, 4 insertions, 11 deletions
diff --git a/scss/_forms.scss b/scss/_forms.scss index 5ea3963e4..87e549121 100644 --- a/scss/_forms.scss +++ b/scss/_forms.scss @@ -235,20 +235,14 @@ select.form-control-lg { // Radios and checkboxes on same line .form-check-inline { - position: relative; display: inline-block; - padding-left: 1.25rem; - margin-bottom: 0; // Override default `<label>` bottom margin - vertical-align: middle; - cursor: pointer; - + .form-check-inline { - margin-left: .75rem; + .form-check-label { + vertical-align: middle; } - &.disabled { - color: $text-muted; - cursor: $cursor-disabled; + + .form-check-inline { + margin-left: .75rem; } } diff --git a/scss/mixins/_forms.scss b/scss/mixins/_forms.scss index 280849536..c8aea9669 100644 --- a/scss/mixins/_forms.scss +++ b/scss/mixins/_forms.scss @@ -9,7 +9,6 @@ .form-control-label, .col-form-label, .form-check-label, - .form-check-inline, .custom-control { color: $color; } |