From d206ec16595a022f10955eb025fd5756512399a8 Mon Sep 17 00:00:00 2001
From: Mark Otto <otto@github.com>
Date: Mon, 24 Dec 2012 02:06:28 -0800
Subject: Remove .badge-info and .badge-inverse; change docs label of
 .badge-important to .badge-danger

---
 docs/assets/css/bootstrap.css | 16 ----------------
 1 file changed, 16 deletions(-)

(limited to 'docs/assets/css/bootstrap.css')

diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index 44581d473..b5ef18ebb 100644
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@ -4523,22 +4523,6 @@ a.badge:hover {
   background-color: #356635;
 }
 
-.badge-info {
-  background-color: #3a87ad;
-}
-
-.badge-info[href] {
-  background-color: #2d6987;
-}
-
-.badge-inverse {
-  background-color: #333333;
-}
-
-.badge-inverse[href] {
-  background-color: #1a1a1a;
-}
-
 .btn .badge {
   position: relative;
   top: -1px;
-- 
cgit v1.2.3


From c17673dc6139de37ecb5d075231e426d1b238706 Mon Sep 17 00:00:00 2001
From: Mark Otto <otto@github.com>
Date: Wed, 26 Dec 2012 13:59:09 -0600
Subject: Restore .form-horizontal

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

(limited to 'docs/assets/css/bootstrap.css')

diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index b5ef18ebb..b4e548870 100644
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@ -1528,6 +1528,31 @@ select:focus:invalid:focus {
   border-radius: 0 4px 4px 0;
 }
 
+.form-horizontal .control-group {
+  margin-bottom: 10px;
+}
+
+.form-horizontal .control-group:before,
+.form-horizontal .control-group:after {
+  display: table;
+  content: " ";
+}
+
+.form-horizontal .control-group:after {
+  clear: both;
+}
+
+.form-horizontal .control-group > .control-label {
+  float: left;
+  width: 160px;
+  padding-top: 5px;
+  text-align: right;
+}
+
+.form-horizontal .control-group > .controls {
+  margin-left: 180px;
+}
+
 table {
   max-width: 100%;
   background-color: transparent;
-- 
cgit v1.2.3


From 070109abc1624808873e6e172ff97d27eb05c406 Mon Sep 17 00:00:00 2001
From: Mark Otto <otto@github.com>
Date: Wed, 26 Dec 2012 14:09:36 -0600
Subject: Remove .controls-row; instead, folks should use .row and .span* for
 all their grid input sizing needs when multiple inputs per line are required

---
 docs/assets/css/bootstrap.css | 103 ------------------------------------------
 1 file changed, 103 deletions(-)

(limited to 'docs/assets/css/bootstrap.css')

diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index b4e548870..a1af172b2 100644
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@ -1088,90 +1088,6 @@ textarea[class*="span"],
   margin-left: 0;
 }
 
-.controls-row input.offset12,
-textarea.offset12,
-select.offset12,
-uneditable-input.offset12 {
-  margin-left: 101.06382978723404%;
-}
-
-.controls-row input.offset11,
-textarea.offset11,
-select.offset11,
-uneditable-input.offset11 {
-  margin-left: 92.7304964539007%;
-}
-
-.controls-row input.offset10,
-textarea.offset10,
-select.offset10,
-uneditable-input.offset10 {
-  margin-left: 84.39716312056738%;
-}
-
-.controls-row input.offset9,
-textarea.offset9,
-select.offset9,
-uneditable-input.offset9 {
-  margin-left: 76.06382978723404%;
-}
-
-.controls-row input.offset8,
-textarea.offset8,
-select.offset8,
-uneditable-input.offset8 {
-  margin-left: 67.7304964539007%;
-}
-
-.controls-row input.offset7,
-textarea.offset7,
-select.offset7,
-uneditable-input.offset7 {
-  margin-left: 59.39716312056738%;
-}
-
-.controls-row input.offset6,
-textarea.offset6,
-select.offset6,
-uneditable-input.offset6 {
-  margin-left: 51.06382978723404%;
-}
-
-.controls-row input.offset5,
-textarea.offset5,
-select.offset5,
-uneditable-input.offset5 {
-  margin-left: 42.73049645390071%;
-}
-
-.controls-row input.offset4,
-textarea.offset4,
-select.offset4,
-uneditable-input.offset4 {
-  margin-left: 34.39716312056737%;
-}
-
-.controls-row input.offset3,
-textarea.offset3,
-select.offset3,
-uneditable-input.offset3 {
-  margin-left: 26.06382978723404%;
-}
-
-.controls-row input.offset2,
-textarea.offset2,
-select.offset2,
-uneditable-input.offset2 {
-  margin-left: 17.730496453900706%;
-}
-
-.controls-row input.offset1,
-textarea.offset1,
-select.offset1,
-uneditable-input.offset1 {
-  margin-left: 9.397163120567374%;
-}
-
 .input-append input[class*="span"],
 .input-append .uneditable-input[class*="span"],
 .input-prepend input[class*="span"],
@@ -1186,25 +1102,6 @@ textarea[class*="span"],
   height: 34px;
 }
 
