diff options
| author | Kushal Pandya <kushalspandya@gmail.com> | 2019-06-17 07:32:33 +0000 |
|---|---|---|
| committer | Kushal Pandya <kushalspandya@gmail.com> | 2019-06-17 07:32:33 +0000 |
| commit | 7f54f045ddeca672981b6dadc63615e372e9a737 (patch) | |
| tree | 01021edfe6faf747b48bc38c094a468514326b8d | |
| parent | 5eff8dd1e7a9a51349953124a5eca069b866f6c7 (diff) | |
| parent | e83e3c7403ca00237f2d9ab4aa7401959aa3640b (diff) | |
| download | gitlab-ce-7f54f045ddeca672981b6dadc63615e372e9a737.tar.gz | |
Merge branch 'gitlab-ui-259-style-checkboxes' into 'master'
Make changes suggested by Pedro for UX
See merge request gitlab-org/gitlab-ce!29324
| -rw-r--r-- | app/assets/stylesheets/framework/forms.scss | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/app/assets/stylesheets/framework/forms.scss b/app/assets/stylesheets/framework/forms.scss index 2a601afff53..821e6691fe4 100644 --- a/app/assets/stylesheets/framework/forms.scss +++ b/app/assets/stylesheets/framework/forms.scss @@ -248,14 +248,24 @@ label { .gl-form-checkbox { align-items: baseline; + margin-right: 1rem; + margin-bottom: 0.25rem; + + .form-check-input { + margin-right: 0; + } + + .form-check-label { + padding-left: $gl-padding-8; + } &.form-check-inline .form-check-input { align-self: flex-start; - margin-right: $gl-padding-8; height: 1.5 * $gl-font-size; } - .help-text { - margin-bottom: 0; + .form-check-input:disabled, + .form-check-input:disabled ~ .form-check-label { + cursor: not-allowed; } } |