From 43d21b97f24b0f6a593878ae4355413ce5b38884 Mon Sep 17 00:00:00 2001
From: Mark Otto <otto@github.com>
Date: Wed, 18 Jun 2014 19:14:26 -0700
Subject: fixes #13093: reset the background color and remove background image
 on disabled theme buttons

---
 less/theme.less | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'less/theme.less')

diff --git a/less/theme.less b/less/theme.less
index 6f957fb39..820270af2 100644
--- a/less/theme.less
+++ b/less/theme.less
@@ -48,6 +48,12 @@
     background-color: darken(@btn-color, 12%);
     border-color: darken(@btn-color, 14%);
   }
+
+  &:disabled,
+  &[disabled] {
+    background-color: darken(@btn-color, 12%);
+    background-image: none;
+  }
 }
 
 // Common styles
-- 
cgit v1.2.3


From 8bd4163ad463a0f208a55a8f64ba7fc6cb826282 Mon Sep 17 00:00:00 2001
From: Mark Otto <otto@github.com>
Date: Thu, 19 Jun 2014 18:14:56 -0700
Subject: fixes #13881: restore existing striped progress bar behavior with
 theme styles

---
 less/theme.less | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'less/theme.less')

diff --git a/less/theme.less b/less/theme.less
index 820270af2..b089424cf 100644
--- a/less/theme.less
+++ b/less/theme.less
@@ -197,6 +197,11 @@
 .progress-bar-warning    { .progress-bar-styles(@progress-bar-warning-bg); }
 .progress-bar-danger     { .progress-bar-styles(@progress-bar-danger-bg); }
 
+// Reset the striped class because our mixins don't do multiple gradients and
+// the above custom styles override the new `.progress-bar-striped` in v3.2.0.
+.progress-bar-striped {
+  #gradient > .striped();
+}
 
 
 //
-- 
cgit v1.2.3