From efac0bf8d6cda1e6af85fb84d30d673c8e0a2ee8 Mon Sep 17 00:00:00 2001
From: liuyl <lyl890808@gmail.com>
Date: Sun, 28 Jul 2013 14:05:47 +0800
Subject: make pull-right !important

---
 dist/css/bootstrap.css | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

(limited to 'dist/css/bootstrap.css')

diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css
index d17799276..fb98e1d5a 100644
--- a/dist/css/bootstrap.css
+++ b/dist/css/bootstrap.css
@@ -636,7 +636,6 @@ blockquote small:before {
 }
 
 blockquote.pull-right {
-  float: right;
   padding-right: 15px;
   padding-left: 0;
   border-right: 5px solid #eeeeee;
@@ -2478,10 +2477,6 @@ button.close {
   border-bottom-color: #ffffff;
 }
 
-.nav > .pull-right {
-  float: right;
-}
-
 .nav .nav-divider {
   height: 1px;
   margin: 9px 0;
@@ -2938,7 +2933,6 @@ button.close {
     border-radius: 0;
   }
   .navbar-nav.pull-right {
-    float: right;
     width: auto;
   }
   .navbar-toggle {
@@ -4388,11 +4382,11 @@ a.list-group-item.active > .badge,
 }
 
 .pull-right {
-  float: right;
+  float: right !important;
 }
 
 .pull-left {
-  float: left;
+  float: left !important;
 }
 
 .hide {
-- 
cgit v1.2.3


From 7cfcfdfe64159b4ea7b94606f9303ab567049198 Mon Sep 17 00:00:00 2001
From: liuyl <lyl890808@gmail.com>
Date: Tue, 30 Jul 2013 09:30:21 +0800
Subject: make navbar-text float left

---
 dist/css/bootstrap.css | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'dist/css/bootstrap.css')

diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css
index 6afdbde29..6817bcc82 100644
--- a/dist/css/bootstrap.css
+++ b/dist/css/bootstrap.css
@@ -2974,6 +2974,8 @@ button.close {
 }
 
 .navbar-text {
+  float: left;
+  padding: 0 15px;
   margin-top: 15px;
   margin-bottom: 15px;
 }
-- 
cgit v1.2.3


From e9413315b55ec036a6de9846e4fb2fed1f910b7c Mon Sep 17 00:00:00 2001
From: Mark Otto <otto@github.com>
Date: Wed, 31 Jul 2013 18:06:20 -0700
Subject: fixes #8937: align the dropdown menus in input groups

---
 dist/css/bootstrap.css | 1 +
 1 file changed, 1 insertion(+)

(limited to 'dist/css/bootstrap.css')

diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css
index 1d8885943..e0862209e 100644
--- a/dist/css/bootstrap.css
+++ b/dist/css/bootstrap.css
@@ -1894,6 +1894,7 @@ input[type="button"].btn-block {
 }
 
 .input-group {
+  position: relative;
   display: table;
   border-collapse: separate;
 }
-- 
cgit v1.2.3


From 56aedcb71397c867396455b6860d627c1efe2707 Mon Sep 17 00:00:00 2001
From: liuyl <lyl890808@gmail.com>
Date: Thu, 1 Aug 2013 11:26:12 +0800
Subject: add table-layout

---
 dist/css/bootstrap.css | 1 +
 1 file changed, 1 insertion(+)

(limited to 'dist/css/bootstrap.css')

diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css
index e0862209e..f11f26248 100644
--- a/dist/css/bootstrap.css
+++ b/dist/css/bootstrap.css
@@ -3158,6 +3158,7 @@ button.close {
 .btn-group-justified {
   display: table;
   width: 100%;
+  table-layout: fixed;
 }
 
 .btn-group-justified .btn {
-- 
cgit v1.2.3


From 1583dd55e9f05275ee054884720dce2be8e2f07a Mon Sep 17 00:00:00 2001
From: Jeff Tickle <jeff@jefftickle.com>
Date: Thu, 1 Aug 2013 11:49:16 -0400
Subject: Added classes for lg-pull, lg-push, lg-offset, sm-pull, sm-push,
 sm-offset

---
 dist/css/bootstrap.css | 165 +++++++++++++++++++++++++++++++++++++++----------
 1 file changed, 132 insertions(+), 33 deletions(-)

(limited to 'dist/css/bootstrap.css')

diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css
index e0862209e..b971fddb3 100644
--- a/dist/css/bootstrap.css
+++ b/dist/css/bootstrap.css
@@ -931,72 +931,105 @@ pre code {
   .col-sm-12 {
     width: 100%;
   }
-  .col-push-1 {
+  .col-sm-push-1 {
     left: 8.333333333333332%;
   }
-  .col-push-2 {
+  .col-sm-push-2 {
     left: 16.666666666666664%;
   }
-  .col-push-3 {
+  .col-sm-push-3 {
     left: 25%;
   }
-  .col-push-4 {
+  .col-sm-push-4 {
     left: 33.33333333333333%;
   }
-  .col-push-5 {
+  .col-sm-push-5 {
     left: 41.66666666666667%;
   }
-  .col-push-6 {
+  .col-sm-push-6 {
     left: 50%;
   }
-  .col-push-7 {
+  .col-sm-push-7 {
     left: 58.333333333333336%;
   }
-  .col-push-8 {
+  .col-sm-push-8 {
     left: 66.66666666666666%;
   }
-  .col-push-9 {
+  .col-sm-push-9 {
     left: 75%;
   }
-  .col-push-10 {
+  .col-sm-push-10 {
     left: 83.33333333333334%;
   }
-  .col-push-11 {
+  .col-sm-push-11 {
     left: 91.66666666666666%;
   }
-  .col-pull-1 {
+  .col-sm-pull-1 {
     right: 8.333333333333332%;
   }
-  .col-pull-2 {
+  .col-sm-pull-2 {
     right: 16.666666666666664%;
   }
-  .col-pull-3 {
+  .col-sm-pull-3 {
     right: 25%;
   }
-  .col-pull-4 {
+  .col-sm-pull-4 {
     right: 33.33333333333333%;
   }
-  .col-pull-5 {
+  .col-sm-pull-5 {
     right: 41.66666666666667%;
   }
-  .col-pull-6 {
+  .col-sm-pull-6 {
     right: 50%;
   }
-  .col-pull-7 {
+  .col-sm-pull-7 {
     right: 58.333333333333336%;
   }
-  .col-pull-8 {
+  .col-sm-pull-8 {
     right: 66.66666666666666%;
   }
-  .col-pull-9 {
+  .col-sm-pull-9 {
     right: 75%;
   }
-  .col-pull-10 {
+  .col-sm-pull-10 {
     right: 83.33333333333334%;
   }
-  .col-pull-11 {
+  .col-sm-pull-11 {
     right: 91.66666666666666%;
   }
+  .col-sm-offset-1 {
+    margin-left: 8.333333333333332%;
+  }
+  .col-sm-offset-2 {
+    margin-left: 16.666666666666664%;
+  }
+  .col-sm-offset-3 {
+    margin-left: 25%;
+  }
+  .col-sm-offset-4 {
+    margin-left: 33.33333333333333%;
+  }
+  .col-sm-offset-5 {
+    margin-left: 41.66666666666667%;
+  }
+  .col-sm-offset-6 {
+    margin-left: 50%;
+  }
+  .col-sm-offset-7 {
+    margin-left: 58.333333333333336%;
+  }
+  .col-sm-offset-8 {
+    margin-left: 66.66666666666666%;
+  }
+  .col-sm-offset-9 {
+    margin-left: 75%;
+  }
+  .col-sm-offset-10 {
+    margin-left: 83.33333333333334%;
+  }
+  .col-sm-offset-11 {
+    margin-left: 91.66666666666666%;
+  }
 }
 
 @media (min-width: 992px) {
@@ -1053,37 +1086,103 @@ pre code {
   .col-lg-12 {
     width: 100%;
   }
-  .col-offset-1 {
+  .col-lg-push-1 {
+    left: 8.333333333333332%;
+  }
+  .col-lg-push-2 {
+    left: 16.666666666666664%;
+  }
+  .col-lg-push-3 {
+    left: 25%;
+  }
+  .col-lg-push-4 {
+    left: 33.33333333333333%;
+  }
+  .col-lg-push-5 {
+    left: 41.66666666666667%;
+  }
+  .col-lg-push-6 {
+    left: 50%;
+  }
+  .col-lg-push-7 {
+    left: 58.333333333333336%;
+  }
+  .col-lg-push-8 {
+    left: 66.66666666666666%;
+  }
+  .col-lg-push-9 {
+    left: 75%;
+  }
+  .col-lg-push-10 {
+    left: 83.33333333333334%;
+  }
+  .col-lg-push-11 {
+    left: 91.66666666666666%;
+  }
+  .col-lg-pull-1 {
+    right: 8.333333333333332%;
+  }
+  .col-lg-pull-2 {
+    right: 16.666666666666664%;
+  }
+  .col-lg-pull-3 {
+    right: 25%;
+  }
+  .col-lg-pull-4 {
+    right: 33.33333333333333%;
+  }
+  .col-lg-pull-5 {
+    right: 41.66666666666667%;
+  }
+  .col-lg-pull-6 {
+    right: 50%;
+  }
+  .col-lg-pull-7 {
+    right: 58.333333333333336%;
+  }
+  .col-lg-pull-8 {
+    right: 66.66666666666666%;
+  }
+  .col-lg-pull-9 {
+    right: 75%;
+  }
+  .col-lg-pull-10 {
+    right: 83.33333333333334%;
+  }
+  .col-lg-pull-11 {
+    right: 91.66666666666666%;
+  }
+  .col-lg-offset-1 {
     margin-left: 8.333333333333332%;
   }
-  .col-offset-2 {
+  .col-lg-offset-2 {
     margin-left: 16.666666666666664%;
   }
-  .col-offset-3 {
+  .col-lg-offset-3 {
     margin-left: 25%;
   }
-  .col-offset-4 {
+  .col-lg-offset-4 {
     margin-left: 33.33333333333333%;
   }
-  .col-offset-5 {
+  .col-lg-offset-5 {
     margin-left: 41.66666666666667%;
   }
-  .col-offset-6 {
+  .col-lg-offset-6 {
     margin-left: 50%;
   }
-  .col-offset-7 {
+  .col-lg-offset-7 {
     margin-left: 58.333333333333336%;
   }
-  .col-offset-8 {
+  .col-lg-offset-8 {
     margin-left: 66.66666666666666%;
   }
-  .col-offset-9 {
+  .col-lg-offset-9 {
     margin-left: 75%;
   }
-  .col-offset-10 {
+  .col-lg-offset-10 {
     margin-left: 83.33333333333334%;
   }
-  .col-offset-11 {
+  .col-lg-offset-11 {
     margin-left: 91.66666666666666%;
   }
 }
-- 
cgit v1.2.3


From d0b94ead9a660adeca599b2cc49ce5134d432f2f Mon Sep 17 00:00:00 2001
From: Mark Otto <otto@github.com>
Date: Fri, 2 Aug 2013 09:32:58 -0700
Subject: Fix #9008: consolidate `.alert-block` styles into `.alert`

---
 dist/css/bootstrap.css | 25 ++++++++++---------------
 1 file changed, 10 insertions(+), 15 deletions(-)

(limited to 'dist/css/bootstrap.css')

diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css
index e0862209e..22de1e417 100644
--- a/dist/css/bootstrap.css
+++ b/dist/css/bootstrap.css
@@ -3751,7 +3751,7 @@ button.close {
 }
 
 .alert {
-  padding: 10px 35px 10px 15px;
+  padding: 15px 35px 15px 15px;
   margin-bottom: 20px;
   color: #c09853;
   background-color: #fcf8e3;
@@ -3780,6 +3780,15 @@ button.close {
   color: inherit;
 }
 
+.alert > p,
+.alert > ul {
+  margin-bottom: 0;
+}
+
+.alert > p + p {
+  margin-top: 5px;
+}
+
 .alert-success {
   color: #468847;
   background-color: #dff0d8;
@@ -3822,20 +3831,6 @@ button.close {
   color: #2d6987;
 }
 
-.alert-block {
-  padding-top: 15px;
-  padding-bottom: 15px;
-}
-
-.alert-block > p,
-.alert-block > ul {
-  margin-bottom: 0;
-}
-
-.alert-block p + p {
-  margin-top: 5px;
-}
-
 .thumbnail,
 .img-thumbnail {
   padding: 4px;
-- 
cgit v1.2.3


From 048e19b8921ff0cae8ade7ace7700f0563c1fb82 Mon Sep 17 00:00:00 2001
From: Mark Otto <otto@github.com>
Date: Fri, 2 Aug 2013 09:42:50 -0700
Subject: Fixes #8996: shift placement of justified CSS for nav component

---
 dist/css/bootstrap.css | 54 +++++++++++++++++++++++++-------------------------
 1 file changed, 27 insertions(+), 27 deletions(-)

(limited to 'dist/css/bootstrap.css')

diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css
index 22de1e417..a3ade6e5d 100644
--- a/dist/css/bootstrap.css
+++ b/dist/css/bootstrap.css
@@ -2505,33 +2505,6 @@ button.close {
   background-color: #e5e5e5;
 }
 
-.nav-justified {
-  width: 100%;
-}
-
-.nav-justified > li {
-  display: table-cell;
-  float: none;
-  width: 1%;
-}
-
-.nav-justified > li > a {
-  text-align: center;
-}
-
-.nav-tabs-justified {
-  border-bottom: 0;
-}
-
-.nav-tabs-justified > li > a {
-  margin-right: 0;
-  border-bottom: 1px solid #dddddd;
-}
-
-.nav-tabs-justified > .active > a {
-  border-bottom-color: #ffffff;
-}
-
 .nav-tabs {
   border-bottom: 1px solid #dddddd;
 }
@@ -2614,6 +2587,33 @@ button.close {
   margin-left: 0;
 }
 
+.nav-justified {
+  width: 100%;
+}
+
+.nav-justified > li {
+  display: table-cell;
+  float: none;
+  width: 1%;
+}
+
+.nav-justified > li > a {
+  text-align: center;
+}
+
+.nav-tabs-justified {
+  border-bottom: 0;
+}
+
+.nav-tabs-justified > li > a {
+  margin-right: 0;
+  border-bottom: 1px solid #dddddd;
+}
+
+.nav-tabs-justified > .active > a {
+  border-bottom-color: #ffffff;
+}
+
 .tabbable:before,
 .tabbable:after {
   display: table;
-- 
cgit v1.2.3


From 08ce3ef9e1767fa57ebdccd6dfbae5a8fbcb9fa3 Mon Sep 17 00:00:00 2001
From: Mark Otto <otto@github.com>
Date: Fri, 2 Aug 2013 10:11:39 -0700
Subject: run grunt dist for #8967

---
 dist/css/bootstrap.css | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'dist/css/bootstrap.css')

diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css
index a3ade6e5d..b032d251d 100644
--- a/dist/css/bootstrap.css
+++ b/dist/css/bootstrap.css
@@ -2016,7 +2016,9 @@ input[type="button"].btn-block {
   margin-bottom: 0;
 }
 
-.form-horizontal .control-label {
+.form-horizontal .control-label,
+.form-horizontal .radio-inline,
+.form-horizontal .checkbox-inline {
   padding-top: 9px;
 }
 
@@ -2070,6 +2072,10 @@ input[type="button"].btn-block {
   content: "";
 }
 
+.dropdown {
+  position: relative;
+}
+
 .dropdown-menu {
   position: absolute;
   top: 100%;
-- 
cgit v1.2.3


From d46e645a0f19b24280bf700f4d4fb56caadb4409 Mon Sep 17 00:00:00 2001
From: Mark Otto <otto@github.com>
Date: Fri, 2 Aug 2013 14:07:26 -0700
Subject: fixes #9015: bold links not semibold in alerts

---
 dist/css/bootstrap.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'dist/css/bootstrap.css')

diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css
index 293a5274d..d27ee8065 100644
--- a/dist/css/bootstrap.css
+++ b/dist/css/bootstrap.css
@@ -3874,7 +3874,7 @@ button.close {
 }
 
 .alert .alert-link {
-  font-weight: 500;
+  font-weight: bold;
   color: #a47e3c;
 }
 
-- 
cgit v1.2.3


From 173dac4e54281312ebb7ff993df20caffbc56840 Mon Sep 17 00:00:00 2001
From: Mark Otto <otto@github.com>
Date: Fri, 2 Aug 2013 15:09:48 -0700
Subject: Tighten up buttons and form controls

* Smaller padding on buttons and large buttons
* Same with inputs and large inputs
* Remove about 10px from height of large inputs/buttons and 4px from
regular ones

Fixes #8707 and #8700.

(Also relevant: #8711)
---
 dist/css/bootstrap.css | 31 +++++++++++++++++--------------
 1 file changed, 17 insertions(+), 14 deletions(-)

(limited to 'dist/css/bootstrap.css')

diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css
index d27ee8065..183ffb983 100644
--- a/dist/css/bootstrap.css
+++ b/dist/css/bootstrap.css
@@ -1453,8 +1453,8 @@ input[type="number"]::-webkit-inner-spin-button {
 .form-control {
   display: block;
   width: 100%;
-  height: 38px;
-  padding: 8px 12px;
+  height: 34px;
+  padding: 6px 12px;
   font-size: 14px;
   line-height: 1.428571429;
   color: #555555;
@@ -1538,9 +1538,10 @@ textarea.form-control {
 }
 
 .input-large {
-  height: 56px;
-  padding: 14px 16px;
+  height: 45px;
+  padding: 10px 16px;
   font-size: 18px;
+  line-height: 1.33;
   border-radius: 6px;
 }
 
@@ -1548,12 +1549,13 @@ textarea.form-control {
   height: 30px;
   padding: 5px 10px;
   font-size: 12px;
+  line-height: 1.5;
   border-radius: 3px;
 }
 
 select.input-large {
-  height: 56px;
-  line-height: 56px;
+  height: 45px;
+  line-height: 45px;
 }
 
 select.input-small {
@@ -1647,7 +1649,7 @@ textarea.input-small {
 
 .btn {
   display: inline-block;
-  padding: 8px 12px;
+  padding: 6px 12px;
   margin-bottom: 0;
   font-size: 14px;
   font-weight: 500;
@@ -1932,8 +1934,9 @@ fieldset[disabled] .btn-link:focus {
 }
 
 .btn-large {
-  padding: 14px 16px;
+  padding: 10px 16px;
   font-size: 18px;
+  line-height: 1.33;
   border-radius: 6px;
 }
 
@@ -2029,7 +2032,7 @@ input[type="button"].btn-block {
 }
 
 .input-group-addon {
-  padding: 8px 12px;
+  padding: 6px 12px;
   font-size: 14px;
   font-weight: normal;
   line-height: 1.428571429;
@@ -2049,7 +2052,7 @@ input[type="button"].btn-block {
 }
 
 .input-group-addon.input-large {
-  padding: 14px 16px;
+  padding: 10px 16px;
   font-size: 18px;
   border-radius: 6px;
 }
@@ -2904,8 +2907,8 @@ button.close {
 }
 
 .navbar-form {
-  margin-top: 6px;
-  margin-bottom: 6px;
+  margin-top: 8px;
+  margin-bottom: 8px;
 }
 
 .navbar-form .form-control,
@@ -3076,7 +3079,7 @@ button.close {
 }
 
 .navbar-btn {
-  margin-top: 6px;
+  margin-top: 8px;
 }
 
 .navbar-text {
@@ -3357,7 +3360,7 @@ button.close {
 
 .pagination-large > li > a,
 .pagination-large > li > span {
-  padding: 14px 16px;
+  padding: 10px 16px;
   font-size: 18px;
 }
 
-- 
cgit v1.2.3


From 6b850132d056a136dc4734c4d68c9e1c23b7843e Mon Sep 17 00:00:00 2001
From: Mark Otto <otto@github.com>
Date: Fri, 2 Aug 2013 17:57:19 -0700
Subject: Remove requirement of `.list-group-flush` when list groups are in
 panels

Fixes #8900
---
 dist/css/bootstrap.css | 34 +++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 17 deletions(-)

(limited to 'dist/css/bootstrap.css')

diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css
index 183ffb983..a0a8ffaea 100644
--- a/dist/css/bootstrap.css
+++ b/dist/css/bootstrap.css
@@ -2386,6 +2386,23 @@ a.list-group-item.active .list-group-item-text {
           box-shadow: 0 1px 1px rgba(0, 0, 0, 0.05);
 }
 
+.panel .list-group {
+  margin: 15px -15px -15px;
+}
+
+.panel .list-group .list-group-item {
+  border-width: 1px 0;
+}
+
+.panel .list-group .list-group-item:first-child {
+  border-top-right-radius: 0;
+  border-top-left-radius: 0;
+}
+
+.panel .list-group .list-group-item:last-child {
+  border-bottom: 0;
+}
+
 .panel-heading {
   padding: 10px 15px;
   margin: -15px -15px 15px;
@@ -2461,23 +2478,6 @@ a.list-group-item.active .list-group-item-text {
   border-color: #bce8f1;
 }
 
-.list-group-flush {
-  margin: 15px -15px -15px;
-}
-
-.list-group-flush .list-group-item {
-  border-width: 1px 0;
-}
-
-.list-group-flush .list-group-item:first-child {
-  border-top-right-radius: 0;
-  border-top-left-radius: 0;
-}
-
-.list-group-flush .list-group-item:last-child {
-  border-bottom: 0;
-}
-
 .well {
   min-height: 20px;
   padding: 19px;
-- 
cgit v1.2.3


From 9435991ff0ffa79c027f12c0a08aa13376c3b2fe Mon Sep 17 00:00:00 2001
From: Mark Otto <otto@github.com>
Date: Fri, 2 Aug 2013 18:48:44 -0700
Subject: move form layouts from input groups back to forms (messed this up in
 b281ad64096d919145159ffbc4e1a5b284708d9b)

---
 dist/css/bootstrap.css | 112 ++++++++++++++++++++++++-------------------------
 1 file changed, 56 insertions(+), 56 deletions(-)

(limited to 'dist/css/bootstrap.css')

diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css
index a0a8ffaea..8aaf8d451 100644
--- a/dist/css/bootstrap.css
+++ b/dist/css/bootstrap.css
@@ -1647,6 +1647,62 @@ textarea.input-small {
   color: #737373;
 }
 
+.form-inline .form-control,
+.form-inline .radio,
+.form-inline .checkbox {
+  display: inline-block;
+}
+
+.form-inline .radio,
+.form-inline .checkbox {
+  margin-top: 0;
+  margin-bottom: 0;
+}
+
+.form-horizontal .control-label,
+.form-horizontal .radio-inline,
+.form-horizontal .checkbox-inline {
+  padding-top: 9px;
+}
+
+.form-horizontal .form-group:before,
+.form-horizontal .form-group:after {
+  display: table;
+  content: " ";
+}
+
+.form-horizontal .form-group:after {
+  clear: both;
+}
+
+.form-horizontal .form-group:before,
+.form-horizontal .form-group:after {
+  display: table;
+  content: " ";
+}
+
+.form-horizontal .form-group:after {
+  clear: both;
+}
+
+@media (min-width: 768px) {
+  .form-horizontal .form-group {
+    margin-right: -15px;
+    margin-left: -15px;
+  }
+}
+
+.form-horizontal .form-group .row {
+  margin-right: -15px;
+  margin-left: -15px;
+}
+
+@media (min-width: 768px) {
+  .form-horizontal .control-label {
+    text-align: right;
+  }
+}
+
 .btn {
   display: inline-block;
   padding: 6px 12px;
@@ -2106,62 +2162,6 @@ input[type="button"].btn-block {
   z-index: 2;
 }
 
-.form-inline .form-control,
-.form-inline .radio,
-.form-inline .checkbox {
-  display: inline-block;
-}
-
-.form-inline .radio,
-.form-inline .checkbox {
-  margin-top: 0;
-  margin-bottom: 0;
-}
-
-.form-horizontal .control-label,
-.form-horizontal .radio-inline,
-.form-horizontal .checkbox-inline {
-  padding-top: 9px;
-}
-
-.form-horizontal .form-group:before,
-.form-horizontal .form-group:after {
-  display: table;
-  content: " ";
-}
-
-.form-horizontal .form-group:after {
-  clear: both;
-}
-
-.form-horizontal .form-group:before,
-.form-horizontal .form-group:after {
-  display: table;
-  content: " ";
-}
-
-.form-horizontal .form-group:after {
-  clear: both;
-}
-
-@media (min-width: 768px) {
-  .form-horizontal .form-group {
-    margin-right: -15px;
-    margin-left: -15px;
-  }
-}
-
-.form-horizontal .form-group .row {
-  margin-right: -15px;
-  margin-left: -15px;
-}
-
-@media (min-width: 768px) {
-  .form-horizontal .control-label {
-    text-align: right;
-  }
-}
-
 .caret {
   display: inline-block;
   width: 0;
-- 
cgit v1.2.3


From 4bbbf774a4b36ce5f36e4a35a2e7bed807dd640b Mon Sep 17 00:00:00 2001
From: liuyl <lyl890808@gmail.com>
Date: Sun, 4 Aug 2013 09:27:23 +0800
Subject: add line-height

---
 dist/css/bootstrap.css | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'dist/css/bootstrap.css')

diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css
index 219940b2a..d5167e7d9 100644
--- a/dist/css/bootstrap.css
+++ b/dist/css/bootstrap.css
@@ -2104,12 +2104,14 @@ input[type="button"].btn-block {
 .input-group-addon.input-small {
   padding: 5px 10px;
   font-size: 12px;
+  line-height: 1.5;
   border-radius: 3px;
 }
 
 .input-group-addon.input-large {
   padding: 10px 16px;
   font-size: 18px;
+  line-height: 1.33;
   border-radius: 6px;
 }
 
@@ -3318,7 +3320,7 @@ button.close {
 .pagination > li > a,
 .pagination > li > span {
   float: left;
-  padding: 4px 12px;
+  padding: 6px 12px;
   line-height: 1.428571429;
   text-decoration: none;
   background-color: #ffffff;
-- 
cgit v1.2.3


From 23ef8c0c209844dd8b92d2a5ac82daffa7bd2914 Mon Sep 17 00:00:00 2001
From: Chris Rebert <code@rebertia.com>
Date: Sat, 3 Aug 2013 21:39:57 -0700
Subject: Greater standardization of sizing terminology

In class names:
* large => lg
* small => sm
* mini => xs ("Extra small")

In screen size categories:
* Tiny => Extra small
---
 dist/css/bootstrap.css | 58 +++++++++++++++++++++++++-------------------------
 1 file changed, 29 insertions(+), 29 deletions(-)

(limited to 'dist/css/bootstrap.css')

diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css
index d5167e7d9..4259d4d2b 100644
--- a/dist/css/bootstrap.css
+++ b/dist/css/bootstrap.css
@@ -1537,7 +1537,7 @@ textarea.form-control {
   margin-left: 10px;
 }
 
-.input-large {
+.input-lg {
   height: 45px;
   padding: 10px 16px;
   font-size: 18px;
@@ -1545,7 +1545,7 @@ textarea.form-control {
   border-radius: 6px;
 }
 
-.input-small {
+.input-sm {
   height: 30px;
   padding: 5px 10px;
   font-size: 12px;
@@ -1553,18 +1553,18 @@ textarea.form-control {
   border-radius: 3px;
 }
 
-select.input-large {
+select.input-lg {
   height: 45px;
   line-height: 45px;
 }
 
-select.input-small {
+select.input-sm {
   height: 30px;
   line-height: 30px;
 }
 
-textarea.input-large,
-textarea.input-small {
+textarea.input-lg,
+textarea.input-sm {
   height: auto;
 }
 
@@ -1989,22 +1989,22 @@ fieldset[disabled] .btn-link:focus {
   text-decoration: none;
 }
 
-.btn-large {
+.btn-lg {
   padding: 10px 16px;
   font-size: 18px;
   line-height: 1.33;
   border-radius: 6px;
 }
 
-.btn-small,
-.btn-mini {
+.btn-sm,
+.btn-xs {
   padding: 5px 10px;
   font-size: 12px;
   line-height: 1.5;
   border-radius: 3px;
 }
 
-.btn-mini {
+.btn-xs {
   padding: 3px 5px;
 }
 
@@ -2101,14 +2101,14 @@ input[type="button"].btn-block {
           box-sizing: border-box;
 }
 
-.input-group-addon.input-small {
+.input-group-addon.input-sm {
   padding: 5px 10px;
   font-size: 12px;
   line-height: 1.5;
   border-radius: 3px;
 }
 
-.input-group-addon.input-large {
+.input-group-addon.input-lg {
   padding: 10px 16px;
   font-size: 18px;
   line-height: 1.33;
@@ -2496,12 +2496,12 @@ a.list-group-item.active .list-group-item-text {
   border-color: rgba(0, 0, 0, 0.15);
 }
 
-.well-large {
+.well-lg {
   padding: 24px;
   border-radius: 6px;
 }
 
-.well-small {
+.well-sm {
   padding: 9px;
   border-radius: 3px;
 }
@@ -3220,7 +3220,7 @@ button.close {
   padding-left: 8px;
 }
 
-.btn-group > .btn-large + .dropdown-toggle {
+.btn-group > .btn-lg + .dropdown-toggle {
   padding-right: 12px;
   padding-left: 12px;
 }
@@ -3234,11 +3234,11 @@ button.close {
   margin-left: 0;
 }
 
-.btn-large .caret {
+.btn-lg .caret {
   border-width: 5px;
 }
 
-.dropup .btn-large .caret {
+.dropup .btn-lg .caret {
   border-bottom-width: 5px;
 }
 
@@ -3363,38 +3363,38 @@ button.close {
   background-color: #ffffff;
 }
 
-.pagination-large > li > a,
-.pagination-large > li > span {
+.pagination-lg > li > a,
+.pagination-lg > li > span {
   padding: 10px 16px;
   font-size: 18px;
 }
 
-.pagination-large > li:first-child > a,
-.pagination-large > li:first-child > span {
+.pagination-lg > li:first-child > a,
+.pagination-lg > li:first-child > span {
   border-bottom-left-radius: 6px;
   border-top-left-radius: 6px;
 }
 
-.pagination-large > li:last-child > a,
-.pagination-large > li:last-child > span {
+.pagination-lg > li:last-child > a,
+.pagination-lg > li:last-child > span {
   border-top-right-radius: 6px;
   border-bottom-right-radius: 6px;
 }
 
-.pagination-small > li > a,
-.pagination-small > li > span {
+.pagination-sm > li > a,
+.pagination-sm > li > span {
   padding: 5px 10px;
   font-size: 12px;
 }
 
-.pagination-small > li:first-child > a,
-.pagination-small > li:first-child > span {
+.pagination-sm > li:first-child > a,
+.pagination-sm > li:first-child > span {
   border-bottom-left-radius: 3px;
   border-top-left-radius: 3px;
 }
 
-.pagination-small > li:last-child > a,
-.pagination-small > li:last-child > span {
+.pagination-sm > li:last-child > a,
+.pagination-sm > li:last-child > span {
   border-top-right-radius: 3px;
   border-bottom-right-radius: 3px;
 }
-- 
cgit v1.2.3


From 584759eac0839feeaf5fbde339e772d389dda16f Mon Sep 17 00:00:00 2001
From: liuyl <lyl890808@gmail.com>
Date: Mon, 5 Aug 2013 08:29:01 +0800
Subject: btngroups

---
 dist/css/bootstrap.css | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'dist/css/bootstrap.css')

diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css
index 4259d4d2b..bb466dd21 100644
--- a/dist/css/bootstrap.css
+++ b/dist/css/bootstrap.css
@@ -3257,12 +3257,12 @@ button.close {
   border-radius: 0;
 }
 
-.btn-group-vertical .btn:first-child {
+.btn-group-vertical .btn:first-child:not(:last-child) {
   border-bottom-right-radius: 0;
   border-bottom-left-radius: 0;
 }
 
-.btn-group-vertical .btn:last-child {
+.btn-group-vertical .btn:last-child:not(:first-child) {
   border-top-right-radius: 0;
   border-top-left-radius: 0;
 }
-- 
cgit v1.2.3


From 2641fed73f51cdd2a77698c538403cc892e183a5 Mon Sep 17 00:00:00 2001
From: Mark Otto <otto@github.com>
Date: Sun, 4 Aug 2013 22:30:09 -0700
Subject: Fixes #8723: allow modals to not need the .fade class /cc @fat

---
 dist/css/bootstrap.css | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'dist/css/bootstrap.css')

diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css
index bb466dd21..4154c2168 100644
--- a/dist/css/bootstrap.css
+++ b/dist/css/bootstrap.css
@@ -3490,7 +3490,7 @@ button.close {
           transition: transform 0.3s ease-out;
 }
 
-.modal.fade.in .modal-dialog {
+.modal.in .modal-dialog {
   -webkit-transform: translate(0, 0);
       -ms-transform: translate(0, 0);
           transform: translate(0, 0);
@@ -3531,7 +3531,7 @@ button.close {
   filter: alpha(opacity=0);
 }
 
-.modal-backdrop.fade.in {
+.modal-backdrop.in {
   opacity: 0.5;
   filter: alpha(opacity=50);
 }
-- 
cgit v1.2.3


From 73c048578dfce7c6d4e8c9d4fe6c6bd22b2ff9b2 Mon Sep 17 00:00:00 2001
From: Mark Otto <otto@github.com>
Date: Sun, 4 Aug 2013 23:05:54 -0700
Subject: Enable input focus state customization
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Add new mixin to generate and customize focus state as needed
- Adds variable to set default color
- Include clear disclaimer about customizing this—it's about users', so
don't go making everything bright red and expect them not to be
confused or alarmed.

Relevant issues: #2742, #4185, #7942, #8171, #8610, #9044
---
 dist/css/bootstrap.css | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'dist/css/bootstrap.css')

diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css
index 4154c2168..430655807 100644
--- a/dist/css/bootstrap.css
+++ b/dist/css/bootstrap.css
@@ -1469,10 +1469,10 @@ input[type="number"]::-webkit-inner-spin-button {
 }
 
 .form-control:focus {
-  border-color: rgba(82, 168, 236, 0.8);
+  border-color: #66afe9;
   outline: 0;
-  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(82, 168, 236, 0.6);
-          box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(82, 168, 236, 0.6);
+  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(102, 175, 233, 0.6);
+          box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(102, 175, 233, 0.6);
 }
 
 .form-control[disabled],
-- 
cgit v1.2.3


From f62ea2afe281383c7550441e80fcd808479a5e2c Mon Sep 17 00:00:00 2001
From: Mark Otto <otto@github.com>
Date: Sun, 4 Aug 2013 23:20:55 -0700
Subject: fixes #8793: remove padding-right from inputs with state changes

---
 dist/css/bootstrap.css | 3 ---
 1 file changed, 3 deletions(-)

(limited to 'dist/css/bootstrap.css')

diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css
index 430655807..6174d97e2 100644
--- a/dist/css/bootstrap.css
+++ b/dist/css/bootstrap.css
@@ -1574,7 +1574,6 @@ textarea.input-sm {
 }
 
 .has-warning .form-control {
-  padding-right: 32px;
   border-color: #c09853;
   -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
           box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
@@ -1598,7 +1597,6 @@ textarea.input-sm {
 }
 
 .has-error .form-control {
-  padding-right: 32px;
   border-color: #b94a48;
   -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
           box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
@@ -1622,7 +1620,6 @@ textarea.input-sm {
 }
 
 .has-success .form-control {
-  padding-right: 32px;
   border-color: #468847;
   -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
           box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
-- 
cgit v1.2.3


From d95ff9da81057ed0abb12dcfe9a8422416916516 Mon Sep 17 00:00:00 2001
From: Mark Otto <otto@github.com>
Date: Sun, 4 Aug 2013 23:27:15 -0700
Subject: fixes #8805: ensure .active buttons in button groups behave like
 :active buttons

---
 dist/css/bootstrap.css | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'dist/css/bootstrap.css')

diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css
index 6174d97e2..233530fdf 100644
--- a/dist/css/bootstrap.css
+++ b/dist/css/bootstrap.css
@@ -3130,7 +3130,9 @@ button.close {
 .btn-group > .btn:focus,
 .btn-group-vertical > .btn:focus,
 .btn-group > .btn:active,
-.btn-group-vertical > .btn:active {
+.btn-group-vertical > .btn:active,
+.btn-group > .btn.active,
+.btn-group-vertical > .btn.active {
   z-index: 2;
 }
 
-- 
cgit v1.2.3


From a2823d0f5efa3bf8c831de65a13d240e295493e2 Mon Sep 17 00:00:00 2001
From: Mark Otto <otto@github.com>
Date: Sun, 4 Aug 2013 23:44:02 -0700
Subject: Fixes #9061: Panel titles should inherit color when linked

---
 dist/css/bootstrap.css | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'dist/css/bootstrap.css')

diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css
index 233530fdf..04fc51e37 100644
--- a/dist/css/bootstrap.css
+++ b/dist/css/bootstrap.css
@@ -2418,6 +2418,10 @@ a.list-group-item.active .list-group-item-text {
   font-weight: 500;
 }
 
+.panel-title > a {
+  color: inherit;
+}
+
 .panel-footer {
   padding: 10px 15px;
   margin: 15px -15px -15px;
-- 
cgit v1.2.3


From 52266cfdcdbb010a27cb9364ab4dc277a1cd75de Mon Sep 17 00:00:00 2001
From: Mark Otto <otto@github.com>
Date: Mon, 5 Aug 2013 00:39:03 -0700
Subject: run grunt dist

---
 dist/css/bootstrap.css | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

(limited to 'dist/css/bootstrap.css')

diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css
index 04fc51e37..e34b0b81f 100644
--- a/dist/css/bootstrap.css
+++ b/dist/css/bootstrap.css
@@ -2881,12 +2881,13 @@ button.close {
 }
 
 .navbar-toggle {
-  position: absolute;
-  top: 9px;
-  right: 10px;
+  position: relative;
+  float: right;
   width: 48px;
-  height: 32px;
-  padding: 8px 12px;
+  height: 34px;
+  padding: 6px 12px;
+  margin-top: 8px;
+  margin-bottom: 8px;
   background-color: transparent;
   border: 1px solid #dddddd;
   border-radius: 4px;
-- 
cgit v1.2.3


From d2389ec7c41183bde77b39ff8f86ff827c9b2174 Mon Sep 17 00:00:00 2001
From: Mark Otto <otto@github.com>
Date: Mon, 5 Aug 2013 00:50:40 -0700
Subject: fixes #8832 and #8823: remove max-width from .navbar-brand when not
 mobile

---
 dist/css/bootstrap.css | 1 +
 1 file changed, 1 insertion(+)

(limited to 'dist/css/bootstrap.css')

diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css
index e34b0b81f..036ff65ce 100644
--- a/dist/css/bootstrap.css
+++ b/dist/css/bootstrap.css
@@ -3051,6 +3051,7 @@ button.close {
 @media screen and (min-width: 768px) {
   .navbar-brand {
     float: left;
+    max-width: none;
     margin-right: 5px;
     margin-left: -15px;
   }
-- 
cgit v1.2.3


From d6ed590e830be786a7d63a2eacf70b788efd8097 Mon Sep 17 00:00:00 2001
From: Mark Otto <otto@github.com>
Date: Mon, 5 Aug 2013 08:11:13 -0700
Subject: Clean up mixins, fix #9100 (no ms-keyframes)

- Spacing tweaks in the general mixins
- Add comments to transform mixins about IE support
- Remove `-ms-keyframes` because only IE10+ supports it, and without
prefix
---
 dist/css/bootstrap.css | 9 ---------
 1 file changed, 9 deletions(-)

(limited to 'dist/css/bootstrap.css')

diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css
index 036ff65ce..cb62a5497 100644
--- a/dist/css/bootstrap.css
+++ b/dist/css/bootstrap.css
@@ -4139,15 +4139,6 @@ a.list-group-item.active > .badge,
   }
 }
 
-@-ms-keyframes progress-bar-stripes {
-  from {
-    background-position: 40px 0;
-  }
-  to {
-    background-position: 0 0;
-  }
-}
-
 @-o-keyframes progress-bar-stripes {
   from {
     background-position: 0 0;
-- 
cgit v1.2.3


From 2ee9bea890bbb4b0f43e861fb4d57b3277628c09 Mon Sep 17 00:00:00 2001
From: Mark Otto <otto@github.com>
Date: Mon, 5 Aug 2013 08:52:22 -0700
Subject: Fixes #8786 (part 1): darken hover states on buttons

---
 dist/css/bootstrap.css | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

(limited to 'dist/css/bootstrap.css')

diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css
index cb62a5497..97b232c4f 100644
--- a/dist/css/bootstrap.css
+++ b/dist/css/bootstrap.css
@@ -1760,8 +1760,8 @@ fieldset[disabled] .btn {
 .btn-default:focus,
 .btn-default:active,
 .btn-default.active {
-  background-color: #3a3c3c;
-  border-color: #2e2f2f;
+  background-color: #333434;
+  border-color: #292a2a;
 }
 
 .btn-default.disabled,
@@ -1793,8 +1793,8 @@ fieldset[disabled] .btn-default.active {
 .btn-primary:focus,
 .btn-primary:active,
 .btn-primary.active {
-  background-color: #357ebd;
-  border-color: #3071a9;
+  background-color: #3276b1;
+  border-color: #2d6ca2;
 }
 
 .btn-primary.disabled,
@@ -1826,8 +1826,8 @@ fieldset[disabled] .btn-primary.active {
 .btn-warning:focus,
 .btn-warning:active,
 .btn-warning.active {
-  background-color: #eea236;
-  border-color: #ec971f;
+  background-color: #ed9c28;
+  border-color: #eb9316;
 }
 
 .btn-warning.disabled,
@@ -1859,8 +1859,8 @@ fieldset[disabled] .btn-warning.active {
 .btn-danger:focus,
 .btn-danger:active,
 .btn-danger.active {
-  background-color: #d43f3a;
-  border-color: #c9302c;
+  background-color: #d2322d;
+  border-color: #c12e2a;
 }
 
 .btn-danger.disabled,
@@ -1892,8 +1892,8 @@ fieldset[disabled] .btn-danger.active {
 .btn-success:focus,
 .btn-success:active,
 .btn-success.active {
-  background-color: #4cae4c;
-  border-color: #449d44;
+  background-color: #47a447;
+  border-color: #419641;
 }
 
 .btn-success.disabled,
@@ -1925,8 +1925,8 @@ fieldset[disabled] .btn-success.active {
 .btn-info:focus,
 .btn-info:active,
 .btn-info.active {
-  background-color: #46b8da;
-  border-color: #31b0d5;
+  background-color: #39b3d7;
+  border-color: #2aabd2;
 }
 
 .btn-info.disabled,
-- 
cgit v1.2.3


From 41eef69e6f4d86b5a7ead7abb6d20f0bf6c5404c Mon Sep 17 00:00:00 2001
From: Mark Otto <otto@github.com>
Date: Mon, 5 Aug 2013 09:02:59 -0700
Subject: Fixes #8786 (part 2): new default button styles

Also relevant: http://www.youtube.com/watch?v=Ldyx3KHOFXw
---
 dist/css/bootstrap.css | 26 ++++++++++++++++----------
 1 file changed, 16 insertions(+), 10 deletions(-)

(limited to 'dist/css/bootstrap.css')

diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css
index 97b232c4f..e9c0bc19e 100644
--- a/dist/css/bootstrap.css
+++ b/dist/css/bootstrap.css
@@ -1728,7 +1728,7 @@ textarea.input-sm {
 
 .btn:hover,
 .btn:focus {
-  color: #ffffff;
+  color: #333333;
   text-decoration: none;
 }
 
@@ -1751,17 +1751,18 @@ fieldset[disabled] .btn {
 }
 
 .btn-default {
-  color: #ffffff;
-  background-color: #474949;
-  border-color: #474949;
+  color: #333333;
+  background-color: #ffffff;
+  border-color: #cccccc;
 }
 
 .btn-default:hover,
 .btn-default:focus,
 .btn-default:active,
 .btn-default.active {
-  background-color: #333434;
-  border-color: #292a2a;
+  color: #333333;
+  background-color: #ebebeb;
+  border-color: #adadad;
 }
 
 .btn-default.disabled,
@@ -1779,8 +1780,8 @@ fieldset[disabled] .btn-default:active,
 .btn-default.disabled.active,
 .btn-default[disabled].active,
 fieldset[disabled] .btn-default.active {
-  background-color: #474949;
-  border-color: #474949;
+  background-color: #ffffff;
+  border-color: #cccccc;
 }
 
 .btn-primary {
@@ -1793,6 +1794,7 @@ fieldset[disabled] .btn-default.active {
 .btn-primary:focus,
 .btn-primary:active,
 .btn-primary.active {
+  color: #ffffff;
   background-color: #3276b1;
   border-color: #2d6ca2;
 }
@@ -1826,6 +1828,7 @@ fieldset[disabled] .btn-primary.active {
 .btn-warning:focus,
 .btn-warning:active,
 .btn-warning.active {
+  color: #ffffff;
   background-color: #ed9c28;
   border-color: #eb9316;
 }
@@ -1859,6 +1862,7 @@ fieldset[disabled] .btn-warning.active {
 .btn-danger:focus,
 .btn-danger:active,
 .btn-danger.active {
+  color: #ffffff;
   background-color: #d2322d;
   border-color: #c12e2a;
 }
@@ -1892,6 +1896,7 @@ fieldset[disabled] .btn-danger.active {
 .btn-success:focus,
 .btn-success:active,
 .btn-success.active {
+  color: #ffffff;
   background-color: #47a447;
   border-color: #419641;
 }
@@ -1925,6 +1930,7 @@ fieldset[disabled] .btn-success.active {
 .btn-info:focus,
 .btn-info:active,
 .btn-info.active {
+  color: #ffffff;
   background-color: #39b3d7;
   border-color: #2aabd2;
 }
@@ -3111,11 +3117,11 @@ button.close {
 }
 
 .btn .caret {
-  border-top-color: #ffffff;
+  border-top-color: #333333;
 }
 
 .dropup .btn .caret {
-  border-bottom-color: #ffffff;
+  border-bottom-color: #333333;
 }
 
 .btn-group,
-- 
cgit v1.2.3


From 6af693d1602d9e4c052c23215ac3130580bfcb17 Mon Sep 17 00:00:00 2001
From: Mark Otto <otto@github.com>
Date: Mon, 5 Aug 2013 09:10:52 -0700
Subject: Fixes #8770: mobile-first (stacked by default) horizontal dls

---
 dist/css/bootstrap.css | 61 ++++++++++++++++++++++++--------------------------
 1 file changed, 29 insertions(+), 32 deletions(-)

(limited to 'dist/css/bootstrap.css')

diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css
index e9c0bc19e..d54996e12 100644
--- a/dist/css/bootstrap.css
+++ b/dist/css/bootstrap.css
@@ -564,38 +564,35 @@ dd {
   margin-left: 0;
 }
 
-.dl-horizontal dt {
-  float: left;
-  width: 160px;
-  overflow: hidden;
-  clear: left;
-  text-align: right;
-  text-overflow: ellipsis;
-  white-space: nowrap;
-}
-
-.dl-horizontal dd {
-  margin-left: 180px;
-}
-
-.dl-horizontal dd:before,
-.dl-horizontal dd:after {
-  display: table;
-  content: " ";
-}
-
-.dl-horizontal dd:after {
-  clear: both;
-}
-
-.dl-horizontal dd:before,
-.dl-horizontal dd:after {
-  display: table;
-  content: " ";
-}
-
-.dl-horizontal dd:after {
-  clear: both;
+@media (min-width: 768px) {
+  .dl-horizontal dt {
+    float: left;
+    width: 160px;
+    overflow: hidden;
+    clear: left;
+    text-align: right;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+  }
+  .dl-horizontal dd {
+    margin-left: 180px;
+  }
+  .dl-horizontal dd:before,
+  .dl-horizontal dd:after {
+    display: table;
+    content: " ";
+  }
+  .dl-horizontal dd:after {
+    clear: both;
+  }
+  .dl-horizontal dd:before,
+  .dl-horizontal dd:after {
+    display: table;
+    content: " ";
+  }
+  .dl-horizontal dd:after {
+    clear: both;
+  }
 }
 
 abbr[title],
-- 
cgit v1.2.3


From 01c46bfc0f6f23697326bc5f8d69baa4f7ef3052 Mon Sep 17 00:00:00 2001
From: Mark Otto <otto@github.com>
Date: Mon, 5 Aug 2013 11:30:50 -0700
Subject: More button updates

- Fixes #9113 (caret colors in dropdown buttons)
- Darken borders around buttons for contrast in button groups
---
 dist/css/bootstrap.css | 50 +++++++++++++++++++++++++++++++++-----------------
 1 file changed, 33 insertions(+), 17 deletions(-)

(limited to 'dist/css/bootstrap.css')

diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css
index d54996e12..a732a6887 100644
--- a/dist/css/bootstrap.css
+++ b/dist/css/bootstrap.css
@@ -1784,7 +1784,7 @@ fieldset[disabled] .btn-default.active {
 .btn-primary {
   color: #ffffff;
   background-color: #428bca;
-  border-color: #428bca;
+  border-color: #357ebd;
 }
 
 .btn-primary:hover,
@@ -1793,7 +1793,7 @@ fieldset[disabled] .btn-default.active {
 .btn-primary.active {
   color: #ffffff;
   background-color: #3276b1;
-  border-color: #2d6ca2;
+  border-color: #285e8e;
 }
 
 .btn-primary.disabled,
@@ -1812,13 +1812,13 @@ fieldset[disabled] .btn-primary:active,
 .btn-primary[disabled].active,
 fieldset[disabled] .btn-primary.active {
   background-color: #428bca;
-  border-color: #428bca;
+  border-color: #357ebd;
 }
 
 .btn-warning {
   color: #ffffff;
   background-color: #f0ad4e;
-  border-color: #f0ad4e;
+  border-color: #eea236;
 }
 
 .btn-warning:hover,
@@ -1827,7 +1827,7 @@ fieldset[disabled] .btn-primary.active {
 .btn-warning.active {
   color: #ffffff;
   background-color: #ed9c28;
-  border-color: #eb9316;
+  border-color: #d58512;
 }
 
 .btn-warning.disabled,
@@ -1846,13 +1846,13 @@ fieldset[disabled] .btn-warning:active,
 .btn-warning[disabled].active,
 fieldset[disabled] .btn-warning.active {
   background-color: #f0ad4e;
-  border-color: #f0ad4e;
+  border-color: #eea236;
 }
 
 .btn-danger {
   color: #ffffff;
   background-color: #d9534f;
-  border-color: #d9534f;
+  border-color: #d43f3a;
 }
 
 .btn-danger:hover,
@@ -1861,7 +1861,7 @@ fieldset[disabled] .btn-warning.active {
 .btn-danger.active {
   color: #ffffff;
   background-color: #d2322d;
-  border-color: #c12e2a;
+  border-color: #ac2925;
 }
 
 .btn-danger.disabled,
@@ -1880,13 +1880,13 @@ fieldset[disabled] .btn-danger:active,
 .btn-danger[disabled].active,
 fieldset[disabled] .btn-danger.active {
   background-color: #d9534f;
-  border-color: #d9534f;
+  border-color: #d43f3a;
 }
 
 .btn-success {
   color: #ffffff;
   background-color: #5cb85c;
-  border-color: #5cb85c;
+  border-color: #4cae4c;
 }
 
 .btn-success:hover,
@@ -1895,7 +1895,7 @@ fieldset[disabled] .btn-danger.active {
 .btn-success.active {
   color: #ffffff;
   background-color: #47a447;
-  border-color: #419641;
+  border-color: #398439;
 }
 
 .btn-success.disabled,
@@ -1914,13 +1914,13 @@ fieldset[disabled] .btn-success:active,
 .btn-success[disabled].active,
 fieldset[disabled] .btn-success.active {
   background-color: #5cb85c;
-  border-color: #5cb85c;
+  border-color: #4cae4c;
 }
 
 .btn-info {
   color: #ffffff;
   background-color: #5bc0de;
-  border-color: #5bc0de;
+  border-color: #46b8da;
 }
 
 .btn-info:hover,
@@ -1929,7 +1929,7 @@ fieldset[disabled] .btn-success.active {
 .btn-info.active {
   color: #ffffff;
   background-color: #39b3d7;
-  border-color: #2aabd2;
+  border-color: #269abc;
 }
 
 .btn-info.disabled,
@@ -1948,7 +1948,7 @@ fieldset[disabled] .btn-info:active,
 .btn-info[disabled].active,
 fieldset[disabled] .btn-info.active {
   background-color: #5bc0de;
-  border-color: #5bc0de;
+  border-color: #46b8da;
 }
 
 .btn-link {
@@ -3113,14 +3113,30 @@ button.close {
   color: #ffffff;
 }
 
-.btn .caret {
+.btn-default .caret {
   border-top-color: #333333;
 }
 
-.dropup .btn .caret {
+.btn-primary .caret,
+.btn-success .caret,
+.btn-warning .caret,
+.btn-danger .caret,
+.btn-info .caret {
+  border-top-color: #fff;
+}
+
+.btn-default .dropup .caret {
   border-bottom-color: #333333;
 }
 
+.btn-primary .dropup .caret,
+.btn-success .dropup .caret,
+.btn-warning .dropup .caret,
+.btn-danger .dropup .caret,
+.btn-info .dropup .caret {
+  border-bottom-color: #fff;
+}
+
 .btn-group,
 .btn-group-vertical {
   position: relative;
-- 
cgit v1.2.3


From a82ca0f9e1711b32f7c07e23ea1e23dd253cd21e Mon Sep 17 00:00:00 2001
From: Mark Otto <otto@github.com>
Date: Mon, 5 Aug 2013 11:47:12 -0700
Subject: Fixes #8795, a reoccurence of #1969

---
 dist/css/bootstrap.css | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

(limited to 'dist/css/bootstrap.css')

diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css
index a732a6887..1d9df383d 100644
--- a/dist/css/bootstrap.css
+++ b/dist/css/bootstrap.css
@@ -1649,10 +1649,17 @@ textarea.input-sm {
 
 .form-inline .radio,
 .form-inline .checkbox {
+  padding-left: 0;
   margin-top: 0;
   margin-bottom: 0;
 }
 
+.form-inline .radio input[type="radio"],
+.form-inline .checkbox input[type="checkbox"] {
+  float: none;
+  margin-left: 0;
+}
+
 .form-horizontal .control-label,
 .form-horizontal .radio-inline,
 .form-horizontal .checkbox-inline {
@@ -2926,10 +2933,17 @@ button.close {
 
 .navbar-form .radio,
 .navbar-form .checkbox {
+  padding-left: 0;
   margin-top: 0;
   margin-bottom: 0;
 }
 
+.navbar-form .radio input[type="radio"],
+.navbar-form .checkbox input[type="checkbox"] {
+  float: none;
+  margin-left: 0;
+}
+
 .navbar-nav > li > .dropdown-menu {
   margin-top: 0;
   border-top-right-radius: 0;
-- 
cgit v1.2.3


From bac9e80a460c314209d1ee676a0eb44b9574db89 Mon Sep 17 00:00:00 2001
From: Mark Otto <otto@github.com>
Date: Mon, 5 Aug 2013 11:59:32 -0700
Subject: Fixes #8872: widen the carousel indicators to prevent wrapping

---
 dist/css/bootstrap.css | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'dist/css/bootstrap.css')

diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css
index 1d9df383d..d167b4087 100644
--- a/dist/css/bootstrap.css
+++ b/dist/css/bootstrap.css
@@ -4441,9 +4441,9 @@ a.list-group-item.active > .badge,
   bottom: 10px;
   left: 50%;
   z-index: 15;
-  width: 120px;
+  width: 60%;
   padding-left: 0;
-  margin-left: -60px;
+  margin-left: -30%;
   text-align: center;
   list-style: none;
 }
-- 
cgit v1.2.3


From e23906facaa63fcc97bddbd0895c301699c9e942 Mon Sep 17 00:00:00 2001
From: Mark Otto <otto@github.com>
Date: Mon, 5 Aug 2013 12:17:09 -0700
Subject: Fixes #8150: add `.static-form-control` for vertical alignment of
 static form text

- Also fixes the vertical alignment of labels in horizontal layouts on
account of the recent button and input padding changes
- Also changes the vertical alignment of the checkboxes and radios in
horizontal forms
---
 dist/css/bootstrap.css | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'dist/css/bootstrap.css')

diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css
index d167b4087..e94fd26d1 100644
--- a/dist/css/bootstrap.css
+++ b/dist/css/bootstrap.css
@@ -1634,6 +1634,10 @@ textarea.input-sm {
   border-color: #468847;
 }
 
+.form-control-static {
+  padding-top: 6px;
+}
+
 .help-block {
   display: block;
   margin-top: 5px;
@@ -1663,7 +1667,7 @@ textarea.input-sm {
 .form-horizontal .control-label,
 .form-horizontal .radio-inline,
 .form-horizontal .checkbox-inline {
-  padding-top: 9px;
+  padding-top: 6px;
 }
 
 .form-horizontal .form-group:before,
-- 
cgit v1.2.3


From c15f5a89a07316404b289fc0c65db1a4e52c95d1 Mon Sep 17 00:00:00 2001
From: Mark Otto <otto@github.com>
Date: Mon, 5 Aug 2013 14:19:32 -0700
Subject: Enable scrollable responsive nav bar

Fixes #9007 in a hopefully decent way
---
 dist/css/bootstrap.css | 10 ++++++++++
 1 file changed, 10 insertions(+)

(limited to 'dist/css/bootstrap.css')

diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css
index 4d8bb7038..50b168190 100644
--- a/dist/css/bootstrap.css
+++ b/dist/css/bootstrap.css
@@ -2870,6 +2870,16 @@ button.close {
   margin-bottom: 0;
 }
 
+@media (max-width: 768px) {
+  .nav-collapse-scrollable {
+    max-height: 360px;
+    margin-bottom: 15px;
+    overflow-x: hidden;
+    overflow-y: scroll;
+    -webkit-overflow-scrolling: touch;
+  }
+}
+
 .navbar-brand {
   display: block;
   max-width: 200px;
-- 
cgit v1.2.3


From 844df9e0011c0dff5900bcbed3f1146564c0103c Mon Sep 17 00:00:00 2001
From: Mark Otto <otto@github.com>
Date: Mon, 5 Aug 2013 14:45:00 -0700
Subject: Fixes #8732: unfucks disabled fieldset form example with form groups

---
 dist/css/bootstrap.css | 1 -
 1 file changed, 1 deletion(-)

(limited to 'dist/css/bootstrap.css')

diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css
index 50b168190..b52b76790 100644
--- a/dist/css/bootstrap.css
+++ b/dist/css/bootstrap.css
@@ -2874,7 +2874,6 @@ button.close {
   .nav-collapse-scrollable {
     max-height: 360px;
     margin-bottom: 15px;
-    overflow-x: hidden;
     overflow-y: scroll;
     -webkit-overflow-scrolling: touch;
   }
-- 
cgit v1.2.3


From c4281f39190b99ed543b046430e32ff488092ecd Mon Sep 17 00:00:00 2001
From: Mark Otto <otto@github.com>
Date: Mon, 5 Aug 2013 15:30:28 -0700
Subject: Update labels to include a base class

* Builds on the new button styles by requiring a `.btn-default` for the
regular, gray labels
* Updates components examples to show new stuff
---
 dist/css/bootstrap.css | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

(limited to 'dist/css/bootstrap.css')

diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css
index b52b76790..4eff10a54 100644
--- a/dist/css/bootstrap.css
+++ b/dist/css/bootstrap.css
@@ -4073,7 +4073,6 @@ a.thumbnail:focus {
   text-align: center;
   white-space: nowrap;
   vertical-align: baseline;
-  background-color: #999999;
   border-radius: .25em;
 }
 
@@ -4085,6 +4084,15 @@ a.thumbnail:focus {
   background-color: #808080;
 }
 
+.label-default {
+  background-color: #999999;
+}
+
+.label-default[href]:hover,
+.label-default[href]:focus {
+  background-color: #808080;
+}
+
 .label-danger {
   background-color: #d9534f;
 }
-- 
cgit v1.2.3


From 0faf42b4bc3fd301beaa5b5f9b4d367f69899b05 Mon Sep 17 00:00:00 2001
From: Mark Otto <otto@github.com>
Date: Mon, 5 Aug 2013 15:35:16 -0700
Subject: Remove dupe hover background color

---
 dist/css/bootstrap.css | 1 -
 1 file changed, 1 deletion(-)

(limited to 'dist/css/bootstrap.css')

diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css
index 4eff10a54..c040a1385 100644
--- a/dist/css/bootstrap.css
+++ b/dist/css/bootstrap.css
@@ -4081,7 +4081,6 @@ a.thumbnail:focus {
   color: #ffffff;
   text-decoration: none;
   cursor: pointer;
-  background-color: #808080;
 }
 
 .label-default {
-- 
cgit v1.2.3


From 98df9495cc92bd710a6d55c4d535da7aaf730031 Mon Sep 17 00:00:00 2001
From: Mark Otto <otto@github.com>
Date: Mon, 5 Aug 2013 16:15:36 -0700
Subject: remove dupe border-box

---
 dist/css/bootstrap.css | 3 ---
 1 file changed, 3 deletions(-)

(limited to 'dist/css/bootstrap.css')

diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css
index 23e2800af..59cbab4fd 100644
--- a/dist/css/bootstrap.css
+++ b/dist/css/bootstrap.css
@@ -2107,9 +2107,6 @@ input[type="button"].btn-block {
   background-color: #eeeeee;
   border: 1px solid #cccccc;
   border-radius: 4px;
-  -webkit-box-sizing: border-box;
-     -moz-box-sizing: border-box;
-          box-sizing: border-box;
 }
 
 .input-group-addon.input-sm {
-- 
cgit v1.2.3


From f3bd6dbf0356033e110fa13856c6ea28fa6623e9 Mon Sep 17 00:00:00 2001
From: Mark Otto <otto@github.com>
Date: Mon, 5 Aug 2013 16:16:58 -0700
Subject: fixes #8647: remove focus outline on :focus of buttons in button
 groups

---
 dist/css/bootstrap.css | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

(limited to 'dist/css/bootstrap.css')

diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css
index 59cbab4fd..697575059 100644
--- a/dist/css/bootstrap.css
+++ b/dist/css/bootstrap.css
@@ -2102,7 +2102,7 @@ input[type="button"].btn-block {
   padding: 6px 12px;
   font-size: 14px;
   font-weight: normal;
-  line-height: 1.428571429;
+  line-height: 1;
   text-align: center;
   background-color: #eeeeee;
   border: 1px solid #cccccc;
@@ -2112,14 +2112,12 @@ input[type="button"].btn-block {
 .input-group-addon.input-sm {
   padding: 5px 10px;
   font-size: 12px;
-  line-height: 1.5;
   border-radius: 3px;
 }
 
 .input-group-addon.input-lg {
   padding: 10px 16px;
   font-size: 18px;
-  line-height: 1.33;
   border-radius: 6px;
 }
 
@@ -3180,6 +3178,11 @@ button.close {
   z-index: 2;
 }
 
+.btn-group > .btn:focus,
+.btn-group-vertical > .btn:focus {
+  outline: none;
+}
+
 .btn-group .btn + .btn {
   margin-left: -1px;
 }
-- 
cgit v1.2.3


From db45a60cc86190a060f0baf0b3961cbc690f3a65 Mon Sep 17 00:00:00 2001
From: Mark Otto <otto@github.com>
Date: Mon, 5 Aug 2013 20:55:30 -0700
Subject: Scope tablet classes to tablets range only

Fixes #9128
---
 dist/css/bootstrap.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'dist/css/bootstrap.css')

diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css
index fb446da47..a381420a3 100644
--- a/dist/css/bootstrap.css
+++ b/dist/css/bootstrap.css
@@ -873,7 +873,7 @@ pre code {
   width: 100%;
 }
 
-@media (min-width: 768px) {
+@media (min-width: 768px) and (max-width: 991px) {
   .container {
     max-width: 728px;
   }
-- 
cgit v1.2.3


From 2f1fcca6c541d45839d39fec94462625526e4bed Mon Sep 17 00:00:00 2001
From: Mark Otto <otto@github.com>
Date: Tue, 6 Aug 2013 11:18:53 -0700
Subject: Fixes #9145: Fix tooltip opacity

Update tooltips to not use RGBa colors so IE8 can have tooltips, too
(means we're now using `opacity`).
---
 dist/css/bootstrap.css | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

(limited to 'dist/css/bootstrap.css')

diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css
index a381420a3..3158e23db 100644
--- a/dist/css/bootstrap.css
+++ b/dist/css/bootstrap.css
@@ -3668,8 +3668,8 @@ button.close {
 }
 
 .tooltip.in {
-  opacity: 1;
-  filter: alpha(opacity=100);
+  opacity: 0.9;
+  filter: alpha(opacity=90);
 }
 
 .tooltip.top {
@@ -3698,7 +3698,7 @@ button.close {
   color: #ffffff;
   text-align: center;
   text-decoration: none;
-  background-color: rgba(0, 0, 0, 0.9);
+  background-color: #000000;
   border-radius: 4px;
 }
 
@@ -3714,21 +3714,21 @@ button.close {
   bottom: 0;
   left: 50%;
   margin-left: -5px;
-  border-top-color: rgba(0, 0, 0, 0.9);
+  border-top-color: #000000;
   border-width: 5px 5px 0;
 }
 
 .tooltip.top-left .tooltip-arrow {
   bottom: 0;
   left: 5px;
-  border-top-color: rgba(0, 0, 0, 0.9);
+  border-top-color: #000000;
   border-width: 5px 5px 0;
 }
 
 .tooltip.top-right .tooltip-arrow {
   right: 5px;
   bottom: 0;
-  border-top-color: rgba(0, 0, 0, 0.9);
+  border-top-color: #000000;
   border-width: 5px 5px 0;
 }
 
@@ -3736,7 +3736,7 @@ button.close {
   top: 50%;
   left: 0;
   margin-top: -5px;
-  border-right-color: rgba(0, 0, 0, 0.9);
+  border-right-color: #000000;
   border-width: 5px 5px 5px 0;
 }
 
@@ -3744,7 +3744,7 @@ button.close {
   top: 50%;
   right: 0;
   margin-top: -5px;
-  border-left-color: rgba(0, 0, 0, 0.9);
+  border-left-color: #000000;
   border-width: 5px 0 5px 5px;
 }
 
@@ -3752,21 +3752,21 @@ button.close {
   top: 0;
   left: 50%;
   margin-left: -5px;
-  border-bottom-color: rgba(0, 0, 0, 0.9);
+  border-bottom-color: #000000;
   border-width: 0 5px 5px;
 }
 
 .tooltip.bottom-left .tooltip-arrow {
   top: 0;
   left: 5px;
-  border-bottom-color: rgba(0, 0, 0, 0.9);
+  border-bottom-color: #000000;
   border-width: 0 5px 5px;
 }
 
 .tooltip.bottom-right .tooltip-arrow {
   top: 0;
   right: 5px;
-  border-bottom-color: rgba(0, 0, 0, 0.9);
+  border-bottom-color: #000000;
   border-width: 0 5px 5px;
 }
 
-- 
cgit v1.2.3


From 6da346527ba6861738c0922ed84ab0c0c1a4612d Mon Sep 17 00:00:00 2001
From: Mark Otto <otto@github.com>
Date: Tue, 6 Aug 2013 16:02:07 -0700
Subject: grunt dist on previous commit

---
 dist/css/bootstrap.css | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'dist/css/bootstrap.css')

diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css
index 3158e23db..bc7894a7a 100644
--- a/dist/css/bootstrap.css
+++ b/dist/css/bootstrap.css
@@ -2345,6 +2345,10 @@ input[type="button"].btn-block {
   margin-right: -15px;
 }
 
+.list-group-item > .badge + .badge {
+  margin-right: 0;
+}
+
 .list-group-item-heading {
   margin-top: 0;
   margin-bottom: 5px;
-- 
cgit v1.2.3


From 223e0321504050d4642c3db2673be0cc7f4df569 Mon Sep 17 00:00:00 2001
From: Mark Otto <otto@github.com>
Date: Tue, 6 Aug 2013 16:39:18 -0700
Subject: Fix #9174: pad bottom of navbar collapsed content and clear floated
 contents

---
 dist/css/bootstrap.css | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

(limited to 'dist/css/bootstrap.css')

diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css
index bc7894a7a..34d92672b 100644
--- a/dist/css/bootstrap.css
+++ b/dist/css/bootstrap.css
@@ -2869,6 +2869,30 @@ button.close {
   margin-bottom: 0;
 }
 
+.nav-collapse {
+  padding-bottom: 15px;
+}
+
+.nav-collapse:before,
+.nav-collapse:after {
+  display: table;
+  content: " ";
+}
+
+.nav-collapse:after {
+  clear: both;
+}
+
+.nav-collapse:before,
+.nav-collapse:after {
+  display: table;
+  content: " ";
+}
+
+.nav-collapse:after {
+  clear: both;
+}
+
 @media (max-width: 768px) {
   .nav-collapse-scrollable {
     max-height: 360px;
@@ -3103,6 +3127,7 @@ button.close {
   .nav-collapse.collapse {
     display: block !important;
     height: auto !important;
+    padding-bottom: 0;
     overflow: visible !important;
   }
 }
-- 
cgit v1.2.3


From c3ac95333d3c8746e8877ff02cafc41c4a692414 Mon Sep 17 00:00:00 2001
From: Mark Otto <otto@github.com>
Date: Tue, 6 Aug 2013 17:28:02 -0700
Subject: Fixes #8749: prevent navbar nav from overlapping navbar toggle

---
 dist/css/bootstrap.css | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'dist/css/bootstrap.css')

diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css
index 34d92672b..b3954d47d 100644
--- a/dist/css/bootstrap.css
+++ b/dist/css/bootstrap.css
@@ -2811,7 +2811,6 @@ button.close {
 }
 
 .navbar-nav {
-  margin-top: 10px;
   margin-bottom: 15px;
 }
 
@@ -2893,6 +2892,11 @@ button.close {
   clear: both;
 }
 
+.navbar-toggle + .nav-collapse {
+  width: 100%;
+  margin-top: 50px;
+}
+
 @media (max-width: 768px) {
   .nav-collapse-scrollable {
     max-height: 360px;
-- 
cgit v1.2.3


From 3f3dfc54e77036e726154e21d1a34f1f5918b4d7 Mon Sep 17 00:00:00 2001
From: Mark Otto <otto@github.com>
Date: Tue, 6 Aug 2013 18:05:37 -0700
Subject: update use of mixins and add bg-colors where necessary

---
 dist/css/bootstrap.css | 9 ---------
 1 file changed, 9 deletions(-)

(limited to 'dist/css/bootstrap.css')

diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css
index b3954d47d..804daa361 100644
--- a/dist/css/bootstrap.css
+++ b/dist/css/bootstrap.css
@@ -4263,7 +4263,6 @@ a.list-group-item.active > .badge,
 }
 
 .progress-striped .progress-bar {
-  background-color: #428bca;
   background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent));
   background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
   background-image: -moz-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
@@ -4284,7 +4283,6 @@ a.list-group-item.active > .badge,
 }
 
 .progress-striped .progress-bar-danger {
-  background-color: #d9534f;
   background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent));
   background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
   background-image: -moz-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
@@ -4296,7 +4294,6 @@ a.list-group-item.active > .badge,
 }
 
 .progress-striped .progress-bar-success {
-  background-color: #5cb85c;
   background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent));
   background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
   background-image: -moz-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
@@ -4308,7 +4305,6 @@ a.list-group-item.active > .badge,
 }
 
 .progress-striped .progress-bar-warning {
-  background-color: #f0ad4e;
   background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent));
   background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
   background-image: -moz-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
@@ -4320,7 +4316,6 @@ a.list-group-item.active > .badge,
 }
 
 .progress-striped .progress-bar-info {
-  background-color: #5bc0de;
   background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent));
   background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
   background-image: -moz-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
@@ -4430,8 +4425,6 @@ a.list-group-item.active > .badge,
 }
 
 .carousel-control.left {
-  background-color: rgba(0, 0, 0, 0.0001);
-  background-color: transparent;
   background-image: -webkit-gradient(linear, 0 top, 100% top, from(rgba(0, 0, 0, 0.5)), to(rgba(0, 0, 0, 0.0001)));
   background-image: -webkit-linear-gradient(left, color-stop(rgba(0, 0, 0, 0.5) 0), color-stop(rgba(0, 0, 0, 0.0001) 100%));
   background-image: -moz-linear-gradient(left, rgba(0, 0, 0, 0.5) 0, rgba(0, 0, 0, 0.0001) 100%);
@@ -4443,8 +4436,6 @@ a.list-group-item.active > .badge,
 .carousel-control.right {
   right: 0;
   left: auto;
-  background-color: rgba(0, 0, 0, 0.5);
-  background-color: transparent;
   background-image: -webkit-gradient(linear, 0 top, 100% top, from(rgba(0, 0, 0, 0.0001)), to(rgba(0, 0, 0, 0.5)));
   background-image: -webkit-linear-gradient(left, color-stop(rgba(0, 0, 0, 0.0001) 0), color-stop(rgba(0, 0, 0, 0.5) 100%));
   background-image: -moz-linear-gradient(left, rgba(0, 0, 0, 0.0001) 0, rgba(0, 0, 0, 0.5) 100%);
-- 
cgit v1.2.3