mirror/bootstrap
1
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-02-23 18:40:03 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'patch-8' of https://github.com/gijsbotje/bootstrap into gijsbotje-patch-8

Browse Source
This commit is contained in:
Mark Otto 2018-01-02 21:14:02 -08:00
commit 9474d06b1b
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
scss/_input-group.scss
View File

@ -60,7 +60,6 @@
.input-group-prepend, .input-group-prepend,
.input-group-append { .input-group-append {
display: flex; display: flex;
align-items: center;
// Ensure buttons are always above inputs for more visually pleasing borders. // Ensure buttons are always above inputs for more visually pleasing borders.
// This isn't needed for `.input-group-text` since it shares the same border-color // This isn't needed for `.input-group-text` since it shares the same border-color
@ -88,6 +87,8 @@
// to prepend or append to an input. // to prepend or append to an input.
.input-group-text { .input-group-text {
display: flex;
align-items: center;
padding: $input-padding-y $input-padding-x; padding: $input-padding-y $input-padding-x;
margin-bottom: 0; // Allow use of <label> elements by overriding our default margin-bottom margin-bottom: 0; // Allow use of <label> elements by overriding our default margin-bottom
font-size: $font-size-base; // Match inputs font-size: $font-size-base; // Match inputs