Merge branch '3.0.0-wip' into bs3_makefile_separated_done

Conflicts: Makefile

Merge branch '3.0.0-wip' into bs3_makefile_separated_done
Conflicts: Makefile
1f160d4c · Mark Otto · f59e4fdb · e0647e82 · 1f160d4c · 1f160d4c
Commit 1f160d4c authored 12 years ago by Mark Otto
Expand all Hide whitespace changes
Inline Side-by-side

Showing

with 506 additions and 277 deletions
+506 -277
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
+## 2.3.1 (February 28, 2013)
+
+Patch release for @fat's n00bery
+
+- fix missing event type in dropdown
+- fix delegated data-attrs for popover/tooltip
+- make carousel actually pause when you click cycle
+- fix jshint ref in makefile
+- fix trying to remove backdrop when no backdrop
+
 ## 2.3.0 (February 7, 2013)

 Minor release to add carousel indicators, improve tooltips, improve dev setup, and fix hella bugs.

--- a/_config.yml
+++ b/_config.yml
@@ -6,7 +6,6 @@ pygments:     true
 permalink:    pretty

 # Server
-auto:         true
 source:       ./docs
 destination:  ./_gh_pages
 url:          http://bootstrap.dev:9001

--- a/docs/_includes/colophon.html
+++ b/docs/_includes/colophon.html
 <!-- Footer
 ================================================== -->
-<footer class="footer">
+<footer class="bs-docs-footer">
  <div class="container">

    <div class="bs-docs-social">

--- a/docs/_includes/header.html
+++ b/docs/_includes/header.html
@@ -14,9 +14,11 @@
 <!-- Bootstrap core CSS -->
 <link href="/assets/css/bootstrap.css" rel="stylesheet">

+{% if page.layout == "default" %}
 <!-- Documentation extras -->
 <link href="/assets/css/docs.css" rel="stylesheet">
 <link href="/assets/css/pygments-manni.css" rel="stylesheet">
+{% endif %}

 <!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
 <!--[if lt IE 9]>

--- a/docs/_includes/masthead.html
+++ b/docs/_includes/masthead.html
-{% raw %}
-<header class="bs-docs-jumbotron subhead">
-  <div class="container">
-    <h1>{{ page.title }}</h1>
-    <p class="lead">{{ page.description }}</p>
-  </div>
-</header>
-{% endraw %}
\ No newline at end of file
--- a/docs/_includes/navbar.html
+++ b/docs/_includes/navbar.html
 <!-- Navbar
 ================================================== -->
-<div class="navbar navbar-inverse navbar-fixed-top">
+<div class="navbar navbar-fixed-top bs-docs-navbar">
  <div class="container">
-    <button type="button" class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
+    <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".nav-collapse">
      <span class="icon-bar"></span>
      <span class="icon-bar"></span>
      <span class="icon-bar"></span>
    </button>
-    <a class="brand" href="/">Bootstrap</a>
+    <a class="navbar-brand" href="/">Bootstrap</a>
    <div class="nav-collapse collapse">
      <ul class="nav">
        <li {% if page.title == "Bootstrap" %}class="active"{% endif %}>

--- a/docs/_layouts/default.html
+++ b/docs/_layouts/default.html
@@ -5,7 +5,7 @@
    {% include header.html %}
    <!-- Place anything custom after this. -->
  </head>
-  <body data-spy="scroll" data-target=".bs-docs-sidebar">
+  <body class="bs-docs-body" data-spy="scroll" data-target=".bs-docs-sidebar">

    <!-- Main navbar for all docs pages. -->
    {% include navbar.html %}
@@ -20,4 +20,4 @@
    {% include footer.html %}

  </body>
-</html>
\ No newline at end of file
+</html>
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
 /*!
 * Bootstrap v3.0.0
 *
- * Copyright 2012 Twitter, Inc
+ * Copyright 2013 Twitter, Inc
 * Licensed under the Apache License v2.0
 * http://www.apache.org/licenses/LICENSE-2.0
 *
 * Designed and built with all the love in the world by @mdo and @fat.
 */

-/*@padding-large-input:     10px 14px; // 44px
-// firefox hack since it doesn't accept custom line-height for inputs and automatically sets line-height as font-size + 4 px.
-// input-large at 18 + 4 = 22, so I tried to compensate on padding.
-*/
-
 /*! normalize.css v2.1.0 | MIT License | git.io/normalize */

 article,
@@ -218,6 +213,58 @@ table {
  border-spacing: 0;
 }

