Skip to content
GitLab
Commit 9474d06b authored by Mark Otto's avatar Mark Otto
Browse files

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

parents 8462cc2a 48c45992
Hide whitespace changes
Inline Side-by-side
Showing
with 2 additions and 1 deletion
+2 -1
scss/_input-group.scss
+ 2
- 1
View file @ 9474d06b
...@@ -60,7 +60,6 @@ ...@@ -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 @@ ...@@ -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
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment