diff options
| author | Mario Vavti <mario@mariovavti.com> | 2021-10-09 20:08:23 +0200 |
|---|---|---|
| committer | Mario Vavti <mario@mariovavti.com> | 2021-10-09 20:08:23 +0200 |
| commit | 094536e6339eaba87cc0b372418a50b865fe0a97 (patch) | |
| tree | 71f8e1f1d421322dbe52ca631e6bd32bd05e8b43 /vendor/twbs/bootstrap/scss/forms | |
| parent | 4f2a439873d105b91a5dbbd4dc72d2e2183349a8 (diff) | |
| parent | 63bdab2b5fd456979587e3c065c274c6475c17b1 (diff) | |
| download | volse-hubzilla-094536e6339eaba87cc0b372418a50b865fe0a97.tar.gz volse-hubzilla-094536e6339eaba87cc0b372418a50b865fe0a97.tar.bz2 volse-hubzilla-094536e6339eaba87cc0b372418a50b865fe0a97.zip | |
Merge branch 'dev' of https://framagit.org/hubzilla/core into dev
Diffstat (limited to 'vendor/twbs/bootstrap/scss/forms')
| -rw-r--r-- | vendor/twbs/bootstrap/scss/forms/_form-control.scss | 2 | ||||
| -rw-r--r-- | vendor/twbs/bootstrap/scss/forms/_form-select.scss | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/vendor/twbs/bootstrap/scss/forms/_form-control.scss b/vendor/twbs/bootstrap/scss/forms/_form-control.scss index 9728b91f3..96423c530 100644 --- a/vendor/twbs/bootstrap/scss/forms/_form-control.scss +++ b/vendor/twbs/bootstrap/scss/forms/_form-control.scss @@ -199,7 +199,7 @@ textarea { // stylelint-enable selector-no-qualifying-type .form-control-color { - max-width: 3rem; + width: $form-color-width; height: auto; // Override fixed browser height padding: $input-padding-y; diff --git a/vendor/twbs/bootstrap/scss/forms/_form-select.scss b/vendor/twbs/bootstrap/scss/forms/_form-select.scss index 4506a979a..153ff6cd5 100644 --- a/vendor/twbs/bootstrap/scss/forms/_form-select.scss +++ b/vendor/twbs/bootstrap/scss/forms/_form-select.scss @@ -60,6 +60,7 @@ padding-bottom: $form-select-padding-y-sm; padding-left: $form-select-padding-x-sm; @include font-size($form-select-font-size-sm); + @include border-radius($form-select-border-radius-sm); } .form-select-lg { @@ -67,4 +68,5 @@ padding-bottom: $form-select-padding-y-lg; padding-left: $form-select-padding-x-lg; @include font-size($form-select-font-size-lg); + @include border-radius($form-select-border-radius-lg); } |