diff options
| author | Gleb Mazovetskiy <glex.spb@gmail.com> | 2018-07-25 10:49:36 +0300 |
|---|---|---|
| committer | Gleb Mazovetskiy <glex.spb@gmail.com> | 2018-07-25 10:49:36 +0300 |
| commit | 40a36bd8d3f3240b088f9a0393db26ab402ff5cf (patch) | |
| tree | 5b1a1378cb2518776f2f5cf817d8fb20286baeee /assets/stylesheets/bootstrap/_input-group.scss | |
| parent | 7fda7495266d5bad337ca8be980c8be000945937 (diff) | |
rake update[v4.1.3]
Diffstat (limited to 'assets/stylesheets/bootstrap/_input-group.scss')
| -rw-r--r-- | assets/stylesheets/bootstrap/_input-group.scss | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/assets/stylesheets/bootstrap/_input-group.scss b/assets/stylesheets/bootstrap/_input-group.scss index a8b0e59..2ed5f33 100644 --- a/assets/stylesheets/bootstrap/_input-group.scss +++ b/assets/stylesheets/bootstrap/_input-group.scss @@ -35,6 +35,11 @@ z-index: 3; } + // Bring the custom file input above the label + > .custom-file .custom-file-input:focus { + z-index: 4; + } + > .form-control, > .custom-select { &:not(:last-child) { @include border-right-radius(0); } @@ -122,7 +127,11 @@ .input-group-lg > .input-group-append > .input-group-text, .input-group-lg > .input-group-prepend > .btn, .input-group-lg > .input-group-append > .btn { - @extend .form-control-lg; + height: $input-height-lg; + padding: $input-padding-y-lg $input-padding-x-lg; + font-size: $font-size-lg; + line-height: $input-line-height-lg; + @include border-radius($input-border-radius-lg); } .input-group-sm > .form-control, @@ -130,7 +139,11 @@ .input-group-sm > .input-group-append > .input-group-text, .input-group-sm > .input-group-prepend > .btn, .input-group-sm > .input-group-append > .btn { - @extend .form-control-sm; + height: $input-height-sm; + padding: $input-padding-y-sm $input-padding-x-sm; + font-size: $font-size-sm; + line-height: $input-line-height-sm; + @include border-radius($input-border-radius-sm); } |