mirror of
https://github.com/twbs/bootstrap.git
synced 2025-03-13 13:29:25 +01:00
Merge branch 'v4-dev' of https://github.com/twbs/bootstrap into v4-dev
This commit is contained in:
commit
45fed9b0cd
@ -10,6 +10,7 @@
|
||||
> .btn {
|
||||
position: relative;
|
||||
flex: 0 1 auto;
|
||||
margin-bottom: 0;
|
||||
|
||||
// Bring the hover, focused, and "active" buttons to the fron to overlay
|
||||
// the borders properly
|
||||
|
@ -30,8 +30,7 @@
|
||||
.input-group .form-control {
|
||||
// Vertically centers the content of the addons within the input group
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
justify-content: center;
|
||||
align-items: center;
|
||||
|
||||
&:not(:first-child):not(:last-child) {
|
||||
@include border-radius(0);
|
||||
@ -144,8 +143,6 @@
|
||||
// element above the siblings.
|
||||
> .btn {
|
||||
position: relative;
|
||||
// Vertically stretch the button and center its content
|
||||
flex: 1;
|
||||
|
||||
+ .btn {
|
||||
margin-left: (-$input-btn-border-width);
|
||||
|
@ -20,6 +20,13 @@
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
padding: $navbar-padding-y $navbar-padding-x;
|
||||
|
||||
@include media-breakpoint-down(nth(map-keys($grid-breakpoints), 1)) {
|
||||
> .container {
|
||||
margin-right: 0;
|
||||
margin-left: 0;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
@ -15,6 +15,7 @@
|
||||
|
||||
.progress-bar {
|
||||
height: $progress-height;
|
||||
line-height: $progress-height;
|
||||
color: $progress-bar-color;
|
||||
background-color: $progress-bar-bg;
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user