+@media print {
+  * {
+    color: #000 !important;
+    text-shadow: none !important;
+    background: transparent !important;
+    box-shadow: none !important;
+  }
+  a,
+  a:visited {
+    text-decoration: underline;
+  }
+  a[href]:after {
+    content: " (" attr(href) ")";
+  }
+  abbr[title]:after {
+    content: " (" attr(title) ")";
+  }
+  .ir a:after,
+  a[href^="javascript:"]:after,
+  a[href^="#"]:after {
+    content: "";
+  }
+  pre,
+  blockquote {
+    border: 1px solid #999;
+    page-break-inside: avoid;
+  }
+  thead {
+    display: table-header-group;
+  }
+  tr,
+  img {
+    page-break-inside: avoid;
+  }
+  img {
+    max-width: 100% !important;
+  }
+  @page  {
+    margin: 0.5cm;
+  }
+  p,
+  h2,
+  h3 {
+    orphans: 3;
+    widows: 3;
+  }
+  h2,
+  h3 {
+    page-break-after: avoid;
+  }
+}
+
 html {
  font-size: 62.5%;
  -webkit-overflow-scrolling: touch;
@@ -283,58 +330,6 @@ img {
  border-radius: 500px;
 }

-@media print {
-  * {
-    color: #000 !important;
-    text-shadow: none !important;
-    background: transparent !important;
-    box-shadow: none !important;
-  }
-  a,
-  a:visited {
-    text-decoration: underline;
-  }
-  a[href]:after {
-    content: " (" attr(href) ")";
-  }
-  abbr[title]:after {
-    content: " (" attr(title) ")";
-  }
-  .ir a:after,
-  a[href^="javascript:"]:after,
-  a[href^="#"]:after {
-    content: "";
-  }
-  pre,
-  blockquote {
-    border: 1px solid #999;
-    page-break-inside: avoid;
-  }
-  thead {
-    display: table-header-group;
-  }
-  tr,
-  img {
-    page-break-inside: avoid;
-  }
-  img {
-    max-width: 100% !important;
-  }
-  @page  {
-    margin: 0.5cm;
-  }
-  p,
-  h2,
-  h3 {
-    orphans: 3;
-    widows: 3;
-  }
-  h2,
-  h3 {
-    page-break-after: avoid;
-  }
-}
-
 p {
  margin: 0 0 10px;
 }
@@ -975,11 +970,15 @@ th {
  background-color: #f5f5f5;
 }

-table td[class*="span"],
-table th[class*="span"] {
+table col[class^="span"] {
+  display: table-column;
+  float: none;
+}
+
+table td[class^="span"],
+table th[class^="span"] {
  display: table-cell;
  float: none;
-  margin-left: 0;
 }

 .table tbody tr.success > td {
@@ -1135,10 +1134,6 @@ input[type="file"] {
  line-height: 34px;
 }

-select {
-  border: 1px solid #cccccc;
-}
-
 select[multiple],
 select[size] {
  height: auto;
@@ -1550,62 +1545,60 @@ select:focus:invalid:focus {
  border-left: 0;
 }

-.input-group-btn,
-.input-group-btn .btn {
+.input-group-btn {
+  position: relative;
  white-space: nowrap;
 }

 .input-group-btn > .btn {
+  position: relative;
  float: left;
  border-radius: 0;
 }

 .input-group-btn > .btn + .btn {
-  border-left: 0;
-}
-
-.input-group-btn.btn-group {
-  display: table-cell;
-}
-
-.input-group-btn:first-child > .btn,
-.input-group-btn.btn-group:first-child > .btn {
-  border-right: 0;
+  margin-left: -1px;
 }

-.input-group-btn:first-child > .btn,
-.input-group-btn.btn-group:first-child > .btn {
-  border-radius: 4px 0 0 4px;
+.input-group-btn > .btn:hover,
+.input-group-btn > .btn:active {
+  z-index: 2;
 }

-.input-group-btn:first-child > .btn.btn-large,
-.input-group-btn.btn-group:first-child > .btn.btn-large {
-  border-radius: 6px 0 0 6px;
+.input-group-btn:first-child > .btn:first-child,
+.input-group-btn:first-child > .dropdown-toggle:first-child {
+  border-bottom-left-radius: 4px;
+  border-top-left-radius: 4px;
 }

-.input-group-btn:first-child > .btn.btn-small,
-.input-group-btn.btn-group:first-child > .btn.btn-small {
-  border-radius: 3px 0 0 3px;
+.input-group-btn:first-child > .btn:first-child.btn-large,
+.input-group-btn:first-child > .dropdown-toggle:first-child.btn-large {
+  border-bottom-left-radius: 6px;
+  border-top-left-radius: 6px;
 }

-.input-group-btn:last-child > .btn,
-.input-group-btn.btn-group:last-child > .btn:first-child {
-  border-left: 0;
+.input-group-btn:first-child > .btn:first-child.btn-small,
+.input-group-btn:first-child > .dropdown-toggle:first-child.btn-small {
+  border-bottom-left-radius: 3px;
+  border-top-left-radius: 3px;
 }

-.input-group-btn:last-child > .btn,
-.input-group-btn.btn-group:last-child > .btn {
-  border-radius: 0 4px 4px 0;
+.input-group-btn:last-child > .btn:last-child,
+.input-group-btn:last-child > .dropdown-toggle {
+  border-top-right-radius: 4px;
+  border-bottom-right-radius: 4px;
 }

-.input-group-btn:last-child > .btn.btn-large,
-.input-group-btn.btn-group:last-child > .btn.btn-large {
-  border-radius: 0 6px 6px 0;
+.input-group-btn:last-child > .btn:last-child.btn-large,
+.input-group-btn:last-child > .dropdown-toggle.btn-large {
+  border-top-right-radius: 6px;
+  border-bottom-right-radius: 6px;
 }

-.input-group-btn:last-child > .btn.btn-small,
-.input-group-btn.btn-group:last-child > .btn.btn-small {
-  border-radius: 0 3px 3px 0;
+.input-group-btn:last-child > .btn:last-child.btn-small,
+.input-group-btn:last-child > .dropdown-toggle.btn-small {
+  border-top-right-radius: 3px;
+  border-bottom-right-radius: 3px;
 }

 @media screen and (min-width: 768px) {
@@ -1646,6 +1639,7 @@ select:focus:invalid:focus {
  font-weight: 500;
  line-height: 20px;
  text-align: center;
+  white-space: nowrap;
  vertical-align: middle;
  cursor: pointer;
  border: 1px solid #a7a9aa;
@@ -1694,26 +1688,12 @@ fieldset[disabled] .btn {
  border-radius: 3px;
 }

-.btn-mini [class^="icon-"],
-.btn-mini [class*=" icon-"] {
-  margin-top: -1px;
-}
-
 .btn-mini {
  padding: 0 6px;
  font-size: 10.5px;
  border-radius: 3px;
 }

-.btn [class^="glyphicon-"]::before {
-  vertical-align: -2px;
-}
-
-.btn-small [class^="glyphicon-"]::before,
-.btn-mini [class^="glyphicon-"]::before {
-  vertical-align: -1px;
-}
-
 .btn-block {
  display: block;
  width: 100%;
@@ -3006,6 +2986,7 @@ button.close {

 .nav > .disabled > a:hover,
 .nav > .disabled > a:focus {
+  color: #999999;
  text-decoration: none;
  cursor: default;
  background-color: transparent;
@@ -3034,6 +3015,26 @@ button.close {
  border-bottom: 1px solid #ffffff;
 }

+.tabbable:before,
+.tabbable:after {
+  display: table;
+  content: " ";
+}
+
+.tabbable:after {
+  clear: both;
+}
+
+.tab-content > .tab-pane,
+.pill-content > .pill-pane {
+  display: none;
+}
+
+.tab-content > .active,
+.pill-content > .active {
+  display: block;
+}
+
 /*
 // Prevent IE8 from misplacing imgs
 // See https://github.com/h5bp/html5-boilerplate/issues/984#issuecomment-3985989
@@ -3093,7 +3094,7 @@ button.close {
 .nav li.dropdown.open a:hover .caret {
  border-top-color: #fff;
  border-bottom-color: #fff;
-  .opacity(100);
+  .opacity(1);
 }

 // Dropdowns in stacked tabs
@@ -3101,30 +3102,11 @@ button.close {
  border-color: @grayLight;
 }

-
-
-// Tabbable tabs
-// -------------------------
-
-// Clear any floats
-.tabbable {
-  .clearfix();
-}
-
-// Show/hide tabbable areas
-.tab-content > .tab-pane,
-.pill-content > .pill-pane {
-  display: none;
-}
-.tab-content > .active,
-.pill-content > .active {
-  display: block;
-}
-
 */

 .navbar {
-  padding: 15px;
+  position: relative;
+  padding: 10px 15px;
  background-color: #eeeeee;
  border-radius: 4px;
 }
@@ -3163,50 +3145,79 @@ button.close {
  background-color: #d5d5d5;
 }

+.navbar .nav > .disabled > a,
+.navbar .nav > .disabled > a:hover,
+.navbar .nav > .disabled > a:focus {
+  color: #cccccc;
+  background-color: transparent;
+}
+
 .navbar-static-top {
-  position: static;
  border-radius: 0;
 }

 .navbar-fixed-top,
 .navbar-fixed-bottom {
+  position: fixed;
+  right: 0;
+  left: 0;
+  z-index: 1030;
  border-radius: 0;
 }

-.navbar .brand {
-  display: inline-block;
+.navbar-fixed-top {
+  top: 0;
+}
+
+.navbar-fixed-bottom {
+  bottom: 0;
+}
+
+.navbar-brand {
+  display: block;
+  max-width: 200px;
  padding: 7px 15px;
+  margin-right: auto;
+  margin-left: auto;
  font-size: 18px;
  font-weight: 500;
  line-height: 20px;
  color: #777777;
+  text-align: center;
 }

-.navbar .brand:hover,
-.navbar .brand:focus {
+.navbar-brand:hover,
+.navbar-brand:focus {
  color: #5e5e5e;
  text-decoration: none;
  background-color: transparent;
 }

-.btn-navbar {
-  float: right;
-  padding: 10px 12px;
-  background-color: #ddd;
-  border: 0;
+.navbar-toggle {
+  position: absolute;
+  top: 10px;
+  right: 10px;
+  padding: 8px 12px;
+  background-color: transparent;
+  border: 1px solid #ddd;
  border-radius: 4px;
 }

-.btn-navbar .icon-bar {
+.navbar-toggle:hover,
+.navbar-toggle:focus {
+  background-color: #ddd;
+}
+
+.navbar-toggle .icon-bar {
  display: block;
-  width: 20px;
+  width: 22px;
  height: 2px;
-  background-color: #fff;
+  background-color: #ccc;
  border-radius: 1px;
 }

-.btn-navbar .icon-bar + .icon-bar {
-  margin-top: 3px;
+.navbar-toggle .icon-bar + .icon-bar {
+  margin-top: 4px;
 }

 .navbar .nav > .divider {
@@ -3268,12 +3279,12 @@ button.close {
  background-color: #222222;
 }

-.navbar-inverse .brand {
+.navbar-inverse .navbar-brand {
  color: #999999;
 }

-.navbar-inverse .brand:hover,
-.navbar-inverse .brand:focus {
+.navbar-inverse .navbar-brand:hover,
+.navbar-inverse .navbar-brand:focus {
  color: #ffffff;
  background-color: transparent;
 }
@@ -3299,8 +3310,24 @@ button.close {
  background-color: #080808;
 }

-.navbar-inverse .btn-navbar {
-  background-color: #444;
+.navbar-inverse .nav > .disabled > a,
+.navbar-inverse .nav > .disabled > a:hover,
+.navbar-inverse .nav > .disabled > a:focus {
+  color: #444444;
+  background-color: transparent;
+}
+
+.navbar-inverse .navbar-toggle {
+  border-color: #333;
+}
+
+.navbar-inverse .navbar-toggle:hover,
+.navbar-inverse .navbar-toggle:focus {
+  background-color: #333;
+}
+
+.navbar-inverse .navbar-toggle .icon-bar {
+  background-color: #fff;
 }

 .navbar-inverse .nav > .divider {
@@ -3337,11 +3364,11 @@ button.close {
    padding-top: 0;
    padding-bottom: 0;
  }
-  .navbar .brand {
+  .navbar-brand {
    float: left;
    padding-top: 15px;
    padding-bottom: 15px;
-    margin-left: -15px;
+    margin-left: -10px;
  }
  .navbar .nav {
    float: left;
@@ -3371,20 +3398,10 @@ button.close {
  .navbar-inverse .nav > .divider {
    border-right-color: #2f2f2f;
  }
-  .navbar-fixed-top,
-  .navbar-fixed-bottom {
-    position: fixed;
-    right: 0;
-    left: 0;
-    z-index: 1030;
-  }
-  .navbar-fixed-top {
-    top: 0;
-  }
-  .navbar-fixed-bottom {
-    bottom: 0;
-  }
-  .navbar .btn-navbar {
+  .navbar-toggle {
+    position: relative;
+    top: auto;
+    left: auto;
    display: none;
  }
  .nav-collapse.collapse {
@@ -3465,9 +3482,19 @@ button.close {
 }

 .btn-group > .btn {
+  position: relative;
  float: left;
 }

+.btn-group > .btn + btn {
+  margin-left: -1px;
+}
+
+.btn-group > .btn:hover,
+.btn-group > .btn:active {
+  z-index: 2;
+}
+
 .btn-toolbar:before,
 .btn-toolbar:after {
  display: table;
@@ -3494,10 +3521,6 @@ button.close {
  border-radius: 0;
 }

-.btn-group > .btn + .btn {
-  margin-left: 1px;
-}
-
 .btn-group > .btn:first-child {
  margin-left: 0;
  border-bottom-left-radius: 4px;
@@ -3564,28 +3587,28 @@ button.close {
  display: block;
  float: none;
  max-width: 100%;
-  border-radius: 0;
-}
-
-.btn-group-vertical > .btn + .btn {
-  margin-top: 1px;
-  margin-left: 0;
 }

 .btn-group-vertical .btn:first-child {
-  border-radius: 4px 4px 0 0;
+  border-radius: 0;
+  border-top-right-radius: 4px;
+  border-top-left-radius: 4px;
 }

 .btn-group-vertical .btn:last-child {
-  border-radius: 0 0 4px 4px;
+  border-radius: 0;
+  border-bottom-right-radius: 4px;
+  border-bottom-left-radius: 4px;
 }

 .btn-group-vertical .btn-large:first-child {
-  border-radius: 6px 6px 0 0;
+  border-top-right-radius: 6px;
+  border-top-left-radius: 6px;
 }

 .btn-group-vertical .btn-large:last-child {
-  border-radius: 0 0 6px 6px;
+  border-bottom-right-radius: 6px;
+  border-bottom-left-radius: 6px;
 }

 .btn-group-justified {
@@ -3663,7 +3686,7 @@ button.close {
 .pagination > .disabled > a:focus {
  color: #999999;
  cursor: default;
-  background-color: transparent;
+  background-color: #ffffff;
 }

 .pagination > li:first-child > a,
@@ -3844,6 +3867,7 @@ button.close {

 .modal-backdrop.fade {
  opacity: 0;
+  filter: alpha(opacity=0);
 }

 .modal-backdrop.fade.in {
@@ -4268,7 +4292,59 @@ a.thumbnail:focus {
  list-style: none;
 }

-.counter {
+.label {
+  padding: .25em .6em;
+  font-size: 75%;
+  font-weight: 500;
+  line-height: 1;
+  color: #fff;
+  text-align: center;
+  white-space: nowrap;
+  vertical-align: middle;
+  background-color: #999999;
+  border-radius: .25em;
+}
+
+a.label:hover,
+a.label:focus {
+  color: #fff;
+  text-decoration: none;
+  cursor: pointer;
+}
+
+.label-danger {
+  background-color: #d9534f;
+}
+
+.label-danger[href] {
+  background-color: #c9302c;
+}
+
+.label-warning {
+  background-color: #f0ad4e;
+}
+
+.label-warning[href] {
+  background-color: #ec971f;
+}
+
+.label-success {
+  background-color: #5cb85c;
+}
+
+.label-success[href] {
+  background-color: #449d44;
+}
+
+.label-info {
+  background-color: #5bc0de;
+}
+
+.label-info[href] {
+  background-color: #31b0d5;
+}
+
+.badge {
  display: inline-block;
  min-width: 10px;
  padding: 3px 7px;
@@ -4283,33 +4359,33 @@ a.thumbnail:focus {
  border-radius: 10px;
 }

-.counter:empty {
+.badge:empty {
  display: none;
 }

-a.counter:hover,
-a.counter:focus {
+a.badge:hover,
+a.badge:focus {
  color: #fff;
  text-decoration: none;
  cursor: pointer;
 }

-.btn .counter {
+.btn .badge {
  position: relative;
  top: -1px;
 }

-.btn-mini .counter {
+.btn-mini .badge {
  top: 0;
 }

-.nav-list > .active > a > .counter,
-.nav-pills > .active > a > .counter {
+.nav-list > .active > a > .badge,
+.nav-pills > .active > a > .badge {
  color: #428bca;
  background-color: #fff;
 }

-.nav-pills > li > a > .counter {
+.nav-pills > li > a > .badge {
  margin-left: 3px;
 }


--- a/docs/assets/css/docs.css
+++ b/docs/assets/css/docs.css
@@ -9,13 +9,14 @@
 -------------------------------------------------- */

 body {
+  padding-top: 54px;
  position: relative; /* For scrollyspy */
  /* We add the padding to the body for >768px only */
 }

 /*  */
-body > .container,
-.footer .container {
+.bs-docs-body > .container,
+.bs-docs-footer .container {
  padding-left:  15px;
  padding-right: 15px;
 }
@@ -41,6 +42,22 @@ section > ul li {



+/* Navbar
+-------------------------------------------------- */
+
+.bs-docs-navbar {
+  background-color: #fff;
+  border-bottom: 1px solid #ccc; /* IE8 */
+  border-bottom: 1px solid rgba(0,0,0,.1);
+}
+.bs-docs-navbar .nav > .active > a,
+.bs-docs-navbar .nav > .active > a:hover {
+  font-weight: 500;
+  background-color: transparent;
+}
+
+
+
 /* Jumbotrons
 -------------------------------------------------- */

@@ -106,23 +123,23 @@ section > ul li {
 /* Marketing section of Overview
 -------------------------------------------------- */

-.marketing {
+.bs-docs-marketing {
  text-align: center;
  color: #5a5a5a;
 }
-.marketing h1 {
+.bs-docs-marketing h1 {
  margin: 60px 0 10px;
  font-size: 50px;
  line-height: 1;
 }
-.marketing h2 {
+.bs-docs-marketing h2 {
  margin-bottom: 5px;
 }
-.marketing p {
+.bs-docs-marketing p {
  font-size: 16px;
  line-height: 1.4;
 }
-.marketing .marketing-byline {
+.bs-docs-marketing .marketing-byline {
  margin-bottom: 40px;
  font-size: 21px;
  font-weight: 300;
@@ -242,6 +259,31 @@ section > ul li {
  margin-bottom: 0;
 }

+/* Typography */
+.bs-docs-example-type .table td {
+  color: #999;
+  vertical-align: middle;
+  border-color: ;
+}
+.bs-docs-example-type .table td,
+.bs-docs-example-type .table th {
+  padding: 15px 0;
+  border-color: #eee;
+}
+.bs-docs-example-type .table tr:first-child td,
+.bs-docs-example-type .table tr:first-child th {
+  border-top: 0;
+}
+.bs-docs-example-type h1,
+.bs-docs-example-type h2,
+.bs-docs-example-type h3,
+.bs-docs-example-type h4,
+.bs-docs-example-type h5,
+.bs-docs-example-type h6 {
+  margin: 0;
+}
+
+
 /* Navbar examples */
 .bs-navbar-top-example,
 .bs-navbar-bottom-example {
@@ -310,6 +352,11 @@ section > ul li {
  margin-left: 20px;
 }

+/* Example tabbable tabs */
+.bs-docs-example-tabs .nav-tabs {
+  margin-bottom: 15px;
+}
+

 /* Example templates
 -------------------------------------------------- */
@@ -436,13 +483,13 @@ section > ul li {
 /* Footer
 -------------------------------------------------- */

-.footer {
+.bs-docs-footer {
  text-align: center;
  padding: 30px 0;
  margin-top: 100px;
  border-top: 1px solid #e5e5e5;
 }
-.footer p {
+.bs-docs-footer p {
  margin-bottom: 0;
  color: #777;
 }
@@ -545,6 +592,16 @@ input.focused {
 /* Responsive variations
 -------------------------------------------------- */

+/* Hide code snippets on mobile devices */
+@media screen and (max-width: 480px) {
+  .bs-docs-example {
+    border-radius: 4px;
+  }
+  .highlight {
+    display: none;
+  }
+}
+
 /* Tablets and up */
 @media screen and (min-width: 768px) {


--- a/docs/assets/img/examples/bootstrap-example-navbar-fixed-top.png
+++ b/docs/assets/img/examples/bootstrap-example-navbar-fixed-top.png
--- a/docs/assets/img/examples/bootstrap-example-navbar-static-top.png
+++ b/docs/assets/img/examples/bootstrap-example-navbar-static-top.png
--- a/docs/assets/img/examples/bootstrap-example-navbar.png
+++ b/docs/assets/img/examples/bootstrap-example-navbar.png
--- a/docs/assets/js/application.js
+++ b/docs/assets/js/application.js
@@ -34,8 +34,8 @@
    })

    // add tipsies to grid for scaffolding
-    if ($('#gridSystem').length) {
-      $('#gridSystem').tooltip({
+    if ($('#grid-system').length) {
+      $('#grid-system').tooltip({
          selector: '.show-grid > [class*="span"]'
        , title: function () { return $(this).width() + 'px' }
      })

--- a/docs/assets/js/bootstrap-carousel.js
+++ b/docs/assets/js/bootstrap-carousel.js
@@ -75,7 +75,7 @@
      if (!e) this.paused = true
      if (this.$element.find('.next, .prev').length && $.support.transition.end) {
        this.$element.trigger($.support.transition.end)
-        this.cycle()
+        this.cycle(true)
      }
      clearInterval(this.interval)
      this.interval = null

--- a/docs/assets/js/bootstrap-dropdown.js
+++ b/docs/assets/js/bootstrap-dropdown.js
@@ -158,7 +158,7 @@
  $(document)
    .on('click.dropdown.data-api', clearMenus)
    .on('click.dropdown.data-api', '.dropdown form', function (e) { e.stopPropagation() })
-    .on('.dropdown-menu', function (e) { e.stopPropagation() })
+    .on('click.dropdown-menu', function (e) { e.stopPropagation() })
    .on('click.dropdown.data-api'  , toggle, Dropdown.prototype.toggle)
    .on('keydown.dropdown.data-api', toggle + ', [role=menu]' , Dropdown.prototype.keydown)


--- a/docs/assets/js/bootstrap-modal.js
+++ b/docs/assets/js/bootstrap-modal.js
@@ -148,7 +148,7 @@
      }

    , removeBackdrop: function () {
-        this.$backdrop.remove()
+        this.$backdrop && this.$backdrop.remove()
        this.$backdrop = null
      }


--- a/docs/assets/js/bootstrap-tooltip.js
+++ b/docs/assets/js/bootstrap-tooltip.js
@@ -80,7 +80,15 @@
    }

  , enter: function (e) {
-      var self = $(e.currentTarget)[this.type](this._options).data(this.type)
+      var defaults = $.fn[this.type].defaults
+        , options = {}
+        , self
+
+      this._options && $.each(this._options, function (key, value) {
+        if (defaults[key] != value) options[key] = value
+      }, this)
+
+      self = $(e.currentTarget)[this.type](options).data(this.type)

      if (!self.options.delay || !self.options.delay.show) return self.show()


--- a/docs/assets/js/bootstrap.js
+++ b/docs/assets/js/bootstrap.js
@@ -336,7 +336,7 @@
      if (!e) this.paused = true
      if (this.$element.find('.next, .prev').length && $.support.transition.end) {
        this.$element.trigger($.support.transition.end)
-        this.cycle()
+        this.cycle(true)
      }
      clearInterval(this.interval)
      this.interval = null
@@ -791,7 +791,7 @@
  $(document)
    .on('click.dropdown.data-api', clearMenus)
    .on('click.dropdown.data-api', '.dropdown form', function (e) { e.stopPropagation() })
-    .on('.dropdown-menu', function (e) { e.stopPropagation() })
+    .on('click.dropdown-menu', function (e) { e.stopPropagation() })
    .on('click.dropdown.data-api'  , toggle, Dropdown.prototype.toggle)
    .on('keydown.dropdown.data-api', toggle + ', [role=menu]' , Dropdown.prototype.keydown)

@@ -946,7 +946,7 @@
      }

    , removeBackdrop: function () {
-        this.$backdrop.remove()
+        this.$backdrop && this.$backdrop.remove()
        this.$backdrop = null
      }

@@ -1129,7 +1129,15 @@
    }

  , enter: function (e) {
-      var self = $(e.currentTarget)[this.type](this._options).data(this.type)
+      var defaults = $.fn[this.type].defaults
+        , options = {}
+        , self
+
+      this._options && $.each(this._options, function (key, value) {
+        if (defaults[key] != value) options[key] = value
+      }, this)
+
+      self = $(e.currentTarget)[this.type](options).data(this.type)

      if (!self.options.delay || !self.options.delay.show) return self.show()


--- a/docs/assets/js/bootstrap.min.js
+++ b/docs/assets/js/bootstrap.min.js
--- a/docs/components.html
+++ b/docs/components.html
@@ -28,7 +28,8 @@ title: Components
          <li><a href="#navbar"><i class="glyphicon glyphicon-chevron-right"></i> Navbar</a></li>
          <li><a href="#breadcrumbs"><i class="glyphicon glyphicon-chevron-right"></i> Breadcrumbs</a></li>
          <li><a href="#pagination"><i class="glyphicon glyphicon-chevron-right"></i> Pagination</a></li>
-          <li><a href="#counters"><i class="glyphicon glyphicon-chevron-right"></i> Counters</a></li>
+          <li><a href="#labels"><i class="glyphicon glyphicon-chevron-right"></i> Labels</a></li>
+          <li><a href="#badges"><i class="glyphicon glyphicon-chevron-right"></i> Badges</a></li>
          <li><a href="#typography"><i class="glyphicon glyphicon-chevron-right"></i> Typography</a></li>
          <li><a href="#thumbnails"><i class="glyphicon glyphicon-chevron-right"></i> Thumbnails</a></li>
          <li><a href="#alerts"><i class="glyphicon glyphicon-chevron-right"></i> Alerts</a></li>
@@ -765,7 +766,7 @@ title: Components
          <p>To start, navbars are static (not fixed to the top) and include support for a project name and basic navigation. Place one anywhere within a <code>.container</code>, which sets the width of your site and content.</p>
          <div class="bs-docs-example">
            <div class="navbar">
-              <a class="brand" href="#">Title</a>
+              <a class="navbar-brand" href="#">Title</a>
              <ul class="nav">
                <li class="active"><a href="#">Home</a></li>
                <li><a href="#">Link</a></li>
@@ -775,7 +776,7 @@ title: Components
          </div><!-- /example -->
 {% highlight html linenos %}
 <div class="navbar">
-  <a class="brand" href="#">Title</a>
+  <a class="navbar-brand" href="#">Title</a>
  <ul class="nav">
    <li class="active"><a href="#">Home</a></li>
    <li><a href="#">Link</a></li>
@@ -790,11 +791,11 @@ title: Components
          <p>A simple link to show your brand or project name only requires an anchor tag.</p>
          <div class="bs-docs-example">
            <div class="navbar">
-              <a class="brand" href="#">Title</a>
+              <a class="navbar-brand" href="#">Title</a>
            </div>
          </div><!-- /example -->
 {% highlight html linenos %}
-<a class="brand" href="#">Title</a>
+<a class="navbar-brand" href="#">Title</a>
 {% endhighlight %}

          <h3>Nav links</h3>
@@ -804,7 +805,7 @@ title: Components
              <ul class="nav">
                <li class="active"><a href="#">Home</a></li>
                <li><a href="#">Link</a></li>
-                <li><a href="#">Link</a></li>
+                <li class="disabled"><a href="#">Disabled</a></li>
              </ul>
            </div>
          </div><!-- /example -->
@@ -812,22 +813,20 @@ title: Components
 <ul class="nav">
  <li class="active"><a href="#">Home</a></li>
  <li><a href="#">Link</a></li>
-  <li><a href="#">Link</a></li>
+  <li class="disabled"><a href="#">Disabled</a></li>
 </ul>
 {% endhighlight %}
          <p>You can easily add dividers to your nav links with an empty list item and a simple class. Just add the appropriate class to <code>&lt;li&gt;</code> elements between links. Dividers will be horizontal to start, but at resolutions above 768px they become vertical with the navigation.</p>
          <div class="bs-docs-example">
            <div class="navbar">
-              <div class="navbar-inner">
-                <ul class="nav">
-                  <li class="active"><a href="#">Home</a></li>
-                  <li class="divider"></li>
-                  <li><a href="#">Link</a></li>
-                  <li class="divider"></li>
-                  <li><a href="#">Link</a></li>
-                  <li class="divider"></li>
-                </ul>
-              </div>
+              <ul class="nav">
+                <li class="active"><a href="#">Home</a></li>
+                <li class="divider"></li>
+                <li><a href="#">Link</a></li>
+                <li class="divider"></li>
+                <li><a href="#">Link</a></li>
+                <li class="divider"></li>
+              </ul>
            </div>
          </div><!-- /example -->
 {% highlight html linenos %}
@@ -871,9 +870,9 @@ title: Components
          <h3>Fixed to top</h3>
          <p>Add <code>.navbar-fixed-top</code> and remember to account for the hidden area underneath it by adding at least 40px <code>padding</code> to the <code>&lt;body&gt;</code>. Be sure to add this after the core Bootstrap CSS and before the optional responsive CSS.</p>
          <div class="bs-docs-example bs-navbar-top-example">
-            <div class="navbar navbar-fixed-top" style="position: absolute;">
+            <div class="navbar navbar-fixed-top" style="position: absolute; top: -1px;">
              <div class="container" style="width: auto;">
-                <a class="brand" href="#">Title</a>
+                <a class="navbar-brand" href="#">Title</a>
                <ul class="nav">
                  <li class="active"><a href="#">Home</a></li>
                  <li><a href="#">Link</a></li>
@@ -891,9 +890,9 @@ title: Components
          <h3>Fixed to bottom</h3>
          <p>Add <code>.navbar-fixed-bottom</code> instead.</p>
          <div class="bs-docs-example bs-navbar-bottom-example">
-            <div class="navbar navbar-fixed-bottom" style="position: absolute;">
+            <div class="navbar navbar-fixed-bottom" style="position: absolute; bottom: -1px;">
              <div class="container" style="width: auto;">
-                <a class="brand" href="#">Title</a>
+                <a class="navbar-brand" href="#">Title</a>
                <ul class="nav">
                  <li class="active"><a href="#">Home</a></li>
                  <li><a href="#">Link</a></li>
@@ -913,7 +912,7 @@ title: Components
          <div class="bs-docs-example bs-navbar-top-example">
            <div class="navbar navbar-static-top" style="margin: -1px -1px 0;">
              <div class="container" style="width: auto;">
-                <a class="brand" href="#">Title</a>
+                <a class="navbar-brand" href="#">Title</a>
                <ul class="nav">
                  <li class="active"><a href="#">Home</a></li>
                  <li><a href="#">Link</a></li>
@@ -930,16 +929,16 @@ title: Components


          <h2>Responsive navbar</h2>
-          <p>To implement a collapsing responsive navbar, wrap your navbar content in a containing div, <code>.nav-collapse.collapse</code>, and add the navbar toggle button, <code>.btn-navbar</code>.</p>
+          <p>To implement a collapsing responsive navbar, wrap your navbar content in a containing div, <code>.nav-collapse.collapse</code>, and add the navbar toggle button, <code>.navbar-toggle</code>.</p>
          <div class="bs-docs-example">
            <div class="navbar">
              <div class="container">
-                <a class="btn btn-navbar" data-toggle="collapse" data-target=".navbar-responsive-collapse">
+                <a class="navbar-toggle" data-toggle="collapse" data-target=".navbar-responsive-collapse">
                  <span class="icon-bar"></span>
                  <span class="icon-bar"></span>
                  <span class="icon-bar"></span>
                </a>
-                <a class="brand" href="#">Title</a>
+                <a class="navbar-brand" href="#">Title</a>
                <div class="nav-collapse collapse navbar-responsive-collapse">
                  <ul class="nav">
                    <li class="active"><a href="#">Home</a></li>
@@ -958,8 +957,8 @@ title: Components
                      </ul>
                    </li>
                  </ul>
-                  <form class="navbar-search pull-left" action="">
-                    <input type="text" class="search-query span2" placeholder="Search">
+                  <form class="navbar-form pull-left" action="">
+                    <input type="text" class="span8" placeholder="Search">
                  </form>
                  <ul class="nav pull-right">
                    <li><a href="#">Link</a></li>
@@ -983,15 +982,15 @@ title: Components
 <div class="navbar">
  <div class="container">

-    <!-- .btn-navbar is used as the toggle for collapsed navbar content -->
-    <a class="btn btn-navbar" data-toggle="collapse" data-target=".navbar-responsive-collapse">
+    <!-- .navbar-toggle is used as the toggle for collapsed navbar content -->
+    <a class="navbar-toggle" data-toggle="collapse" data-target=".navbar-responsive-collapse">
      <span class="icon-bar"></span>
      <span class="icon-bar"></span>
      <span class="icon-bar"></span>
    </a>

    <!-- Be sure to leave the brand out there if you want it shown -->
-    <a class="brand" href="#">Title</a>
+    <a class="navbar-brand" href="#">Title</a>

    <!-- Place everything within .navbar-collapse to hide it until above 768px -->
    <div class="nav-collapse collapse navbar-responsive-collapse">
@@ -1011,12 +1010,12 @@ title: Components
          <div class="bs-docs-example">
            <div class="navbar navbar-inverse" style="position: static;">
              <div class="container">
-                <a class="btn btn-navbar" data-toggle="collapse" data-target=".navbar-inverse-collapse">
+                <a class="navbar-toggle" data-toggle="collapse" data-target=".navbar-inverse-collapse">
                  <span class="icon-bar"></span>
                  <span class="icon-bar"></span>
                  <span class="icon-bar"></span>
                </a>
-                <a class="brand" href="#">Title</a>
+                <a class="navbar-brand" href="#">Title</a>
                <div class="nav-collapse collapse navbar-inverse-collapse">
                  <ul class="nav">
                    <li class="active"><a href="#">Home</a></li>
@@ -1035,8 +1034,8 @@ title: Components
                      </ul>
                    </li>
                  </ul>
-                  <form class="navbar-search pull-left" action="">
-                    <input type="text" class="search-query span2" placeholder="Search">
+                  <form class="navbar-form pull-left" action="">
+                    <input type="text" class="span8" placeholder="Search">
                  </form>
                  <ul class="nav pull-right">
                    <li><a href="#">Link</a></li>
@@ -1274,44 +1273,122 @@ title: Components



-        <!-- Counters
+        <!-- Labels
+        ================================================== -->
+        <section id="labels">
+          <div class="page-header">
+            <h1>Labels</h1>
+          </div>
+          <p class="lead"></p>
+
+          <h3>Example</h3>
+          <div class="bs-docs-example">
+            <h1>Example heading <span class="label">New</span></h1>
+            <h2>Example heading <span class="label">New</span></h2>
+            <h3>Example heading <span class="label">New</span></h3>
+            <h4>Example heading <span class="label">New</span></h4>
+            <h5>Example heading <span class="label">New</span></h5>
+            <h6>Example heading <span class="label">New</span></h6>
+          </div>
+{% highlight html linenos %}
+<h3>Example heading <span class="label">New</span></h3>
+{% endhighlight %}
+
+          <h3>Available variations</h3>
+          <p>Add any of the below mentioned modifier classes to change the appearance of a label.</p>
+          <table class="table table-bordered table-striped">
+            <thead>
+              <tr>
+                <th>Labels</th>
+                <th>Markup</th>
+              </tr>
+            </thead>
+            <tbody>
+              <tr>
+                <td>
+                  <span class="label">Default</span>
+                </td>
+                <td>
+                  <code>&lt;span class="label"&gt;Default&lt;/span&gt;</code>
+                </td>
+              </tr>
+              <tr>
+                <td>
+                  <span class="label label-success">Success</span>
+                </td>
+                <td>
+                  <code>&lt;span class="label label-success"&gt;Success&lt;/span&gt;</code>
+                </td>
+              </tr>
+              <tr>
+                <td>
+                  <span class="label label-warning">Warning</span>
+                </td>
+                <td>
+                  <code>&lt;span class="label label-warning"&gt;Warning&lt;/span&gt;</code>
+                </td>
+              </tr>
+              <tr>
+                <td>
+                  <span class="label label-danger">Danger</span>
+                </td>
+                <td>
+                  <code>&lt;span class="label label-danger"&gt;Danger&lt;/span&gt;</code>
+                </td>
+              </tr>
+              <tr>
+                <td>
+                  <span class="label label-info">Info</span>
+                </td>
+                <td>
+                  <code>&lt;span class="label label-info"&gt;Info&lt;/span&gt;</code>
+                </td>
+              </tr>
+            </tbody>
+          </table>
+
+        </section>
+
+
+
+        <!-- Badges
        ================================================== -->
-        <section id="counters">
+        <section id="badges">
          <div class="page-header">
-            <h1>Counters</h1>
+            <h1>Badges</h1>
          </div>
-          <p class="lead">Easily highlight new or unread items by adding a <code>&lt;span class="counter"&gt;</code> to links, Bootstrap navs, and more.</p>
+          <p class="lead">Easily highlight new or unread items by adding a <code>&lt;span class="badge"&gt;</code> to links, Bootstrap navs, and more.</p>

          <div class="bs-docs-example">
-            <a href="#">Inbox <span class="counter">42</span></a>
+            <a href="#">Inbox <span class="badge">42</span></a>
          </div>
 {% highlight html linenos %}
-<a href="#">Inbox <span class="counter">42</span></a>
+<a href="#">Inbox <span class="badge">42</span></a>
 {% endhighlight %}

          <h4>Self collapsing</h4>
-          <p>When there are no new or unread items, counters will simply collapse (via CSS's <code>:empty</code> selector) provided no content exists within.</p>
+          <p>When there are no new or unread items, badges will simply collapse (via CSS's <code>:empty</code> selector) provided no content exists within.</p>

          <h4>Adapts to active nav states</h4>
-          <p>Built-in styles are included for placing counters in active states in pill and list navigations.</p>
+          <p>Built-in styles are included for placing badges in active states in pill and list navigations.</p>
          <div class="bs-docs-example">
            <ul class="nav nav-pills">
-              <li class="active"><a href="#">Home <span class="counter">42</span></a></li>
+              <li class="active"><a href="#">Home <span class="badge">42</span></a></li>
              <li><a href="#">Profile</a></li>
-              <li><a href="#">Messages <span class="counter">3</span></a></li>
+              <li><a href="#">Messages <span class="badge">3</span></a></li>
            </ul>
            <br>
            <ul class="nav nav-list" style="max-width: 260px;">
              <li class="active">
                <a href="#">
-                  <span class="counter pull-right">42</span>
+                  <span class="badge pull-right">42</span>
                  Home
                </a>
              </li>
              <li><a href="#">Profile</a></li>
              <li>
                <a href="#">
-                  <span class="counter pull-right">3</span>
+                  <span class="badge pull-right">3</span>
                  Messages
                </a>
              </li>
@@ -1321,7 +1398,7 @@ title: Components
 <ul class="nav nav-list">
  <li class="active">
    <a href="#">
-      <span class="counter pull-right">42</span>
+      <span class="badge pull-right">42</span>
      Home
    </a>
  </li>
@@ -1380,7 +1457,7 @@ title: Components
          <div class="page-header">
            <h1>Thumbnails</h1>
          </div>
-          <p class="lead">Extend Bootstrap's <a href="./css.html#gridSystem">grid system</a> with the thumbnail component to easily display grids of images, videos, text, and more.</p>
+          <p class="lead">Extend Bootstrap's <a href="./css/#gridsystem">grid system</a> with the thumbnail component to easily display grids of images, videos, text, and more.</p>

          <h3>Default thumbnails</h3>
          <p>By default, Bootstrap's thumbnails are designed to showcase linked images with minimal required markup.</p>