From cbcf75f9bf56dcdcf25d21c4d3e8dddd510a4877 Mon Sep 17 00:00:00 2001 From: Aditya <adityashnkr5@gmail.com> Date: Sat, 15 Jun 2019 17:20:11 +0530 Subject: [PATCH 1/2] Add height auto to input-group --- scss/_input-group.scss | 1 + 1 file changed, 1 insertion(+) diff --git a/scss/_input-group.scss b/scss/_input-group.scss index 082f0464c5..dff639b6c9 100644 --- a/scss/_input-group.scss +++ b/scss/_input-group.scss @@ -18,6 +18,7 @@ position: relative; // For focus state's z-index flex: 1 1 0%; margin-bottom: 0; + height: auto; + .form-control, + .custom-select, -- GitLab From 9cfb0b575974808ee801f90267cb609a2b5a6543 Mon Sep 17 00:00:00 2001 From: Aditya <adityashnkr5@gmail.com> Date: Sat, 15 Jun 2019 17:59:31 +0530 Subject: [PATCH 2/2] Change order of height --- scss/_input-group.scss | 43 +++++++++++++++++++++++++++--------------- 1 file changed, 28 insertions(+), 15 deletions(-) diff --git a/scss/_input-group.scss b/scss/_input-group.scss index dff639b6c9..ecd3d9f7a9 100644 --- a/scss/_input-group.scss +++ b/scss/_input-group.scss @@ -17,8 +17,8 @@ > .custom-file { position: relative; // For focus state's z-index flex: 1 1 0%; - margin-bottom: 0; height: auto; + margin-bottom: 0; + .form-control, + .custom-select, @@ -41,8 +41,12 @@ > .form-control, > .custom-select { - &:not(:last-child) { @include border-right-radius(0); } - &:not(:first-child) { @include border-left-radius(0); } + &:not(:last-child) { + @include border-right-radius(0); + } + &:not(:first-child) { + @include border-left-radius(0); + } } // Custom file inputs have more complex markup, thus requiring different @@ -51,12 +55,15 @@ display: flex; align-items: center; - &:not(:last-child) .custom-file-label { @include border-right-radius(0); } - &:not(:first-child) .custom-file-label { @include border-left-radius(0); } + &:not(:last-child) .custom-file-label { + @include border-right-radius(0); + } + &:not(:first-child) .custom-file-label { + @include border-left-radius(0); + } } } - // Prepend and append // // While it requires one extra layer of HTML for each, dedicated prepend and @@ -87,9 +94,12 @@ } } -.input-group-prepend { margin-right: -$input-border-width; } -.input-group-append { margin-left: -$input-border-width; } - +.input-group-prepend { + margin-right: -$input-border-width; +} +.input-group-append { + margin-left: -$input-border-width; +} // Textual addons // @@ -118,7 +128,6 @@ } } - // Sizing // // Remix the default form control sizing classes into new ones for easier @@ -163,20 +172,22 @@ padding-right: $custom-select-padding-x + $custom-select-indicator-padding; } - // Prepend and append rounded corners // // These rulesets must come after the sizing ones to properly override sm and lg // border-radius values when extending. They're more specific than we'd like // with the `.input-group >` part, but without it, we cannot override the sizing. - .input-group > .input-group-prepend > .btn, .input-group > .input-group-prepend > .input-group-text, .input-group > .input-group-append:not(:last-child) > .btn, .input-group > .input-group-append:not(:last-child) > .input-group-text, -.input-group > .input-group-append:last-child > .btn:not(:last-child):not(.dropdown-toggle), -.input-group > .input-group-append:last-child > .input-group-text:not(:last-child) { +.input-group + > .input-group-append:last-child + > .btn:not(:last-child):not(.dropdown-toggle), +.input-group + > .input-group-append:last-child + > .input-group-text:not(:last-child) { @include border-right-radius(0); } @@ -185,6 +196,8 @@ .input-group > .input-group-prepend:not(:first-child) > .btn, .input-group > .input-group-prepend:not(:first-child) > .input-group-text, .input-group > .input-group-prepend:first-child > .btn:not(:first-child), -.input-group > .input-group-prepend:first-child > .input-group-text:not(:first-child) { +.input-group + > .input-group-prepend:first-child + > .input-group-text:not(:first-child) { @include border-left-radius(0); } -- GitLab