diff options
author | Sam Bigelow <sbigelow@gitlab.com> | 2019-01-31 09:38:23 -0500 |
---|---|---|
committer | Sam Bigelow <sbigelow@gitlab.com> | 2019-02-07 10:03:53 -0500 |
commit | 7f91112576d5cbdceb55906e90c6a9cbc1e21318 (patch) | |
tree | cd43e965e3a7bd5d6082c2613655fa1a39c37c93 | |
parent | 232ae06a829ba1a7e795564f711e730bd839be41 (diff) | |
download | gitlab-ce-gitlab-ui-132-add-bootstrap-vue-s-form-checkbox.tar.gz |
Add CSS to be used by vue-bootstrap form checkboxgitlab-ui-132-add-bootstrap-vue-s-form-checkbox
-rw-r--r-- | app/assets/stylesheets/framework/forms.scss | 34 | ||||
-rw-r--r-- | changelogs/unreleased/gitlab-ui-132-add-bootstrap-vue-s-form-checkbox.yml | 5 |
2 files changed, 39 insertions, 0 deletions
diff --git a/app/assets/stylesheets/framework/forms.scss b/app/assets/stylesheets/framework/forms.scss index cbf9ee24ec5..67ae3e7c90b 100644 --- a/app/assets/stylesheets/framework/forms.scss +++ b/app/assets/stylesheets/framework/forms.scss @@ -274,3 +274,37 @@ label { max-width: $input-lg-width; width: 100%; } + +/* +* Bootstrap-vue form-checkbox +* Override styles to handle vue-bootstrap's use of REMs +*/ + +.custom-control.custom-checkbox.custom-control-inline { + min-height: 1.5 * $gl-font-size; + padding-left: 1.5 * $gl-font-size; + + .custom-control { + max-height: 1.5 * $gl-font-size; + padding-left: 1.5 * $gl-font-size; + min-height: 1.5 * $gl-font-size; + } + + .custom-control-inline { + margin-right: $gl-font-size; + } + + .custom-control-label::before { + top: $gl-padding-4; + left: -1.5 * $gl-font-size; + width: $gl-font-size; + height: $gl-font-size; + } + + .custom-control-label::after { + top: $gl-padding-4; + left: -1.5 * $gl-font-size; + width: $gl-font-size; + height: $gl-font-size; + } +} diff --git a/changelogs/unreleased/gitlab-ui-132-add-bootstrap-vue-s-form-checkbox.yml b/changelogs/unreleased/gitlab-ui-132-add-bootstrap-vue-s-form-checkbox.yml new file mode 100644 index 00000000000..55a501eb474 --- /dev/null +++ b/changelogs/unreleased/gitlab-ui-132-add-bootstrap-vue-s-form-checkbox.yml @@ -0,0 +1,5 @@ +--- +title: Add CSS for gitlab-ui's Form Checkbox +merge_request: !24826 +author: +type: other |