0
0
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:
Mark Otto 2017-01-21 13:25:16 -08:00
commit 45fed9b0cd
4 changed files with 10 additions and 4 deletions

View File

@ -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

View File

@ -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);

View File

@ -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;
}
}
}

View File

@ -15,6 +15,7 @@
.progress-bar {
height: $progress-height;
line-height: $progress-height;
color: $progress-bar-color;
background-color: $progress-bar-bg;
}