diff options
| -rw-r--r-- | scss/_button-group.scss | 1 | ||||
| -rw-r--r-- | scss/_input-group.scss | 5 | ||||
| -rw-r--r-- | scss/_navbar.scss | 7 | ||||
| -rw-r--r-- | scss/_progress.scss | 1 |
4 files changed, 10 insertions, 4 deletions
diff --git a/scss/_button-group.scss b/scss/_button-group.scss index 584ed1513..26e041ab3 100644 --- a/scss/_button-group.scss +++ b/scss/_button-group.scss @@ -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 diff --git a/scss/_input-group.scss b/scss/_input-group.scss index ab44883bd..49cdf2830 100644 --- a/scss/_input-group.scss +++ b/scss/_input-group.scss @@ -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); diff --git a/scss/_navbar.scss b/scss/_navbar.scss index 80beec8f3..8dd8729bc 100644 --- a/scss/_navbar.scss +++ b/scss/_navbar.scss @@ -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; + } + } } diff --git a/scss/_progress.scss b/scss/_progress.scss index 7b7bf544d..ccca51e8d 100644 --- a/scss/_progress.scss +++ b/scss/_progress.scss @@ -15,6 +15,7 @@ .progress-bar { height: $progress-height; + line-height: $progress-height; color: $progress-bar-color; background-color: $progress-bar-bg; } |