Merge branch '3.0.0-wip' into bs3_remove_icons

Conflicts:
	docs/components.html

1 files changed, 144 insertions, 90 deletions

diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index e192672a0..487d7eb2f 100644
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@ -353,14 +353,6 @@ small {
   font-size: 85%;
 }
 
-strong {
-  font-weight: bold;
-}
-
-em {
-  font-style: italic;
-}
-
 cite {
   font-style: normal;
 }
@@ -425,6 +417,7 @@ h6,
 .h4,
 .h5,
 .h6 {
+  font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
   font-weight: 500;
   line-height: 1.1;
 }
@@ -818,13 +811,26 @@ pre code {
 .col-lg-11,
 .col-lg-12 {
   position: relative;
-  float: left;
-  width: 100%;
   min-height: 1px;
   padding-right: 15px;
   padding-left: 15px;
 }
 
+.col-1,
+.col-2,
+.col-3,
+.col-4,
+.col-5,
+.col-6,
+.col-7,
+.col-8,
+.col-9,
+.col-10,
+.col-11,
+.col-12 {
+  float: left;
+}
+
 .col-1 {
   width: 8.333333333333332%;
 }
@@ -877,6 +883,20 @@ pre code {
   .container {
     max-width: 728px;
   }
+  .col-sm-1,
+  .col-sm-2,
+  .col-sm-3,
+  .col-sm-4,
+  .col-sm-5,
+  .col-sm-6,
+  .col-sm-7,
+  .col-sm-8,
+  .col-sm-9,
+  .col-sm-10,
+  .col-sm-11,
+  .col-sm-12 {
+    float: left;
+  }
   .col-sm-1 {
     width: 8.333333333333332%;
   }
@@ -913,39 +933,6 @@ pre code {
   .col-sm-12 {
     width: 100%;
   }
-  .col-offset-1 {
-    margin-left: 8.333333333333332%;
-  }
-  .col-offset-2 {
-    margin-left: 16.666666666666664%;
-  }
-  .col-offset-3 {
-    margin-left: 25%;
-  }
-  .col-offset-4 {
-    margin-left: 33.33333333333333%;
-  }
-  .col-offset-5 {
-    margin-left: 41.66666666666667%;
-  }
-  .col-offset-6 {
-    margin-left: 50%;
-  }
-  .col-offset-7 {
-    margin-left: 58.333333333333336%;
-  }
-  .col-offset-8 {
-    margin-left: 66.66666666666666%;
-  }
-  .col-offset-9 {
-    margin-left: 75%;
-  }
-  .col-offset-10 {
-    margin-left: 83.33333333333334%;
-  }
-  .col-offset-11 {
-    margin-left: 91.66666666666666%;
-  }
   .col-push-1 {
     left: 8.333333333333332%;
   }
@@ -1018,6 +1005,20 @@ pre code {
   .container {
     max-width: 940px;
   }
+  .col-lg-1,
+  .col-lg-2,
+  .col-lg-3,
+  .col-lg-4,
+  .col-lg-5,
+  .col-lg-6,
+  .col-lg-7,
+  .col-lg-8,
+  .col-lg-9,
+  .col-lg-10,
+  .col-lg-11,
+  .col-lg-12 {
+    float: left;
+  }
   .col-lg-1 {
     width: 8.333333333333332%;
   }
@@ -1054,6 +1055,39 @@ pre code {
   .col-lg-12 {
     width: 100%;
   }
+  .col-offset-1 {
+    margin-left: 8.333333333333332%;
+  }
+  .col-offset-2 {
+    margin-left: 16.666666666666664%;
+  }
+  .col-offset-3 {
+    margin-left: 25%;
+  }
+  .col-offset-4 {
+    margin-left: 33.33333333333333%;
+  }
+  .col-offset-5 {
+    margin-left: 41.66666666666667%;
+  }
+  .col-offset-6 {
+    margin-left: 50%;
+  }
+  .col-offset-7 {
+    margin-left: 58.333333333333336%;
+  }
+  .col-offset-8 {
+    margin-left: 66.66666666666666%;
+  }
+  .col-offset-9 {
+    margin-left: 75%;
+  }
+  .col-offset-10 {
+    margin-left: 83.33333333333334%;
+  }
+  .col-offset-11 {
+    margin-left: 91.66666666666666%;
+  }
 }
 
 @media (min-width: 1200px) {
@@ -1200,13 +1234,13 @@ th {
   background-color: #f5f5f5;
 }
 
-table col[class*="col-span-"] {
+table col[class^="col-"] {
   display: table-column;
   float: none;
 }
 
-table td[class*="col-span-"],
-table th[class*="col-span-"] {
+table td[class^="col-"],
+table th[class^="col-"] {
   display: table-cell;
   float: none;
 }
@@ -1337,6 +1371,58 @@ input[type="color"]:focus {
           box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(82, 168, 236, 0.6);
 }
 
+select[disabled],
+textarea[disabled],
+input[type="text"][disabled],
+input[type="password"][disabled],
+input[type="datetime"][disabled],
+input[type="datetime-local"][disabled],
+input[type="date"][disabled],
+input[type="month"][disabled],
+input[type="time"][disabled],
+input[type="week"][disabled],
+input[type="number"][disabled],
+input[type="email"][disabled],
+input[type="url"][disabled],
+input[type="search"][disabled],
+input[type="tel"][disabled],
+input[type="color"][disabled],
+select[readonly],
+textarea[readonly],
+input[type="text"][readonly],
+input[type="password"][readonly],
+input[type="datetime"][readonly],
+input[type="datetime-local"][readonly],
+input[type="date"][readonly],
+input[type="month"][readonly],
+input[type="time"][readonly],
+input[type="week"][readonly],
+input[type="number"][readonly],
+input[type="email"][readonly],
+input[type="url"][readonly],
+input[type="search"][readonly],
+input[type="tel"][readonly],
+input[type="color"][readonly],
+fieldset[disabled] select,
+fieldset[disabled] textarea,
+fieldset[disabled] input[type="text"],
+fieldset[disabled] input[type="password"],
+fieldset[disabled] input[type="datetime"],
+fieldset[disabled] input[type="datetime-local"],
+fieldset[disabled] input[type="date"],
+fieldset[disabled] input[type="month"],
+fieldset[disabled] input[type="time"],
+fieldset[disabled] input[type="week"],
+fieldset[disabled] input[type="number"],
+fieldset[disabled] input[type="email"],
+fieldset[disabled] input[type="url"],
+fieldset[disabled] input[type="search"],
+fieldset[disabled] input[type="tel"],
+fieldset[disabled] input[type="color"] {
+  cursor: not-allowed;
+  background-color: #eeeeee;
+}
+
 input,
 select,
 textarea {
@@ -1490,6 +1576,7 @@ input[type="url"].input-large,
 input[type="search"].input-large,
 input[type="tel"].input-large,
 input[type="color"].input-large {
+  min-height: 56px;
   padding: 14px 16px;
   font-size: 18px;
   border-radius: 6px;
@@ -1511,34 +1598,12 @@ input[type="url"].input-small,
 input[type="search"].input-small,
 input[type="tel"].input-small,
 input[type="color"].input-small {
-  min-height: 32px;
+  min-height: 30px;
   padding: 5px 10px;
   font-size: 12px;
   border-radius: 3px;
 }
 
-input[disabled],
-select[disabled],
-textarea[disabled],
-input[readonly],
-select[readonly],
-textarea[readonly],
-fieldset[disabled] input,
-fieldset[disabled] select,
-fieldset[disabled] textarea {
-  cursor: not-allowed;
-  background-color: #eeeeee;
-}
-
-input[type="radio"][disabled],
-input[type="checkbox"][disabled],
-input[type="radio"][readonly],
-input[type="checkbox"][readonly],
-fieldset[disabled] input[type="radio"],
-fieldset[disabled] input[type="checkbox"] {
-  background-color: transparent;
-}
-
 .has-warning .control-label {
   color: #c09853;
 }
@@ -1608,21 +1673,6 @@ fieldset[disabled] input[type="checkbox"] {
   border-color: #468847;
 }
 
-input:focus:invalid,
-textarea:focus:invalid,
-select:focus:invalid {
-  color: #b94a48;
-  border-color: #ee5f5b;
-}
-
-input:focus:invalid:focus,
-textarea:focus:invalid:focus,
-select:focus:invalid:focus {
-  border-color: #e9322d;
-  -webkit-box-shadow: 0 0 6px #f8b9b7;
-          box-shadow: 0 0 6px #f8b9b7;
-}
-
 .help-block {
   display: block;
   margin-top: 5px;
@@ -1661,6 +1711,7 @@ select:focus:invalid:focus {
 .input-group-addon,
 .input-group-btn {
   width: 1%;
+  white-space: nowrap;
   vertical-align: middle;
 }
 
@@ -2939,7 +2990,8 @@ input[type="button"].btn-block {
 }
 
 .list-group {
-  margin: 0 0 20px;
+  padding-left: 0;
+  margin-bottom: 20px;
   background-color: #ffffff;
 }
 
@@ -3464,6 +3516,10 @@ button.close {
   background-color: transparent;
 }
 
+.navbar-nav.pull-right {
+  width: 100%;
+}
+
 .navbar-static-top {
   border-radius: 0;
 }
@@ -3677,7 +3733,7 @@ button.close {
   .navbar-brand {
     float: left;
     margin-right: 5px;
-    margin-left: -5px;
+    margin-left: -15px;
   }
   .navbar-nav {
     float: left;
@@ -3692,6 +3748,7 @@ button.close {
   }
   .navbar-nav.pull-right {
     float: right;
+    width: auto;
   }
   .navbar-toggle {
     position: relative;
@@ -4375,10 +4432,6 @@ button.close {
   border-radius: 5px 5px 0 0;
 }
 
-.popover-title:empty {
-  display: none;
-}
-
 .popover-content {
   padding: 9px 14px;
 }
@@ -5024,6 +5077,7 @@ a.list-group-item.active > .badge,
   left: 50%;
   z-index: 15;
   width: 100px;
+  padding-left: 0;
   margin: 0 0 0 -50px;
   text-align: center;
   list-style: none;