-.controls-row:before,
-.controls-row:after {
-  display: table;
-  content: " ";
-}
-
-.controls-row:after {
-  clear: both;
-}
-
-.controls-row [class*="span"] {
-  float: left;
-}
-
-.controls-row .checkbox[class*="span"],
-.controls-row .radio[class*="span"] {
-  padding-top: 5px;
-}
-
 input[disabled],
 select[disabled],
 textarea[disabled],
-- 
cgit v1.2.3


From 2ef4fde09fae0dd3e054a77b61b0738fe538b58d Mon Sep 17 00:00:00 2001
From: Mark Otto <otto@github.com>
Date: Wed, 26 Dec 2012 14:19:48 -0600
Subject: Drop .input-block-level modifier as inputs are already width: 100%;

---
 docs/assets/css/bootstrap.css | 6 ------
 1 file changed, 6 deletions(-)

(limited to 'docs/assets/css/bootstrap.css')

diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index a1af172b2..8b93968b6 100644
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@ -4924,11 +4924,6 @@ a.badge:hover {
   position: fixed;
 }
 
-.control-block-level {
-  display: block;
-  width: 100%;
-}
-
 @-ms-viewport {
   width: device-width;
 }
@@ -5213,7 +5208,6 @@ a.badge:hover {
   select[class*="span"],
   textarea[class*="span"],
   .uneditable-input {
-    display: block;
     width: 100%;
   }
   .input-prepend input,
-- 
cgit v1.2.3


From d0baa99aed07b6643d649350f3988b3d8a07a4ac Mon Sep 17 00:00:00 2001
From: Mark Otto <otto@github.com>
Date: Wed, 26 Dec 2012 14:59:58 -0600
Subject: Remove .text-info and .info form validation states

---
 docs/assets/css/bootstrap.css | 45 -------------------------------------------
 1 file changed, 45 deletions(-)

(limited to 'docs/assets/css/bootstrap.css')

diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index 8b93968b6..fe6adf2cc 100644
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@ -502,14 +502,6 @@ a.text-error:hover {
   color: #953b39;
 }
 
-.text-info {
-  color: #3a87ad;
-}
-
-a.text-info:hover {
-  color: #2d6987;
-}
-
 .text-success {
   color: #468847;
 }
@@ -1235,43 +1227,6 @@ fieldset[disabled] input[type="checkbox"] {
   border-color: #468847;
 }
 
-.control-group.info .control-label,
-.control-group.info .help-block,
-.control-group.info .help-inline {
-  color: #3a87ad;
-}
-
-.control-group.info .checkbox,
-.control-group.info .radio,
-.control-group.info input,
-.control-group.info select,
-.control-group.info textarea {
-  color: #3a87ad;
-}
-
-.control-group.info input,
-.control-group.info select,
-.control-group.info textarea {
-  border-color: #3a87ad;
-  -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);
-}
-
-.control-group.info input:focus,
-.control-group.info select:focus,
-.control-group.info textarea:focus {
-  border-color: #2d6987;
-  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #7ab5d3;
-          box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #7ab5d3;
-}
-
-.control-group.info .input-prepend .add-on,
-.control-group.info .input-append .add-on {
-  color: #3a87ad;
-  background-color: #d9edf7;
-  border-color: #3a87ad;
-}
-
 input:focus:invalid,
 textarea:focus:invalid,
 select:focus:invalid {
-- 
cgit v1.2.3


From dc5c6d6be8e46e36aa8a2e1d35f6ed8c8e3cd8cb Mon Sep 17 00:00:00 2001
From: Mark Otto <otto@github.com>
Date: Wed, 26 Dec 2012 15:57:52 -0600
Subject: Simplify form validation states while enabling them to be applied to
 one field at a time.

---
 docs/assets/css/bootstrap.css | 96 ++++++++++---------------------------------
 1 file changed, 22 insertions(+), 74 deletions(-)

(limited to 'docs/assets/css/bootstrap.css')

diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index fe6adf2cc..fcc8a8c10 100644
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@ -1116,117 +1116,57 @@ fieldset[disabled] input[type="checkbox"] {
   background-color: transparent;
 }
 
-.control-group.warning .control-label,
-.control-group.warning .help-block,
-.control-group.warning .help-inline {
+.has-warning .control-label {
   color: #c09853;
 }
 
-.control-group.warning .checkbox,
-.control-group.warning .radio,
-.control-group.warning input,
-.control-group.warning select,
-.control-group.warning textarea {
-  color: #c09853;
-}
-
-.control-group.warning input,
-.control-group.warning select,
-.control-group.warning textarea {
+.has-warning .input-with-feedback {
+  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);
 }
 
-.control-group.warning input:focus,
-.control-group.warning select:focus,
-.control-group.warning textarea:focus {
+.has-warning .input-with-feedback:focus {
   border-color: #a47e3c;
   -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #dbc59e;
           box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #dbc59e;
 }
 
-.control-group.warning .input-prepend .add-on,
-.control-group.warning .input-append .add-on {
-  color: #c09853;
-  background-color: #fcf8e3;
-  border-color: #c09853;
-}
-
-.control-group.error .control-label,
-.control-group.error .help-block,
-.control-group.error .help-inline {
+.has-error .control-label {
   color: #b94a48;
 }
 
-.control-group.error .checkbox,
-.control-group.error .radio,
-.control-group.error input,
-.control-group.error select,
-.control-group.error textarea {
-  color: #b94a48;
-}
-
-.control-group.error input,
-.control-group.error select,
-.control-group.error textarea {
+.has-error .input-with-feedback {
+  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);
 }
 
-.control-group.error input:focus,
-.control-group.error select:focus,
-.control-group.error textarea:focus {
+.has-error .input-with-feedback:focus {
   border-color: #953b39;
   -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #d59392;
           box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #d59392;
 }
 
-.control-group.error .input-prepend .add-on,
-.control-group.error .input-append .add-on {
-  color: #b94a48;
-  background-color: #f2dede;
-  border-color: #b94a48;
-}
-
-.control-group.success .control-label,
-.control-group.success .help-block,
-.control-group.success .help-inline {
+.has-success .control-label {
   color: #468847;
 }
 
-.control-group.success .checkbox,
-.control-group.success .radio,
-.control-group.success input,
-.control-group.success select,
-.control-group.success textarea {
-  color: #468847;
-}
-
-.control-group.success input,
-.control-group.success select,
-.control-group.success textarea {
+.has-success .input-with-feedback {
+  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);
 }
 
-.control-group.success input:focus,
-.control-group.success select:focus,
-.control-group.success textarea:focus {
+.has-success .input-with-feedback:focus {
   border-color: #356635;
   -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #7aba7b;
           box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #7aba7b;
 }
 
-.control-group.success .input-prepend .add-on,
-.control-group.success .input-append .add-on {
-  color: #468847;
-  background-color: #dff0d8;
-  border-color: #468847;
-}
-
 input:focus:invalid,
 textarea:focus:invalid,
 select:focus:invalid {
@@ -1381,7 +1321,8 @@ select:focus:invalid:focus {
 }
 
 .form-horizontal .control-group {
-  margin-bottom: 10px;
+  position: relative;
+  margin-bottom: 20px;
 }
 
 .form-horizontal .control-group:before,
@@ -1394,10 +1335,17 @@ select:focus:invalid:focus {
   clear: both;
 }
 
+.form-horizontal .control-group input,
+.form-horizontal .control-group select,
+.form-horizontal .control-group textarea,
+.form-horizontal .control-group .uneditable-input {
+  margin-bottom: 0;
+}
+
 .form-horizontal .control-group > .control-label {
   float: left;
   width: 160px;
-  padding-top: 5px;
+  padding-top: 6px;
   text-align: right;
 }
 
-- 
cgit v1.2.3


From 91dd77939b4183fa86973056778ad87950674410 Mon Sep 17 00:00:00 2001
From: Mark Otto <otto@github.com>
Date: Wed, 9 Jan 2013 18:56:08 -0800
Subject: Add text alignment utility classes

---
 docs/assets/css/bootstrap.css | 12 ++++++++++++
 1 file changed, 12 insertions(+)

(limited to 'docs/assets/css/bootstrap.css')

diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index fcc8a8c10..3f7434cbd 100644
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@ -510,6 +510,18 @@ a.text-success:hover {
   color: #356635;
 }
 
+.text-left {
+  text-align: left;
+}
+
+.text-right {
+  text-align: right;
+}
+
+.text-center {
+  text-align: center;
+}
+
 h1,
 h2,
 h3,
-- 
cgit v1.2.3


From b9b5cd786d2e774f478704c9aa942f35ac5d2a0c Mon Sep 17 00:00:00 2001
From: Mark Otto <otto@github.com>
Date: Fri, 11 Jan 2013 20:23:37 -0800
Subject: Fixes #6555: remove .controls-row from responsive

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

(limited to 'docs/assets/css/bootstrap.css')

diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index 3f7434cbd..b296eeeb4 100644
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@ -5132,9 +5132,6 @@ a.badge:hover {
     display: inline-block;
     width: auto;
   }
-  .controls-row [class*="span"] + [class*="span"] {
-    margin-left: 0;
-  }
   .modal {
     position: fixed;
     top: 20px;
-- 
cgit v1.2.3


From 7626cc629ff165f84601ad7c35b64e0b30f491f1 Mon Sep 17 00:00:00 2001
From: Mark Otto <otto@github.com>
Date: Fri, 11 Jan 2013 20:26:48 -0800
Subject: Remove overflow: auto; from .tab-content

---
 docs/assets/css/bootstrap.css | 4 ----
 1 file changed, 4 deletions(-)

(limited to 'docs/assets/css/bootstrap.css')

diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index b296eeeb4..944292719 100644
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@ -3177,10 +3177,6 @@ fieldset[disabled] .btn-link:hover {
   clear: both;
 }
 
-.tab-content {
-  overflow: auto;
-}
-
 .tab-content > .tab-pane,
 .pill-content > .pill-pane {
   display: none;
-- 
cgit v1.2.3


From 7a3f078fb487323246ccf64460b7efaf7d478afc Mon Sep 17 00:00:00 2001
From: Mark Otto <otto@github.com>
Date: Sat, 12 Jan 2013 13:15:19 -0800
Subject: Remove parent div from pagination component

* No more div.pagination; it's now just ul.pagination
* No more .pagination-right or .pagination-centered
* Sizes remain
* Any further customization, such as alignment, should be done on the individual application or site level.
---
 docs/assets/css/bootstrap.css | 81 ++++++++++++++++++-------------------------
 1 file changed, 34 insertions(+), 47 deletions(-)

(limited to 'docs/assets/css/bootstrap.css')

diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index 944292719..b707ef309 100644
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@ -3746,24 +3746,19 @@ fieldset[disabled] .navbar-inverse .btn-navbar {
 }
 
 .pagination {
-  margin: 20px 0;
-}
-
-.pagination ul {
   display: inline-block;
-  margin-bottom: 0;
-  margin-left: 0;
+  margin: 20px 0;
   border-radius: 4px;
   -webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05);
           box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05);
 }
 
-.pagination ul > li {
+.pagination > li {
   display: inline;
 }
 
-.pagination ul > li > a,
-.pagination ul > li > span {
+.pagination > li > a,
+.pagination > li > span {
   float: left;
   padding: 4px 12px;
   line-height: 20px;
@@ -3773,89 +3768,81 @@ fieldset[disabled] .navbar-inverse .btn-navbar {
   border-left-width: 0;
 }
 
-.pagination ul > li > a:hover,
-.pagination ul > .active > a,
-.pagination ul > .active > span {
+.pagination > li > a:hover,
+.pagination > .active > a,
+.pagination > .active > span {
   background-color: #f5f5f5;
 }
 
-.pagination ul > .active > a,
-.pagination ul > .active > span {
+.pagination > .active > a,
+.pagination > .active > span {
   color: #999999;
   cursor: default;
 }
 
-.pagination ul > .disabled > span,
-.pagination ul > .disabled > a,
-.pagination ul > .disabled > a:hover {
+.pagination > .disabled > span,
+.pagination > .disabled > a,
+.pagination > .disabled > a:hover {
   color: #999999;
   cursor: default;
   background-color: transparent;
 }
 
-.pagination ul > li:first-child > a,
-.pagination ul > li:first-child > span {
+.pagination > li:first-child > a,
+.pagination > li:first-child > span {
   border-left-width: 1px;
   border-bottom-left-radius: 4px;
   border-top-left-radius: 4px;
 }
 
-.pagination ul > li:last-child > a,
-.pagination ul > li:last-child > span {
+.pagination > li:last-child > a,
+.pagination > li:last-child > span {
   border-top-right-radius: 4px;
   border-bottom-right-radius: 4px;
 }
 
-.pagination-centered {
-  text-align: center;
-}
-
-.pagination-right {
-  text-align: right;
-}
-
-.pagination-large ul > li > a,
-.pagination-large ul > li > span {
+.pagination-large > li > a,
+.pagination-large > li > span {
   padding: 11px 19px;
   font-size: 17.5px;
 }
 
-.pagination-large ul > li:first-child > a,
-.pagination-large ul > li:first-child > span {
+.pagination-large > li:first-child > a,
+.pagination-large > li:first-child > span {
   border-bottom-left-radius: 6px;
   border-top-left-radius: 6px;
 }
 
-.pagination-large ul > li:last-child > a,
-.pagination-large ul > li:last-child > span {
+.pagination-large > li:last-child > a,
+.pagination-large > li:last-child > span {
   border-top-right-radius: 6px;
   border-bottom-right-radius: 6px;
 }
 
-.pagination-mini ul > li:first-child > a,
-.pagination-small ul > li:first-child > a,
-.pagination-mini ul > li:first-child > span,
-.pagination-small ul > li:first-child > span {
+.pagination-mini > li:first-child > a,
+.pagination-small > li:first-child > a,
+.pagination-mini > li:first-child > span,
+.pagination-small > li:first-child > span {
   border-bottom-left-radius: 3px;
   border-top-left-radius: 3px;
 }
 
-.pagination-mini ul > li:last-child > a,
-.pagination-small ul > li:last-child > a,
-.pagination-mini ul > li:last-child > span,
-.pagination-small ul > li:last-child > span {
+.pagination-mini > li:last-child > a,
+.pagination-small > li:last-child > a,
+.pagination-mini > li:last-child > span,
+.pagination-small > li:last-child > span {
   border-top-right-radius: 3px;
   border-bottom-right-radius: 3px;
 }
 
-.pagination-small ul > li > a,
-.pagination-small ul > li > span {
+.pagination-small > li > a,
+.pagination-small > li > span {
   padding: 2px 10px;
   font-size: 11.9px;
 }
 
-.pagination-mini ul > li > a,
-.pagination-mini ul > li > span {
+.pagination-mini > li > a,
+.pagination-mini > li > span {
   padding: 0 6px;
   font-size: 10.5px;
 }
-- 
cgit v1.2.3