Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/twbs/bootstrap.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Otto <markdotto@gmail.com>2018-04-30 02:47:35 +0300
committerMark Otto <markd.otto@gmail.com>2018-04-30 03:02:38 +0300
commit139e89235f7c768d42ac1148b75a9f8e45ead917 (patch)
tree5894e181bb01d714014a66e5fa3ae1658cc197be
parent7c53a8a195fd6b896199221a0783eee2af741eff (diff)
Simplify custom file inner height for generated browse button
-rw-r--r--scss/_custom-forms.scss2
-rw-r--r--scss/_variables.scss1
2 files changed, 2 insertions, 1 deletions
diff --git a/scss/_custom-forms.scss b/scss/_custom-forms.scss
index a60c4a45cb..cd75d8b447 100644
--- a/scss/_custom-forms.scss
+++ b/scss/_custom-forms.scss
@@ -286,7 +286,7 @@
bottom: 0;
z-index: 3;
display: block;
- height: calc(#{$custom-file-height} - #{$custom-file-border-width} * 2);
+ height: $custom-file-height-inner;
padding: $custom-file-padding-y $custom-file-padding-x;
line-height: $custom-file-line-height;
color: $custom-file-button-color;
diff --git a/scss/_variables.scss b/scss/_variables.scss
index 896201a2c7..73451a0908 100644
--- a/scss/_variables.scss
+++ b/scss/_variables.scss
@@ -526,6 +526,7 @@ $custom-range-thumb-focus-box-shadow: 0 0 0 1px $body-bg, $input-btn-focus-box-s
$custom-range-thumb-active-bg: lighten($component-active-bg, 35%) !default;
$custom-file-height: $input-height !default;
+$custom-file-height-inner: $input-height-inner !default;
$custom-file-focus-border-color: $input-focus-border-color !default;
$custom-file-focus-box-shadow: $input-btn-focus-box-shadow !default;