From ade657afee0172b51979593c0cb0828db094f7f7 Mon Sep 17 00:00:00 2001
From: Dmytro Yarmak <dmytroyarmak@gmail.com>
Date: Sat, 21 Jan 2017 22:18:58 +0200
Subject: [PATCH 1/4] Fix gaps between vertical grouped buttons when using
 labels (#21793) (#21796)

---
 scss/_button-group.scss | 1 +
 1 file changed, 1 insertion(+)

diff --git a/scss/_button-group.scss b/scss/_button-group.scss
index 584ed15137..26e041ab32 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

From 12b22ebad65c10fb22b5dc55b785a70158005199 Mon Sep 17 00:00:00 2001
From: Gijs Boddeus <botje_gijs@hotmail.com>
Date: Sat, 21 Jan 2017 21:25:24 +0100
Subject: [PATCH 2/4] fix segmented buttons (#21716)

* fix segmented buttons

changed flex-direction to row
centering is now done by align-items instead of justify-content

this way there is no need for flex property on the .btn inside .btn-group

* Update _input-group.scss
---
 scss/_input-group.scss | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/scss/_input-group.scss b/scss/_input-group.scss
index ab44883bd1..49cdf28300 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);

From eb361fa6c120f5f817a70d3f6acbc197aee3844b Mon Sep 17 00:00:00 2001
From: Mark Otto <markd.otto@gmail.com>
Date: Sat, 21 Jan 2017 12:32:38 -0800
Subject: [PATCH 3/4] Progress line height (#21805)

* remove obvi comments

* proper fix for #21801

- ensures .progress-bar text is vertically centered should the height of the .progress-bar change by matching the line-height and height values
- we can't use flexbox here because the inner text of an element doesn't count as a flex item
---
 scss/_progress.scss | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/scss/_progress.scss b/scss/_progress.scss
index 02e4c3bd2d..ccca51e8de 100644
--- a/scss/_progress.scss
+++ b/scss/_progress.scss
@@ -1,10 +1,8 @@
-// Progress animations
 @keyframes progress-bar-stripes {
   from { background-position: $progress-height 0; }
   to { background-position: 0 0; }
 }
 
-// Basic progress bar
 .progress {
   display: flex;
   overflow: hidden; // force rounded corners by cropping it
@@ -14,19 +12,19 @@
   background-color: $progress-bg;
   @include border-radius($progress-border-radius);
 }
+
 .progress-bar {
   height: $progress-height;
+  line-height: $progress-height;
   color: $progress-bar-color;
   background-color: $progress-bar-bg;
 }
 
-// Striped
 .progress-bar-striped {
   @include gradient-striped();
   background-size: $progress-height $progress-height;
 }
 
-// Animated
 .progress-bar-animated {
   animation: progress-bar-stripes $progress-bar-animation-timing;
 }

From 9cf235508d8ae881304877e0c4da3258c69de867 Mon Sep 17 00:00:00 2001
From: Pierre Vanduynslager <pierre.denis.vanduynslager@gmail.com>
Date: Sat, 21 Jan 2017 16:06:00 -0500
Subject: [PATCH 4/4] Fix container within navbar on smallest breakpoint
 (#21722)

* Make container in navbar to occupy full width even on smallest breakpoint

* Fix typo in comment

* Apply fix only on smaller breakpoint

* drop the comment as chrome doesn't have a bug here
---
 scss/_navbar.scss | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/scss/_navbar.scss b/scss/_navbar.scss
index 80beec8f3e..8dd8729bc9 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;
+    }
+  }
 }