rooty/Bootstrap
0
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-02-20 17:54:23 +01:00
Code Issues Actions Packages Releases Activity

Custom File padding-x and padding-y values are reversed (#23067)

Browse Source 
Custom File `$custom-file-focus-box-shadow` should show even if box shadows are disabled

Custom File variables should inherit from inputs
This commit is contained in:
Patrick Yeo 2017-08-10 23:01:52 -07:00 committed by Mark Otto
parent 5b584c2619
commit ffa789327b
2 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
scss/_custom-forms.scss
View File

@ -204,7 +204,7 @@
opacity: 0; opacity: 0;
&:focus ~ .custom-file-control { &:focus ~ .custom-file-control {
@include box-shadow($custom-file-focus-box-shadow); box-shadow: $custom-file-focus-box-shadow;
} }
} }
@ -215,7 +215,7 @@
left: 0; left: 0;
z-index: 5; z-index: 5;
height: $custom-file-height; height: $custom-file-height;
padding: $custom-file-padding-x $custom-file-padding-y; padding: $custom-file-padding-y $custom-file-padding-x;
overflow: hidden; overflow: hidden;
line-height: $custom-file-line-height; line-height: $custom-file-line-height;
color: $custom-file-color; color: $custom-file-color;
@ -240,7 +240,7 @@
z-index: 6; z-index: 6;
display: block; display: block;
height: $custom-file-height; height: $custom-file-height;
padding: $custom-file-padding-x $custom-file-padding-y; padding: $custom-file-padding-y $custom-file-padding-x;
line-height: $custom-file-line-height; line-height: $custom-file-line-height;
color: $custom-file-button-color; color: $custom-file-button-color;
background-color: $custom-file-button-bg; background-color: $custom-file-button-bg;

20
scss/_variables.scss
View File

@ -465,21 +465,21 @@ $custom-select-focus-box-shadow: inset 0 1px 2px rgba($black, .075), 0 0 5px r
$custom-select-font-size-sm: 75% !default; $custom-select-font-size-sm: 75% !default;
$custom-select-height-sm: $input-height-sm !default; $custom-select-height-sm: $input-height-sm !default;
$custom-file-height: 2.5rem !default; $custom-file-height: $input-height !default;
$custom-file-width: 14rem !default; $custom-file-width: 14rem !default;
$custom-file-focus-box-shadow: 0 0 0 .075rem $white, 0 0 0 .2rem theme-color("primary") !default; $custom-file-focus-box-shadow: 0 0 0 .075rem $white, 0 0 0 .2rem theme-color("primary") !default;
$custom-file-padding-y: 1rem !default; $custom-file-padding-y: $input-btn-padding-y !default;
$custom-file-padding-x: .5rem !default; $custom-file-padding-x: $input-btn-padding-x !default;
$custom-file-line-height: 1.5 !default; $custom-file-line-height: $input-btn-line-height !default;
$custom-file-color: $gray-700 !default; $custom-file-color: $input-color !default;
$custom-file-bg: $white !default; $custom-file-bg: $input-bg !default;
$custom-file-border-width: $border-width !default; $custom-file-border-width: $input-btn-border-width !default;
$custom-file-border-color: $input-border-color !default; $custom-file-border-color: $input-border-color !default;
$custom-file-border-radius: $border-radius !default; $custom-file-border-radius: $input-border-radius !default;
$custom-file-box-shadow: inset 0 .2rem .4rem rgba($black,.05) !default; $custom-file-box-shadow: $input-box-shadow !default;
$custom-file-button-color: $custom-file-color !default; $custom-file-button-color: $custom-file-color !default;
$custom-file-button-bg: $gray-200 !default; $custom-file-button-bg: $input-group-addon-bg !default;
$custom-file-text: ( $custom-file-text: (
placeholder: ( placeholder: (
en: "Choose file..." en: "Choose file..."