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: 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(-)

(limited to 'scss/_progress.scss')

diff --git a/scss/_progress.scss b/scss/_progress.scss
index 02e4c3bd2..ccca51e8d 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;
 }
-- 
cgit v1.2.3


From fba27befef3c63f523a681230358cc996bc037aa Mon Sep 17 00:00:00 2001
From: Mark Otto <markdotto@gmail.com>
Date: Sat, 8 Apr 2017 14:05:33 -0700
Subject: Add transition to .progress-bar

- Pulls in values from v3
- Closes #22371 which didn't use a transition include
---
 scss/_progress.scss | 1 +
 1 file changed, 1 insertion(+)

(limited to 'scss/_progress.scss')

diff --git a/scss/_progress.scss b/scss/_progress.scss
index ccca51e8d..66571843c 100644
--- a/scss/_progress.scss
+++ b/scss/_progress.scss
@@ -18,6 +18,7 @@
   line-height: $progress-height;
   color: $progress-bar-color;
   background-color: $progress-bar-bg;
+  @include transition($progress-bar-transition);
 }
 
 .progress-bar-striped {
-- 
cgit v1.2.3


From 2a833d559a51da21355360a56e29f1fb19c080dc Mon Sep 17 00:00:00 2001
From: Mark Otto <markd.otto@gmail.com>
Date: Thu, 25 May 2017 21:32:59 -0700
Subject: Add box-shadow to .progress-bar (#22579)

* Add box-shadow to .progress-bar

Puts an unused variable back in use for when folks set `$enable-shadows` to `true`.
---
 scss/_progress.scss | 1 +
 1 file changed, 1 insertion(+)

(limited to 'scss/_progress.scss')

diff --git a/scss/_progress.scss b/scss/_progress.scss
index 66571843c..f7491a64b 100644
--- a/scss/_progress.scss
+++ b/scss/_progress.scss
@@ -11,6 +11,7 @@
   text-align: center;
   background-color: $progress-bg;
   @include border-radius($progress-border-radius);
+  @include box-shadow($progress-box-shadow);
 }
 
 .progress-bar {
-- 
cgit v1.2.3