diff --git a/README.md b/README.md
index f6f1b54633a95fdce8dcd33a11240e6fc279329e..d9850fda0860ab3a0e628da29e04a06b858f80b0 100644
--- a/README.md
+++ b/README.md
@@ -92,7 +92,7 @@ $ npm install recess connect uglify-js jshint -g
Runs the recess compiler to rebuild the `/less` files and compiles the docs pages. Requires recess and uglify-js. <a href="http://twitter.github.com/bootstrap/less.html#compiling">Read more in our docs »</a>
+ **test** - `make test`
-Runs jshint and qunit tests headlessly in [phatomjs] (http://code.google.com/p/phantomjs/) (used for ci). Depends on having phantomjs installed.
+Runs jshint and qunit tests headlessly in [phantomjs](http://code.google.com/p/phantomjs/) (used for ci). Depends on having phantomjs installed.
+ **watch** - `make watch`
This is a convenience method for watching just Less files and automatically building them whenever you save. Requires the Watchr gem.
diff --git a/docs/assets/css/bootstrap-responsive.css b/docs/assets/css/bootstrap-responsive.css
index daafa9180839e91a5f5a5e96cd560d45c4ac50b4..3b0efb1aca605167a40555897d54c8fd31273590 100644
--- a/docs/assets/css/bootstrap-responsive.css
+++ b/docs/assets/css/bootstrap-responsive.css
@@ -1,5 +1,5 @@
/*!
- * Bootstrap Responsive v2.1.0
+ * Bootstrap Responsive v2.1.1
*
* Copyright 2012 Twitter, Inc
* Licensed under the Apache License v2.0
@@ -944,14 +944,14 @@
display: none;
}
.nav-collapse .nav .nav-header {
- color: #555555;
+ color: #777777;
text-shadow: none;
}
.nav-collapse .nav > li > a,
.nav-collapse .dropdown-menu a {
padding: 9px 15px;
font-weight: bold;
- color: #555555;
+ color: #777777;
-webkit-border-radius: 3px;
-moz-border-radius: 3px;
border-radius: 3px;
@@ -1003,6 +1003,10 @@
.nav-collapse .dropdown-menu .divider {
display: none;
}
+ .nav-collapse .nav > li > .dropdown-menu:before,
+ .nav-collapse .nav > li > .dropdown-menu:after {
+ display: none;
+ }
.nav-collapse .navbar-form,
.nav-collapse .navbar-search {
float: none;
@@ -1014,6 +1018,11 @@
-moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.1);
box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.1);
}
+ .navbar-inverse .nav-collapse .navbar-form,
+ .navbar-inverse .nav-collapse .navbar-search {
+ border-top-color: #111111;
+ border-bottom-color: #111111;
+ }
.navbar .nav-collapse .nav.pull-right {
float: none;
margin-left: 0;
diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index 0664207aeebb76899b248184a65d9ca64b383aa6..7155dc4a63ef754773079991e9f7e5cb36750f51 100644
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@ -1,5 +1,5 @@
/*!
- * Bootstrap v2.1.0
+ * Bootstrap v2.1.1
*
* Copyright 2012 Twitter, Inc
* Licensed under the Apache License v2.0
@@ -1301,14 +1301,17 @@ input[type="checkbox"][readonly] {
.control-group.warning select,
.control-group.warning textarea {
color: #c09853;
+}
+
+.control-group.warning input,
+.control-group.warning select,
+.control-group.warning textarea {
border-color: #c09853;
-webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
-moz-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 .checkbox:focus,
-.control-group.warning .radio:focus,
.control-group.warning input:focus,
.control-group.warning select:focus,
.control-group.warning textarea:focus {
@@ -1337,14 +1340,17 @@ input[type="checkbox"][readonly] {
.control-group.error select,
.control-group.error textarea {
color: #b94a48;
+}
+
+.control-group.error input,
+.control-group.error select,
+.control-group.error textarea {
border-color: #b94a48;
-webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
-moz-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 .checkbox:focus,
-.control-group.error .radio:focus,
.control-group.error input:focus,
.control-group.error select:focus,
.control-group.error textarea:focus {
@@ -1373,14 +1379,17 @@ input[type="checkbox"][readonly] {
.control-group.success select,
.control-group.success textarea {
color: #468847;
+}
+
+.control-group.success input,
+.control-group.success select,
+.control-group.success textarea {
border-color: #468847;
-webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
-moz-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 .checkbox:focus,
-.control-group.success .radio:focus,
.control-group.success input:focus,
.control-group.success select:focus,
.control-group.success textarea:focus {
@@ -1397,6 +1406,45 @@ input[type="checkbox"][readonly] {
border-color: #468847;
}
+.control-group.info > 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);
+ -moz-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;
+ -moz-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:required:invalid,
textarea:focus:required:invalid,
select:focus:required:invalid {
@@ -1503,7 +1551,6 @@ select:focus:required:invalid:focus {
.input-prepend .add-on,
.input-append .btn,
.input-prepend .btn {
- margin-left: -1px;
vertical-align: top;
-webkit-border-radius: 0;
-moz-border-radius: 0;
@@ -1536,6 +1583,11 @@ select:focus:required:invalid:focus {
border-radius: 3px 0 0 3px;
}
+.input-append .add-on,
+.input-append .btn {
+ margin-left: -1px;
+}
+
.input-append .add-on:last-child,
.input-append .btn:last-child {
-webkit-border-radius: 0 3px 3px 0;
@@ -2025,6 +2077,10 @@ table .span24 {
background-color: #f2dede;
}
+.table tbody tr.warning td {
+ background-color: #fcf8e3;
+}
+
.table tbody tr.info td {
background-color: #d9edf7;
}
@@ -2046,8 +2102,14 @@ table .span24 {
/* White icons with optional class, or on hover/active states of certain elements */
.icon-white,
-.nav > .active > a > [class^="icon-"],
-.nav > .active > a > [class*=" icon-"],
+.nav-tabs > .active > a > [class^="icon-"],
+.nav-tabs > .active > a > [class*=" icon-"],
+.nav-pills > .active > a > [class^="icon-"],
+.nav-pills > .active > a > [class*=" icon-"],
+.nav-list > .active > a > [class^="icon-"],
+.nav-list > .active > a > [class*=" icon-"],
+.navbar-inverse .nav > .active > a > [class^="icon-"],
+.navbar-inverse .nav > .active > a > [class*=" icon-"],
.dropdown-menu > li > a:hover > [class^="icon-"],
.dropdown-menu > li > a:hover > [class*=" icon-"],
.dropdown-menu > .active > a > [class^="icon-"],
@@ -2759,7 +2821,7 @@ table .span24 {
.navbar-fixed-bottom .dropdown .caret {
border-top: 0;
border-bottom: 4px solid #000000;
- content: "\2191";
+ content: "";
}
.dropup .dropdown-menu,
@@ -2783,7 +2845,7 @@ table .span24 {
border-radius: 0 6px 6px 6px;
}
-.dropdown-submenu:hover .dropdown-menu {
+.dropdown-submenu:hover > .dropdown-menu {
display: block;
}
@@ -2866,7 +2928,6 @@ table .span24 {
position: relative;
height: 0;
overflow: hidden;
- overflow: visible \9;
-webkit-transition: height 0.35s ease;
-moz-transition: height 0.35s ease;
-o-transition: height 0.35s ease;
@@ -3030,7 +3091,7 @@ button.close {
.btn-mini {
padding: 2px 6px;
font-size: 11px;
- line-height: 16px;
+ line-height: 17px;
}
.btn-block {
@@ -4018,7 +4079,7 @@ input[type="submit"].btn.btn-mini {
*z-index: 2;
margin-bottom: 20px;
overflow: visible;
- color: #555555;
+ color: #777777;
}
.navbar-inner {
@@ -4057,7 +4118,7 @@ input[type="submit"].btn.btn-mini {
margin-left: -20px;
font-size: 20px;
font-weight: 200;
- color: #555555;
+ color: #777777;
text-shadow: 0 1px 0 #ffffff;
}
@@ -4071,7 +4132,7 @@ input[type="submit"].btn.btn-mini {
}
.navbar-link {
- color: #555555;
+ color: #777777;
}
.navbar-link:hover {
@@ -4233,6 +4294,7 @@ input[type="submit"].btn.btn-mini {
.navbar .nav.pull-right {
float: right;
+ margin-right: 0;
}
.navbar .nav > li {
@@ -4242,7 +4304,7 @@ input[type="submit"].btn.btn-mini {
.navbar .nav > li > a {
float: none;
padding: 10px 15px 10px;
- color: #555555;
+ color: #777777;
text-decoration: none;
text-shadow: 0 1px 0 #ffffff;
}
@@ -4372,8 +4434,8 @@ input[type="submit"].btn.btn-mini {
}
.navbar .nav li.dropdown > .dropdown-toggle .caret {
- border-top-color: #555555;
- border-bottom-color: #555555;
+ border-top-color: #777777;
+ border-bottom-color: #777777;
}
.navbar .nav li.dropdown.open > .dropdown-toggle .caret,
@@ -4679,7 +4741,8 @@ input[type="submit"].btn.btn-mini {
display: inline;
}
-.pager a {
+.pager a,
+.pager span {
display: inline-block;
padding: 5px 14px;
background-color: #fff;
@@ -4694,7 +4757,8 @@ input[type="submit"].btn.btn-mini {
background-color: #f5f5f5;
}
-.pager .next a {
+.pager .next a,
+.pager .next span {
float: right;
}
@@ -4703,7 +4767,8 @@ input[type="submit"].btn.btn-mini {
}
.pager .disabled a,
-.pager .disabled a:hover {
+.pager .disabled a:hover,
+.pager .disabled span {
color: #999999;
cursor: default;
background-color: #fff;
@@ -5059,6 +5124,142 @@ input[type="submit"].btn.btn-mini {
border-width: 11px 0 11px 11px;
}
+.popover.dynamic:after {
+ position: relative;
+ display: block;
+}
+
+.popover.dynamic .arrow {
+ width: 0;
+ height: 0;
+ margin: 0;
+ border-color: transparent;
+}
+
+.popover.dynamic.top .arrow {
+ bottom: 0;
+ border-width: 0 0 0 0;
+}
+
+.popover.dynamic.left .arrow {
+ right: 0;
+ border-width: 0 0 0 0;
+}
+
+.popover.dynamic.bottom .arrow {
+ top: 0;
+ border-width: 0 0 0 0;
+}
+
+.popover.dynamic.right .arrow {
+ left: 0;
+ border-width: 0 0 0 0;
+}
+
+.popover.dynamic.top .arrow:before {
+ position: absolute;
+ top: 0;
+ left: -12px;
+ z-index: 10;
+ width: 0;
+ height: 0;
+ border: solid transparent;
+ border-top-color: rgba(0, 0, 0, 0.25);
+ border-width: 12px;
+ content: " ";
+}
+
+.popover.dynamic.top .arrow:after {
+ position: absolute;
+ top: 0;
+ left: -10px;
+ z-index: 10;
+ width: 0;
+ height: 0;
+ border: solid transparent;
+ border-top-color: #ffffff;
+ border-width: 10px;
+ content: " ";
+}
+
+.popover.dynamic.left .arrow:before {
+ position: absolute;
+ top: -12px;
+ left: 0;
+ z-index: 10;
+ width: 0;
+ height: 0;
+ border: solid transparent;
+ border-left-color: rgba(0, 0, 0, 0.25);
+ border-width: 12px;
+ content: " ";
+}
+
+.popover.dynamic.left .arrow:after {
+ position: absolute;
+ top: -10px;
+ left: 0;
+ z-index: 10;
+ width: 0;
+ height: 0;
+ border: solid transparent;
+ border-left-color: #ffffff;
+ border-width: 10px;
+ content: " ";
+}
+
+.popover.dynamic.bottom .arrow:before {
+ position: absolute;
+ top: -24px;
+ right: -12px;
+ z-index: 10;
+ width: 0;
+ height: 0;
+ border: solid transparent;
+ border-bottom-color: rgba(0, 0, 0, 0.25);
+ border-width: 12px;
+ content: " ";
+}
+
+.popover.dynamic.bottom .arrow:after {
+ position: absolute;
+ top: -20px;
+ left: -10px;
+ z-index: 10;
+ width: 0;
+ height: 0;
+ border: solid transparent;
+ border-bottom-color: #ffffff;
+ border-width: 10px;
+ content: " ";
+}
+
+.popover.dynamic.right .arrow:before {
+ position: absolute;
+ top: -12px;
+ right: 0;
+ z-index: 10;
+ width: 0;
+ height: 0;
+ border: solid transparent;
+ border-right-color: rgba(0, 0, 0, 0.25);
+ border-width: 12px;
+ content: " ";
+}
+
+.popover.dynamic.right .arrow:after {
+ position: absolute;
+ top: -10px;
+ left: -20px;
+ z-index: 10;
+ width: 0;
+ height: 0;
+ border: solid transparent;
+ border-right-color: #ffffff;
+ border-width: 10px;
+ content: " ";
+}
+
.thumbnails {
margin-left: -20px;
list-style: none;
diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css
index 66c4a6f04eb69ddd2e6aa18a2e59792e1bfb29ab..4f219a072cf3ad97c694e028c6bc7bf39c835f2d 100644
--- a/docs/assets/css/docs.css
+++ b/docs/assets/css/docs.css
@@ -681,8 +681,134 @@ form.bs-docs-example {
width: 260px;
margin: 20px;
}
-
-
+.bs-docs-example-popover .popover.dynamic:after {
+ position: relative;
+ display: block;
+}
+.bs-docs-example-popover .popover.dynamic .arrow {
+ width: 0;
+ height: 0;
+ margin: 0;
+ border-color: transparent;
+}
+.bs-docs-example-popover .popover.dynamic.top .arrow {
+ bottom: 0;
+ border-width: 0 0 0 0;
+}
+.bs-docs-example-popover .popover.dynamic.left .arrow {
+ right: 0;
+ border-width: 0 0 0 0;
+}
+.bs-docs-example-popover .popover.dynamic.bottom .arrow {
+ top: 0;
+ border-width: 0 0 0 0;
+}
+.bs-docs-example-popover .popover.dynamic.right .arrow {
+ left: 0;
+ border-width: 0 0 0 0;
+}
+.bs-docs-example-popover .popover.dynamic.top .arrow:before {
+ position: absolute;
+ top: 0;
+ left: -11px;
+ z-index: 10;
+ width: 0;
+ height: 0;
+ border: solid transparent;
+ border-top-color: rgba(0, 0, 0, 0.25);
+ border-width: 11px;
+ content: " ";
+}
+.bs-docs-example-popover .popover.dynamic.top .arrow:after {
+ position: absolute;
+ top: 0;
+ left: -10px;
+ z-index: 10;
+ width: 0;
+ height: 0;
+ border: solid transparent;
+ border-top-color: #ffffff;
+ border-width: 10px;
+ content: " ";
+}
+.bs-docs-example-popover .popover.dynamic.left {
+ border: 4px solid #bde1fc;
+}
+.bs-docs-example-popover .popover.dynamic.left .arrow:before {
+ position: absolute;
+ top: -22px;
+ left: 0;
+ z-index: 10;
+ width: 0;
+ height: 0;
+ border: solid transparent;
+ border-left-color: #bde1fc;
+ border-width: 22px;
+ content: " ";
+}
+.bs-docs-example-popover .popover.dynamic.left .arrow:after {
+ position: absolute;
+ top: -15px;
+ left: 0;
+ z-index: 10;
+ width: 0;
+ height: 0;
+ border: solid transparent;
+ border-left-color: #ffffff;
+ border-width: 15px;
+ content: " ";
+}
+.bs-docs-example-popover .popover.dynamic.bottom {
+ border: 1px solid rgba(0, 0, 0, 0.25);
+}
+.bs-docs-example-popover .popover.dynamic.bottom .arrow:before {
+ position: absolute;
+ top: -18px;
+ right: -9px;
+ z-index: 10;
+ width: 0;
+ height: 0;
+ border: solid transparent;
+ border-bottom-color: rgba(0, 0, 0, 0.25);
+ border-width: 9px;
+ content: " ";
+}
+.bs-docs-example-popover .popover.dynamic.bottom .arrow:after {
+ position: absolute;
+ top: -16px;
+ left: -8px;
+ z-index: 10;
+ width: 0;
+ height: 0;
+ border: solid transparent;
+ border-bottom-color: #f7f7f7;
+ border-width: 8px;
+ content: " ";
+}
+.bs-docs-example-popover .popover.dynamic.right .arrow:before {
+ position: absolute;
+ top: -15px;
+ right: 0;
+ z-index: 10;
+ width: 0;
+ height: 0;
+ border: solid transparent;
+ border-right-color: transparent;
+ border-width: 15px;
+ content: " ";
+}
+.bs-docs-example-popover .popover.dynamic.right .arrow:after {
+ position: absolute;
+ top: -15px;
+ left: -30px;
+ z-index: 10;
+ width: 0;
+ height: 0;
+ border: solid transparent;
+ border-right-color: rgba(0, 0, 0, 0.25);
+ border-width: 15px;
+ content: " ";
+}
/* Responsive docs
-------------------------------------------------- */
diff --git a/docs/assets/js/bootstrap-affix.js b/docs/assets/js/bootstrap-affix.js
index c6b8208a6ef9300253c467ca2d5c32033a5ee671..c49d6e9dac09e0b7d8fe0c873fc887249b7516b7 100644
--- a/docs/assets/js/bootstrap-affix.js
+++ b/docs/assets/js/bootstrap-affix.js
@@ -1,5 +1,5 @@
/* ==========================================================
- * bootstrap-affix.js v2.1.0
+ * bootstrap-affix.js v2.1.1
* http://twitter.github.com/bootstrap/javascript.html#affix
* ==========================================================
* Copyright 2012 Twitter, Inc.
diff --git a/docs/assets/js/bootstrap-alert.js b/docs/assets/js/bootstrap-alert.js
index 4dd31adb22f6e06d17240edfd6d3a22b92e7718c..51273ab9d2d8616cf66479cbbd0f7f6173f17dcb 100644
--- a/docs/assets/js/bootstrap-alert.js
+++ b/docs/assets/js/bootstrap-alert.js
@@ -1,5 +1,5 @@
/* ==========================================================
- * bootstrap-alert.js v2.1.0
+ * bootstrap-alert.js v2.1.1
* http://twitter.github.com/bootstrap/javascript.html#alerts
* ==========================================================
* Copyright 2012 Twitter, Inc.
diff --git a/docs/assets/js/bootstrap-button.js b/docs/assets/js/bootstrap-button.js
index d0413d6efbc760fd3c50771e11944622278208ec..702198f6d06a75e973821917313853010dc5a2d5 100644
--- a/docs/assets/js/bootstrap-button.js
+++ b/docs/assets/js/bootstrap-button.js
@@ -1,5 +1,5 @@
/* ============================================================
- * bootstrap-button.js v2.1.0
+ * bootstrap-button.js v2.1.1
* http://twitter.github.com/bootstrap/javascript.html#buttons
* ============================================================
* Copyright 2012 Twitter, Inc.
diff --git a/docs/assets/js/bootstrap-carousel.js b/docs/assets/js/bootstrap-carousel.js
index 0b87eb8a2459ea40a0bdf88fb4ef5a3f7839166f..5c194b4287baaf967b676a00788ebbe84d30d6cd 100644
--- a/docs/assets/js/bootstrap-carousel.js
+++ b/docs/assets/js/bootstrap-carousel.js
@@ -1,5 +1,5 @@
/* ==========================================================
- * bootstrap-carousel.js v2.1.0
+ * bootstrap-carousel.js v2.1.1
* http://twitter.github.com/bootstrap/javascript.html#carousel
* ==========================================================
* Copyright 2012 Twitter, Inc.
diff --git a/docs/assets/js/bootstrap-collapse.js b/docs/assets/js/bootstrap-collapse.js
index 391d91281bc2d804063e0868455b7402477ab1be..8116f2255388bb397df4789008f34c4be0c74438 100644
--- a/docs/assets/js/bootstrap-collapse.js
+++ b/docs/assets/js/bootstrap-collapse.js
@@ -1,5 +1,5 @@
/* =============================================================
- * bootstrap-collapse.js v2.1.0
+ * bootstrap-collapse.js v2.1.1
* http://twitter.github.com/bootstrap/javascript.html#collapse
* =============================================================
* Copyright 2012 Twitter, Inc.
diff --git a/docs/assets/js/bootstrap-dropdown.js b/docs/assets/js/bootstrap-dropdown.js
index ab601e9e5bf7a284d2e403b682fc352cd840a37b..bd97356d1802773186bea7da4c5ce1ecc1ce12eb 100644
--- a/docs/assets/js/bootstrap-dropdown.js
+++ b/docs/assets/js/bootstrap-dropdown.js
@@ -1,5 +1,5 @@
/* ============================================================
- * bootstrap-dropdown.js v2.1.0
+ * bootstrap-dropdown.js v2.1.1
* http://twitter.github.com/bootstrap/javascript.html#dropdowns
* ============================================================
* Copyright 2012 Twitter, Inc.
diff --git a/docs/assets/js/bootstrap-modal.js b/docs/assets/js/bootstrap-modal.js
index 62fbc951b5ddc91846fb3c7ec73da0db0c70f0dd..f1622b1c65f7e0aeb4ed9351224eefa57285cbc2 100644
--- a/docs/assets/js/bootstrap-modal.js
+++ b/docs/assets/js/bootstrap-modal.js
@@ -1,5 +1,5 @@
/* =========================================================
- * bootstrap-modal.js v2.1.0
+ * bootstrap-modal.js v2.1.1
* http://twitter.github.com/bootstrap/javascript.html#modals
* =========================================================
* Copyright 2012 Twitter, Inc.
diff --git a/docs/assets/js/bootstrap-popover.js b/docs/assets/js/bootstrap-popover.js
index 4ce7a16d3f3c01cd000e937d87e9089de41dd261..941372285cb38be1699d4a65d2a984b79561e6ea 100644
--- a/docs/assets/js/bootstrap-popover.js
+++ b/docs/assets/js/bootstrap-popover.js
@@ -1,5 +1,5 @@
/* ===========================================================
- * bootstrap-popover.js v2.1.0
+ * bootstrap-popover.js v2.1.1
* http://twitter.github.com/bootstrap/javascript.html#popovers
* ===========================================================
* Copyright 2012 Twitter, Inc.
diff --git a/docs/assets/js/bootstrap-scrollspy.js b/docs/assets/js/bootstrap-scrollspy.js
index df70ebdd715da5417e4ba67d9a6d3a70844947c1..e740ac01f71084618df29431cd7f63561bd8c630 100644
--- a/docs/assets/js/bootstrap-scrollspy.js
+++ b/docs/assets/js/bootstrap-scrollspy.js
@@ -1,5 +1,5 @@
/* =============================================================
- * bootstrap-scrollspy.js v2.1.0
+ * bootstrap-scrollspy.js v2.1.1
* http://twitter.github.com/bootstrap/javascript.html#scrollspy
* =============================================================
* Copyright 2012 Twitter, Inc.
diff --git a/docs/assets/js/bootstrap-tab.js b/docs/assets/js/bootstrap-tab.js
index df2a7f7a06fa66345931410cbe734cc3bf763cbf..070deb8f4ddae41e9bae6ad0ee835d9b97f17a45 100644
--- a/docs/assets/js/bootstrap-tab.js
+++ b/docs/assets/js/bootstrap-tab.js
@@ -1,5 +1,5 @@
/* ========================================================
- * bootstrap-tab.js v2.1.0
+ * bootstrap-tab.js v2.1.1
* http://twitter.github.com/bootstrap/javascript.html#tabs
* ========================================================
* Copyright 2012 Twitter, Inc.
diff --git a/docs/assets/js/bootstrap-tooltip.js b/docs/assets/js/bootstrap-tooltip.js
index 4d06dfcc9b1675abb34f19b70c07a54a88aadd86..ed6288531604595c43f3f4abef03697441fd4514 100644
--- a/docs/assets/js/bootstrap-tooltip.js
+++ b/docs/assets/js/bootstrap-tooltip.js
@@ -1,5 +1,5 @@
/* ===========================================================
- * bootstrap-tooltip.js v2.1.0
+ * bootstrap-tooltip.js v2.1.1
* http://twitter.github.com/bootstrap/javascript.html#tooltips
* Inspired by the original jQuery.tipsy by Jason Frame
* ===========================================================
diff --git a/docs/assets/js/bootstrap-transition.js b/docs/assets/js/bootstrap-transition.js
index f0913d861a060e9b5cc4730aa302ed1aaaad24ba..fedc90a83e1bf23cc813ab9bb6f14f61f8505818 100644
--- a/docs/assets/js/bootstrap-transition.js
+++ b/docs/assets/js/bootstrap-transition.js
@@ -1,5 +1,5 @@
/* ===================================================
- * bootstrap-transition.js v2.1.0
+ * bootstrap-transition.js v2.1.1
* http://twitter.github.com/bootstrap/javascript.html#transitions
* ===================================================
* Copyright 2012 Twitter, Inc.
diff --git a/docs/assets/js/bootstrap-typeahead.js b/docs/assets/js/bootstrap-typeahead.js
index ae57221c11a77d0f837d15937335fa4af748fedf..6ceacd61dcd7bbfda6fd72210ef1cc6195500ad4 100644
--- a/docs/assets/js/bootstrap-typeahead.js
+++ b/docs/assets/js/bootstrap-typeahead.js
@@ -1,5 +1,5 @@
/* =============================================================
- * bootstrap-typeahead.js v2.1.0
+ * bootstrap-typeahead.js v2.1.1
* http://twitter.github.com/bootstrap/javascript.html#typeahead
* =============================================================
* Copyright 2012 Twitter, Inc.
diff --git a/docs/assets/js/bootstrap.js b/docs/assets/js/bootstrap.js
index 7f303eb88a10671c4a704c667d2b0a9e78417f89..958d5a0af9a8f590d2eeb8f02eaf10da6bc20fe0 100644
--- a/docs/assets/js/bootstrap.js
+++ b/docs/assets/js/bootstrap.js
@@ -1,5 +1,5 @@
/* ===================================================
- * bootstrap-transition.js v2.1.0
+ * bootstrap-transition.js v2.1.1
* http://twitter.github.com/bootstrap/javascript.html#transitions
* ===================================================
* Copyright 2012 Twitter, Inc.
@@ -58,7 +58,7 @@
})
}(window.jQuery);/* ==========================================================
- * bootstrap-alert.js v2.1.0
+ * bootstrap-alert.js v2.1.1
* http://twitter.github.com/bootstrap/javascript.html#alerts
* ==========================================================
* Copyright 2012 Twitter, Inc.
@@ -147,7 +147,7 @@
})
}(window.jQuery);/* ============================================================
- * bootstrap-button.js v2.1.0
+ * bootstrap-button.js v2.1.1
* http://twitter.github.com/bootstrap/javascript.html#buttons
* ============================================================
* Copyright 2012 Twitter, Inc.
@@ -242,7 +242,7 @@
})
}(window.jQuery);/* ==========================================================
- * bootstrap-carousel.js v2.1.0
+ * bootstrap-carousel.js v2.1.1
* http://twitter.github.com/bootstrap/javascript.html#carousel
* ==========================================================
* Copyright 2012 Twitter, Inc.
@@ -417,7 +417,7 @@
})
}(window.jQuery);/* =============================================================
- * bootstrap-collapse.js v2.1.0
+ * bootstrap-collapse.js v2.1.1
* http://twitter.github.com/bootstrap/javascript.html#collapse
* =============================================================
* Copyright 2012 Twitter, Inc.
@@ -574,7 +574,7 @@
})
}(window.jQuery);/* ============================================================
- * bootstrap-dropdown.js v2.1.0
+ * bootstrap-dropdown.js v2.1.1
* http://twitter.github.com/bootstrap/javascript.html#dropdowns
* ============================================================
* Copyright 2012 Twitter, Inc.
@@ -723,7 +723,7 @@
})
}(window.jQuery);/* =========================================================
- * bootstrap-modal.js v2.1.0
+ * bootstrap-modal.js v2.1.1
* http://twitter.github.com/bootstrap/javascript.html#modals
* =========================================================
* Copyright 2012 Twitter, Inc.
@@ -961,7 +961,7 @@
})
}(window.jQuery);/* ===========================================================
- * bootstrap-tooltip.js v2.1.0
+ * bootstrap-tooltip.js v2.1.1
* http://twitter.github.com/bootstrap/javascript.html#tooltips
* Inspired by the original jQuery.tipsy by Jason Frame
* ===========================================================
@@ -1236,7 +1236,7 @@
}(window.jQuery);
/* ===========================================================
- * bootstrap-popover.js v2.1.0
+ * bootstrap-popover.js v2.1.1
* http://twitter.github.com/bootstrap/javascript.html#popovers
* ===========================================================
* Copyright 2012 Twitter, Inc.
@@ -1338,7 +1338,7 @@
})
}(window.jQuery);/* =============================================================
- * bootstrap-scrollspy.js v2.1.0
+ * bootstrap-scrollspy.js v2.1.1
* http://twitter.github.com/bootstrap/javascript.html#scrollspy
* =============================================================
* Copyright 2012 Twitter, Inc.
@@ -1488,7 +1488,7 @@
})
}(window.jQuery);/* ========================================================
- * bootstrap-tab.js v2.1.0
+ * bootstrap-tab.js v2.1.1
* http://twitter.github.com/bootstrap/javascript.html#tabs
* ========================================================
* Copyright 2012 Twitter, Inc.
@@ -1622,7 +1622,7 @@
})
}(window.jQuery);/* =============================================================
- * bootstrap-typeahead.js v2.1.0
+ * bootstrap-typeahead.js v2.1.1
* http://twitter.github.com/bootstrap/javascript.html#typeahead
* =============================================================
* Copyright 2012 Twitter, Inc.
@@ -1922,7 +1922,7 @@
}(window.jQuery);
/* ==========================================================
- * bootstrap-affix.js v2.1.0
+ * bootstrap-affix.js v2.1.1
* http://twitter.github.com/bootstrap/javascript.html#affix
* ==========================================================
* Copyright 2012 Twitter, Inc.
diff --git a/docs/assets/js/bootstrap.min.js b/docs/assets/js/bootstrap.min.js
index 9e4ac0425ca7fa2a6b2cd382e5f52b2564d74088..5a398394c6e318340613ff20b8073cea9012500c 100644
--- a/docs/assets/js/bootstrap.min.js
+++ b/docs/assets/js/bootstrap.min.js
@@ -3,4 +3,4 @@
* Copyright 2012 Twitter, Inc.
* http://www.apache.org/licenses/LICENSE-2.0.txt
*/
-!function(a){a(function(){"use strict",a.support.transition=function(){var a=function(){var a=document.createElement("bootstrap"),b={WebkitTransition:"webkitTransitionEnd",MozTransition:"transitionend",OTransition:"oTransitionEnd otransitionend",transition:"transitionend"},c;for(c in b)if(a.style[c]!==undefined)return b[c]}();return a&&{end:a}}()})}(window.jQuery),!function(a){"use strict";var b='[data-dismiss="alert"]',c=function(c){a(c).on("click",b,this.close)};c.prototype.close=function(b){function f(){e.trigger("closed").remove()}var c=a(this),d=c.attr("data-target"),e;d||(d=c.attr("href"),d=d&&d.replace(/.*(?=#[^\s]*$)/,"")),e=a(d),b&&b.preventDefault(),e.length||(e=c.hasClass("alert")?c:c.parent()),e.trigger(b=a.Event("close"));if(b.isDefaultPrevented())return;e.removeClass("in"),a.support.transition&&e.hasClass("fade")?e.on(a.support.transition.end,f):f()},a.fn.alert=function(b){return this.each(function(){var d=a(this),e=d.data("alert");e||d.data("alert",e=new c(this)),typeof b=="string"&&e[b].call(d)})},a.fn.alert.Constructor=c,a(function(){a("body").on("click.alert.data-api",b,c.prototype.close)})}(window.jQuery),!function(a){"use strict";var b=function(b,c){this.$element=a(b),this.options=a.extend({},a.fn.button.defaults,c)};b.prototype.setState=function(a){var b="disabled",c=this.$element,d=c.data(),e=c.is("input")?"val":"html";a+="Text",d.resetText||c.data("resetText",c[e]()),c[e](d[a]||this.options[a]),setTimeout(function(){a=="loadingText"?c.addClass(b).attr(b,b):c.removeClass(b).removeAttr(b)},0)},b.prototype.toggle=function(){var a=this.$element.parent('[data-toggle="buttons-radio"]');a&&a.find(".active").removeClass("active"),this.$element.toggleClass("active")},a.fn.button=function(c){return this.each(function(){var d=a(this),e=d.data("button"),f=typeof c=="object"&&c;e||d.data("button",e=new b(this,f)),c=="toggle"?e.toggle():c&&e.setState(c)})},a.fn.button.defaults={loadingText:"loading..."},a.fn.button.Constructor=b,a(function(){a("body").on("click.button.data-api","[data-toggle^=button]",function(b){var c=a(b.target);c.hasClass("btn")||(c=c.closest(".btn")),c.button("toggle")})})}(window.jQuery),!function(a){"use strict";var b=function(b,c){this.$element=a(b),this.options=c,this.options.slide&&this.slide(this.options.slide),this.options.pause=="hover"&&this.$element.on("mouseenter",a.proxy(this.pause,this)).on("mouseleave",a.proxy(this.cycle,this))};b.prototype={cycle:function(b){return b||(this.paused=!1),this.options.interval&&!this.paused&&(this.interval=setInterval(a.proxy(this.next,this),this.options.interval)),this},to:function(b){var c=this.$element.find(".item.active"),d=c.parent().children(),e=d.index(c),f=this;if(b>d.length-1||b<0)return;return this.sliding?this.$element.one("slid",function(){f.to(b)}):e==b?this.pause().cycle():this.slide(b>e?"next":"prev",a(d[b]))},pause:function(b){return b||(this.paused=!0),this.$element.find(".next, .prev").length&&a.support.transition.end&&(this.$element.trigger(a.support.transition.end),this.cycle()),clearInterval(this.interval),this.interval=null,this},next:function(){if(this.sliding)return;return this.slide("next")},prev:function(){if(this.sliding)return;return this.slide("prev")},slide:function(b,c){var d=this.$element.find(".item.active"),e=c||d[b](),f=this.interval,g=b=="next"?"left":"right",h=b=="next"?"first":"last",i=this,j=a.Event("slide",{relatedTarget:e[0]});this.sliding=!0,f&&this.pause(),e=e.length?e:this.$element.find(".item")[h]();if(e.hasClass("active"))return;if(a.support.transition&&this.$element.hasClass("slide")){this.$element.trigger(j);if(j.isDefaultPrevented())return;e.addClass(b),e[0].offsetWidth,d.addClass(g),e.addClass(g),this.$element.one(a.support.transition.end,function(){e.removeClass([b,g].join(" ")).addClass("active"),d.removeClass(["active",g].join(" ")),i.sliding=!1,setTimeout(function(){i.$element.trigger("slid")},0)})}else{this.$element.trigger(j);if(j.isDefaultPrevented())return;d.removeClass("active"),e.addClass("active"),this.sliding=!1,this.$element.trigger("slid")}return f&&this.cycle(),this}},a.fn.carousel=function(c){return this.each(function(){var d=a(this),e=d.data("carousel"),f=a.extend({},a.fn.carousel.defaults,typeof c=="object"&&c),g=typeof c=="string"?c:f.slide;e||d.data("carousel",e=new b(this,f)),typeof c=="number"?e.to(c):g?e[g]():f.interval&&e.cycle()})},a.fn.carousel.defaults={interval:5e3,pause:"hover"},a.fn.carousel.Constructor=b,a(function(){a("body").on("click.carousel.data-api","[data-slide]",function(b){var c=a(this),d,e=a(c.attr("data-target")||(d=c.attr("href"))&&d.replace(/.*(?=#[^\s]+$)/,"")),f=!e.data("modal")&&a.extend({},e.data(),c.data());e.carousel(f),b.preventDefault()})})}(window.jQuery),!function(a){"use strict";var b=function(b,c){this.$element=a(b),this.options=a.extend({},a.fn.collapse.defaults,c),this.options.parent&&(this.$parent=a(this.options.parent)),this.options.toggle&&this.toggle()};b.prototype={constructor:b,dimension:function(){var a=this.$element.hasClass("width");return a?"width":"height"},show:function(){var b,c,d,e;if(this.transitioning)return;b=this.dimension(),c=a.camelCase(["scroll",b].join("-")),d=this.$parent&&this.$parent.find("> .accordion-group > .in");if(d&&d.length){e=d.data("collapse");if(e&&e.transitioning)return;d.collapse("hide"),e||d.data("collapse",null)}this.$element[b](0),this.transition("addClass",a.Event("show"),"shown"),a.support.transition&&this.$element[b](this.$element[0][c])},hide:function(){var b;if(this.transitioning)return;b=this.dimension(),this.reset(this.$element[b]()),this.transition("removeClass",a.Event("hide"),"hidden"),this.$element[b](0)},reset:function(a){var b=this.dimension();return this.$element.removeClass("collapse")[b](a||"auto")[0].offsetWidth,this.$element[a!==null?"addClass":"removeClass"]("collapse"),this},transition:function(b,c,d){var e=this,f=function(){c.type=="show"&&e.reset(),e.transitioning=0,e.$element.trigger(d)};this.$element.trigger(c);if(c.isDefaultPrevented())return;this.transitioning=1,this.$element[b]("in"),a.support.transition&&this.$element.hasClass("collapse")?this.$element.one(a.support.transition.end,f):f()},toggle:function(){this[this.$element.hasClass("in")?"hide":"show"]()}},a.fn.collapse=function(c){return this.each(function(){var d=a(this),e=d.data("collapse"),f=typeof c=="object"&&c;e||d.data("collapse",e=new b(this,f)),typeof c=="string"&&e[c]()})},a.fn.collapse.defaults={toggle:!0},a.fn.collapse.Constructor=b,a(function(){a("body").on("click.collapse.data-api","[data-toggle=collapse]",function(b){var c=a(this),d,e=c.attr("data-target")||b.preventDefault()||(d=c.attr("href"))&&d.replace(/.*(?=#[^\s]+$)/,""),f=a(e).data("collapse")?"toggle":c.data();c[a(e).hasClass("in")?"addClass":"removeClass"]("collapsed"),a(e).collapse(f)})})}(window.jQuery),!function(a){function d(){e(a(b)).removeClass("open")}function e(b){var c=b.attr("data-target"),d;return c||(c=b.attr("href"),c=c&&c.replace(/.*(?=#[^\s]*$)/,"")),d=a(c),d.length||(d=b.parent()),d}"use strict";var b="[data-toggle=dropdown]",c=function(b){var c=a(b).on("click.dropdown.data-api",this.toggle);a("html").on("click.dropdown.data-api",function(){c.parent().removeClass("open")})};c.prototype={constructor:c,toggle:function(b){var c=a(this),f,g;if(c.is(".disabled, :disabled"))return;return f=e(c),g=f.hasClass("open"),d(),g||(f.toggleClass("open"),c.focus()),!1},keydown:function(b){var c,d,f,g,h,i;if(!/(38|40|27)/.test(b.keyCode))return;c=a(this),b.preventDefault(),b.stopPropagation();if(c.is(".disabled, :disabled"))return;g=e(c),h=g.hasClass("open");if(!h||h&&b.keyCode==27)return c.click();d=a("[role=menu] li:not(.divider) a",g);if(!d.length)return;i=d.index(d.filter(":focus")),b.keyCode==38&&i>0&&i--,b.keyCode==40&&i<d.length-1&&i++,~i||(i=0),d.eq(i).focus()}},a.fn.dropdown=function(b){return this.each(function(){var d=a(this),e=d.data("dropdown");e||d.data("dropdown",e=new c(this)),typeof b=="string"&&e[b].call(d)})},a.fn.dropdown.Constructor=c,a(function(){a("html").on("click.dropdown.data-api touchstart.dropdown.data-api",d),a("body").on("click.dropdown touchstart.dropdown.data-api",".dropdown",function(a){a.stopPropagation()}).on("click.dropdown.data-api touchstart.dropdown.data-api",b,c.prototype.toggle).on("keydown.dropdown.data-api touchstart.dropdown.data-api",b+", [role=menu]",c.prototype.keydown)})}(window.jQuery),!function(a){"use strict";var b=function(b,c){this.options=c,this.$element=a(b).delegate('[data-dismiss="modal"]',"click.dismiss.modal",a.proxy(this.hide,this)),this.options.remote&&this.$element.find(".modal-body").load(this.options.remote)};b.prototype={constructor:b,toggle:function(){return this[this.isShown?"hide":"show"]()},show:function(){var b=this,c=a.Event("show");this.$element.trigger(c);if(this.isShown||c.isDefaultPrevented())return;a("body").addClass("modal-open"),this.isShown=!0,this.escape(),this.backdrop(function(){var c=a.support.transition&&b.$element.hasClass("fade");b.$element.parent().length||b.$element.appendTo(document.body),b.$element.show(),c&&b.$element[0].offsetWidth,b.$element.addClass("in").attr("aria-hidden",!1).focus(),b.enforceFocus(),c?b.$element.one(a.support.transition.end,function(){b.$element.trigger("shown")}):b.$element.trigger("shown")})},hide:function(b){b&&b.preventDefault();var c=this;b=a.Event("hide"),this.$element.trigger(b);if(!this.isShown||b.isDefaultPrevented())return;this.isShown=!1,a("body").removeClass("modal-open"),this.escape(),a(document).off("focusin.modal"),this.$element.removeClass("in").attr("aria-hidden",!0),a.support.transition&&this.$element.hasClass("fade")?this.hideWithTransition():this.hideModal()},enforceFocus:function(){var b=this;a(document).on("focusin.modal",function(a){b.$element[0]!==a.target&&!b.$element.has(a.target).length&&b.$element.focus()})},escape:function(){var a=this;this.isShown&&this.options.keyboard?this.$element.on("keyup.dismiss.modal",function(b){b.which==27&&a.hide()}):this.isShown||this.$element.off("keyup.dismiss.modal")},hideWithTransition:function(){var b=this,c=setTimeout(function(){b.$element.off(a.support.transition.end),b.hideModal()},500);this.$element.one(a.support.transition.end,function(){clearTimeout(c),b.hideModal()})},hideModal:function(a){this.$element.hide().trigger("hidden"),this.backdrop()},removeBackdrop:function(){this.$backdrop.remove(),this.$backdrop=null},backdrop:function(b){var c=this,d=this.$element.hasClass("fade")?"fade":"";if(this.isShown&&this.options.backdrop){var e=a.support.transition&&d;this.$backdrop=a('<div class="modal-backdrop '+d+'" />').appendTo(document.body),this.options.backdrop!="static"&&this.$backdrop.click(a.proxy(this.hide,this)),e&&this.$backdrop[0].offsetWidth,this.$backdrop.addClass("in"),e?this.$backdrop.one(a.support.transition.end,b):b()}else!this.isShown&&this.$backdrop?(this.$backdrop.removeClass("in"),a.support.transition&&this.$element.hasClass("fade")?this.$backdrop.one(a.support.transition.end,a.proxy(this.removeBackdrop,this)):this.removeBackdrop()):b&&b()}},a.fn.modal=function(c){return this.each(function(){var d=a(this),e=d.data("modal"),f=a.extend({},a.fn.modal.defaults,d.data(),typeof c=="object"&&c);e||d.data("modal",e=new b(this,f)),typeof c=="string"?e[c]():f.show&&e.show()})},a.fn.modal.defaults={backdrop:!0,keyboard:!0,show:!0},a.fn.modal.Constructor=b,a(function(){a("body").on("click.modal.data-api",'[data-toggle="modal"]',function(b){var c=a(this),d=c.attr("href"),e=a(c.attr("data-target")||d&&d.replace(/.*(?=#[^\s]+$)/,"")),f=e.data("modal")?"toggle":a.extend({remote:!/#/.test(d)&&d},e.data(),c.data());b.preventDefault(),e.modal(f).one("hide",function(){c.focus()})})})}(window.jQuery),!function(a){"use strict";var b=function(a,b){this.init("tooltip",a,b)};b.prototype={constructor:b,init:function(b,c,d){var e,f;this.type=b,this.$element=a(c),this.options=this.getOptions(d),this.enabled=!0,this.options.trigger=="click"?this.$element.on("click."+this.type,this.options.selector,a.proxy(this.toggle,this)):this.options.trigger!="manual"&&(e=this.options.trigger=="hover"?"mouseenter":"focus",f=this.options.trigger=="hover"?"mouseleave":"blur",this.$element.on(e+"."+this.type,this.options.selector,a.proxy(this.enter,this)),this.$element.on(f+"."+this.type,this.options.selector,a.proxy(this.leave,this))),this.options.selector?this._options=a.extend({},this.options,{trigger:"manual",selector:""}):this.fixTitle()},getOptions:function(b){return b=a.extend({},a.fn[this.type].defaults,b,this.$element.data()),b.delay&&typeof b.delay=="number"&&(b.delay={show:b.delay,hide:b.delay}),b},enter:function(b){var c=a(b.currentTarget)[this.type](this._options).data(this.type);if(!c.options.delay||!c.options.delay.show)return c.show();clearTimeout(this.timeout),c.hoverState="in",this.timeout=setTimeout(function(){c.hoverState=="in"&&c.show()},c.options.delay.show)},leave:function(b){var c=a(b.currentTarget)[this.type](this._options).data(this.type);this.timeout&&clearTimeout(this.timeout);if(!c.options.delay||!c.options.delay.hide)return c.hide();c.hoverState="out",this.timeout=setTimeout(function(){c.hoverState=="out"&&c.hide()},c.options.delay.hide)},show:function(){var a,b,c,d,e,f,g;if(this.hasContent()&&this.enabled){a=this.tip(),this.setContent(),this.options.animation&&a.addClass("fade"),f=typeof this.options.placement=="function"?this.options.placement.call(this,a[0],this.$element[0]):this.options.placement,b=/in/.test(f),a.remove().css({top:0,left:0,display:"block"}).appendTo(b?this.$element:document.body),c=this.getPosition(b),d=a[0].offsetWidth,e=a[0].offsetHeight;switch(b?f.split(" ")[1]:f){case"bottom":g={top:c.top+c.height,left:c.left+c.width/2-d/2};break;case"top":g={top:c.top-e,left:c.left+c.width/2-d/2};break;case"left":g={top:c.top+c.height/2-e/2,left:c.left-d};break;case"right":g={top:c.top+c.height/2-e/2,left:c.left+c.width}}a.css(g).addClass(f).addClass("in")}},setContent:function(){var a=this.tip(),b=this.getTitle();a.find(".tooltip-inner")[this.options.html?"html":"text"](b),a.removeClass("fade in top bottom left right")},hide:function(){function d(){var b=setTimeout(function(){c.off(a.support.transition.end).remove()},500);c.one(a.support.transition.end,function(){clearTimeout(b),c.remove()})}var b=this,c=this.tip();return c.removeClass("in"),a.support.transition&&this.$tip.hasClass("fade")?d():c.remove(),this},fixTitle:function(){var a=this.$element;(a.attr("title")||typeof a.attr("data-original-title")!="string")&&a.attr("data-original-title",a.attr("title")||"").removeAttr("title")},hasContent:function(){return this.getTitle()},getPosition:function(b){return a.extend({},b?{top:0,left:0}:this.$element.offset(),{width:this.$element[0].offsetWidth,height:this.$element[0].offsetHeight})},getTitle:function(){var a,b=this.$element,c=this.options;return a=b.attr("data-original-title")||(typeof c.title=="function"?c.title.call(b[0]):c.title),a},tip:function(){return this.$tip=this.$tip||a(this.options.template)},validate:function(){this.$element[0].parentNode||(this.hide(),this.$element=null,this.options=null)},enable:function(){this.enabled=!0},disable:function(){this.enabled=!1},toggleEnabled:function(){this.enabled=!this.enabled},toggle:function(){this[this.tip().hasClass("in")?"hide":"show"]()},destroy:function(){this.hide().$element.off("."+this.type).removeData(this.type)}},a.fn.tooltip=function(c){return this.each(function(){var d=a(this),e=d.data("tooltip"),f=typeof c=="object"&&c;e||d.data("tooltip",e=new b(this,f)),typeof c=="string"&&e[c]()})},a.fn.tooltip.Constructor=b,a.fn.tooltip.defaults={animation:!0,placement:"top",selector:!1,template:'<div class="tooltip"><div class="tooltip-arrow"></div><div class="tooltip-inner"></div></div>',trigger:"hover",title:"",delay:0,html:!0}}(window.jQuery),!function(a){"use strict";var b=function(a,b){this.init("popover",a,b)};b.prototype=a.extend({},a.fn.tooltip.Constructor.prototype,{constructor:b,setContent:function(){var a=this.tip(),b=this.getTitle(),c=this.getContent();a.find(".popover-title")[this.options.html?"html":"text"](b),a.find(".popover-content > *")[this.options.html?"html":"text"](c),a.removeClass("fade top bottom left right in")},hasContent:function(){return this.getTitle()||this.getContent()},getContent:function(){var a,b=this.$element,c=this.options;return a=b.attr("data-content")||(typeof c.content=="function"?c.content.call(b[0]):c.content),a},tip:function(){return this.$tip||(this.$tip=a(this.options.template)),this.$tip},destroy:function(){this.hide().$element.off("."+this.type).removeData(this.type)}}),a.fn.popover=function(c){return this.each(function(){var d=a(this),e=d.data("popover"),f=typeof c=="object"&&c;e||d.data("popover",e=new b(this,f)),typeof c=="string"&&e[c]()})},a.fn.popover.Constructor=b,a.fn.popover.defaults=a.extend({},a.fn.tooltip.defaults,{placement:"right",trigger:"click",content:"",template:'<div class="popover"><div class="arrow"></div><div class="popover-inner"><h3 class="popover-title"></h3><div class="popover-content"><p></p></div></div></div>'})}(window.jQuery),!function(a){function b(b,c){var d=a.proxy(this.process,this),e=a(b).is("body")?a(window):a(b),f;this.options=a.extend({},a.fn.scrollspy.defaults,c),this.$scrollElement=e.on("scroll.scroll-spy.data-api",d),this.selector=(this.options.target||(f=a(b).attr("href"))&&f.replace(/.*(?=#[^\s]+$)/,"")||"")+" .nav li > a",this.$body=a("body"),this.refresh(),this.process()}"use strict",b.prototype={constructor:b,refresh:function(){var b=this,c;this.offsets=a([]),this.targets=a([]),c=this.$body.find(this.selector).map(function(){var b=a(this),c=b.data("target")||b.attr("href"),d=/^#\w/.test(c)&&a(c);return d&&d.length&&[[d.position().top,c]]||null}).sort(function(a,b){return a[0]-b[0]}).each(function(){b.offsets.push(this[0]),b.targets.push(this[1])})},process:function(){var a=this.$scrollElement.scrollTop()+this.options.offset,b=this.$scrollElement[0].scrollHeight||this.$body[0].scrollHeight,c=b-this.$scrollElement.height(),d=this.offsets,e=this.targets,f=this.activeTarget,g;if(a>=c)return f!=(g=e.last()[0])&&this.activate(g);for(g=d.length;g--;)f!=e[g]&&a>=d[g]&&(!d[g+1]||a<=d[g+1])&&this.activate(e[g])},activate:function(b){var c,d;this.activeTarget=b,a(this.selector).parent(".active").removeClass("active"),d=this.selector+'[data-target="'+b+'"],'+this.selector+'[href="'+b+'"]',c=a(d).parent("li").addClass("active"),c.parent(".dropdown-menu").length&&(c=c.closest("li.dropdown").addClass("active")),c.trigger("activate")}},a.fn.scrollspy=function(c){return this.each(function(){var d=a(this),e=d.data("scrollspy"),f=typeof c=="object"&&c;e||d.data("scrollspy",e=new b(this,f)),typeof c=="string"&&e[c]()})},a.fn.scrollspy.Constructor=b,a.fn.scrollspy.defaults={offset:10},a(window).on("load",function(){a('[data-spy="scroll"]').each(function(){var b=a(this);b.scrollspy(b.data())})})}(window.jQuery),!function(a){"use strict";var b=function(b){this.element=a(b)};b.prototype={constructor:b,show:function(){var b=this.element,c=b.closest("ul:not(.dropdown-menu)"),d=b.attr("data-target"),e,f,g;d||(d=b.attr("href"),d=d&&d.replace(/.*(?=#[^\s]*$)/,""));if(b.parent("li").hasClass("active"))return;e=c.find(".active a").last()[0],g=a.Event("show",{relatedTarget:e}),b.trigger(g);if(g.isDefaultPrevented())return;f=a(d),this.activate(b.parent("li"),c),this.activate(f,f.parent(),function(){b.trigger({type:"shown",relatedTarget:e})})},activate:function(b,c,d){function g(){e.removeClass("active").find("> .dropdown-menu > .active").removeClass("active"),b.addClass("active"),f?(b[0].offsetWidth,b.addClass("in")):b.removeClass("fade"),b.parent(".dropdown-menu")&&b.closest("li.dropdown").addClass("active"),d&&d()}var e=c.find("> .active"),f=d&&a.support.transition&&e.hasClass("fade");f?e.one(a.support.transition.end,g):g(),e.removeClass("in")}},a.fn.tab=function(c){return this.each(function(){var d=a(this),e=d.data("tab");e||d.data("tab",e=new b(this)),typeof c=="string"&&e[c]()})},a.fn.tab.Constructor=b,a(function(){a("body").on("click.tab.data-api",'[data-toggle="tab"], [data-toggle="pill"]',function(b){b.preventDefault(),a(this).tab("show")})})}(window.jQuery),!function(a){"use strict";var b=function(b,c){this.$element=a(b),this.options=a.extend({},a.fn.typeahead.defaults,c),this.matcher=this.options.matcher||this.matcher,this.sorter=this.options.sorter||this.sorter,this.highlighter=this.options.highlighter||this.highlighter,this.updater=this.options.updater||this.updater,this.$menu=a(this.options.menu).appendTo("body"),this.source=this.options.source,this.shown=!1,this.listen()};b.prototype={constructor:b,select:function(){var a=this.$menu.find(".active").attr("data-value");return this.$element.val(this.updater(a)).change(),this.hide()},updater:function(a){return a},show:function(){var b=a.extend({},this.$element.offset(),{height:this.$element[0].offsetHeight});return this.$menu.css({top:b.top+b.height,left:b.left}),this.$menu.show(),this.shown=!0,this},hide:function(){return this.$menu.hide(),this.shown=!1,this},lookup:function(b){var c;return this.query=this.$element.val(),!this.query||this.query.length<this.options.minLength?this.shown?this.hide():this:(c=a.isFunction(this.source)?this.source(this.query,a.proxy(this.process,this)):this.source,c?this.process(c):this)},process:function(b){var c=this;return b=a.grep(b,function(a){return c.matcher(a)}),b=this.sorter(b),b.length?this.render(b.slice(0,this.options.items)).show():this.shown?this.hide():this},matcher:function(a){return~a.toLowerCase().indexOf(this.query.toLowerCase())},sorter:function(a){var b=[],c=[],d=[],e;while(e=a.shift())e.toLowerCase().indexOf(this.query.toLowerCase())?~e.indexOf(this.query)?c.push(e):d.push(e):b.push(e);return b.concat(c,d)},highlighter:function(a){var b=this.query.replace(/[\-\[\]{}()*+?.,\\\^$|#\s]/g,"\\$&");return a.replace(new RegExp("("+b+")","ig"),function(a,b){return"<strong>"+b+"</strong>"})},render:function(b){var c=this;return b=a(b).map(function(b,d){return b=a(c.options.item).attr("data-value",d),b.find("a").html(c.highlighter(d)),b[0]}),b.first().addClass("active"),this.$menu.html(b),this},next:function(b){var c=this.$menu.find(".active").removeClass("active"),d=c.next();d.length||(d=a(this.$menu.find("li")[0])),d.addClass("active")},prev:function(a){var b=this.$menu.find(".active").removeClass("active"),c=b.prev();c.length||(c=this.$menu.find("li").last()),c.addClass("active")},listen:function(){this.$element.on("blur",a.proxy(this.blur,this)).on("keypress",a.proxy(this.keypress,this)).on("keyup",a.proxy(this.keyup,this)),(a.browser.webkit||a.browser.msie)&&this.$element.on("keydown",a.proxy(this.keydown,this)),this.$menu.on("click",a.proxy(this.click,this)).on("mouseenter","li",a.proxy(this.mouseenter,this))},move:function(a){if(!this.shown)return;switch(a.keyCode){case 9:case 13:case 27:a.preventDefault();break;case 38:a.preventDefault(),this.prev();break;case 40:a.preventDefault(),this.next()}a.stopPropagation()},keydown:function(b){this.suppressKeyPressRepeat=!~a.inArray(b.keyCode,[40,38,9,13,27]),this.move(b)},keypress:function(a){if(this.suppressKeyPressRepeat)return;this.move(a)},keyup:function(a){switch(a.keyCode){case 40:case 38:break;case 9:case 13:if(!this.shown)return;this.select();break;case 27:if(!this.shown)return;this.hide();break;default:this.lookup()}a.stopPropagation(),a.preventDefault()},blur:function(a){var b=this;setTimeout(function(){b.hide()},150)},click:function(a){a.stopPropagation(),a.preventDefault(),this.select()},mouseenter:function(b){this.$menu.find(".active").removeClass("active"),a(b.currentTarget).addClass("active")}},a.fn.typeahead=function(c){return this.each(function(){var d=a(this),e=d.data("typeahead"),f=typeof c=="object"&&c;e||d.data("typeahead",e=new b(this,f)),typeof c=="string"&&e[c]()})},a.fn.typeahead.defaults={source:[],items:8,menu:'<ul class="typeahead dropdown-menu"></ul>',item:'<li><a href="#"></a></li>',minLength:1},a.fn.typeahead.Constructor=b,a(function(){a("body").on("focus.typeahead.data-api",'[data-provide="typeahead"]',function(b){var c=a(this);if(c.data("typeahead"))return;b.preventDefault(),c.typeahead(c.data())})})}(window.jQuery),!function(a){"use strict";var b=function(b,c){this.options=a.extend({},a.fn.affix.defaults,c),this.$window=a(window).on("scroll.affix.data-api",a.proxy(this.checkPosition,this)),this.$element=a(b),this.checkPosition()};b.prototype.checkPosition=function(){if(!this.$element.is(":visible"))return;var b=a(document).height(),c=this.$window.scrollTop(),d=this.$element.offset(),e=this.options.offset,f=e.bottom,g=e.top,h="affix affix-top affix-bottom",i;typeof e!="object"&&(f=g=e),typeof g=="function"&&(g=e.top()),typeof f=="function"&&(f=e.bottom()),i=this.unpin!=null&&c+this.unpin<=d.top?!1:f!=null&&d.top+this.$element.height()>=b-f?"bottom":g!=null&&c<=g?"top":!1;if(this.affixed===i)return;this.affixed=i,this.unpin=i=="bottom"?d.top-c:null,this.$element.removeClass(h).addClass("affix"+(i?"-"+i:""))},a.fn.affix=function(c){return this.each(function(){var d=a(this),e=d.data("affix"),f=typeof c=="object"&&c;e||d.data("affix",e=new b(this,f)),typeof c=="string"&&e[c]()})},a.fn.affix.Constructor=b,a.fn.affix.defaults={offset:0},a(window).on("load",function(){a('[data-spy="affix"]').each(function(){var b=a(this),c=b.data();c.offset=c.offset||{},c.offsetBottom&&(c.offset.bottom=c.offsetBottom),c.offsetTop&&(c.offset.top=c.offsetTop),b.affix(c)})})}(window.jQuery);
\ No newline at end of file
+!function(e){e(function(){"use strict";e.support.transition=function(){var e=function(){var e=document.createElement("bootstrap"),t={WebkitTransition:"webkitTransitionEnd",MozTransition:"transitionend",OTransition:"oTransitionEnd otransitionend",transition:"transitionend"},n;for(n in t)if(e.style[n]!==undefined)return t[n]}();return e&&{end:e}}()})}(window.jQuery),!function(e){"use strict";var t='[data-dismiss="alert"]',n=function(n){e(n).on("click",t,this.close)};n.prototype.close=function(t){function s(){i.trigger("closed").remove()}var n=e(this),r=n.attr("data-target"),i;r||(r=n.attr("href"),r=r&&r.replace(/.*(?=#[^\s]*$)/,"")),i=e(r),t&&t.preventDefault(),i.length||(i=n.hasClass("alert")?n:n.parent()),i.trigger(t=e.Event("close"));if(t.isDefaultPrevented())return;i.removeClass("in"),e.support.transition&&i.hasClass("fade")?i.on(e.support.transition.end,s):s()},e.fn.alert=function(t){return this.each(function(){var r=e(this),i=r.data("alert");i||r.data("alert",i=new n(this)),typeof t=="string"&&i[t].call(r)})},e.fn.alert.Constructor=n,e(function(){e("body").on("click.alert.data-api",t,n.prototype.close)})}(window.jQuery),!function(e){"use strict";var t=function(t,n){this.$element=e(t),this.options=e.extend({},e.fn.button.defaults,n)};t.prototype.setState=function(e){var t="disabled",n=this.$element,r=n.data(),i=n.is("input")?"val":"html";e+="Text",r.resetText||n.data("resetText",n[i]()),n[i](r[e]||this.options[e]),setTimeout(function(){e=="loadingText"?n.addClass(t).attr(t,t):n.removeClass(t).removeAttr(t)},0)},t.prototype.toggle=function(){var e=this.$element.parent('[data-toggle="buttons-radio"]');e&&e.find(".active").removeClass("active"),this.$element.toggleClass("active")},e.fn.button=function(n){return this.each(function(){var r=e(this),i=r.data("button"),s=typeof n=="object"&&n;i||r.data("button",i=new t(this,s)),n=="toggle"?i.toggle():n&&i.setState(n)})},e.fn.button.defaults={loadingText:"loading..."},e.fn.button.Constructor=t,e(function(){e("body").on("click.button.data-api","[data-toggle^=button]",function(t){var n=e(t.target);n.hasClass("btn")||(n=n.closest(".btn")),n.button("toggle")})})}(window.jQuery),!function(e){"use strict";var t=function(t,n){this.$element=e(t),this.options=n,this.options.slide&&this.slide(this.options.slide),this.options.pause=="hover"&&this.$element.on("mouseenter",e.proxy(this.pause,this)).on("mouseleave",e.proxy(this.cycle,this))};t.prototype={cycle:function(t){return t||(this.paused=!1),this.options.interval&&!this.paused&&(this.interval=setInterval(e.proxy(this.next,this),this.options.interval)),this},to:function(t){var n=this.$element.find(".item.active"),r=n.parent().children(),i=r.index(n),s=this;if(t>r.length-1||t<0)return;return this.sliding?this.$element.one("slid",function(){s.to(t)}):i==t?this.pause().cycle():this.slide(t>i?"next":"prev",e(r[t]))},pause:function(t){return t||(this.paused=!0),this.$element.find(".next, .prev").length&&e.support.transition.end&&(this.$element.trigger(e.support.transition.end),this.cycle()),clearInterval(this.interval),this.interval=null,this},next:function(){if(this.sliding)return;return this.slide("next")},prev:function(){if(this.sliding)return;return this.slide("prev")},slide:function(t,n){var r=this.$element.find(".item.active"),i=n||r[t](),s=this.interval,o=t=="next"?"left":"right",u=t=="next"?"first":"last",a=this,f=e.Event("slide",{relatedTarget:i[0]});this.sliding=!0,s&&this.pause(),i=i.length?i:this.$element.find(".item")[u]();if(i.hasClass("active"))return;if(e.support.transition&&this.$element.hasClass("slide")){this.$element.trigger(f);if(f.isDefaultPrevented())return;i.addClass(t),i[0].offsetWidth,r.addClass(o),i.addClass(o),this.$element.one(e.support.transition.end,function(){i.removeClass([t,o].join(" ")).addClass("active"),r.removeClass(["active",o].join(" ")),a.sliding=!1,setTimeout(function(){a.$element.trigger("slid")},0)})}else{this.$element.trigger(f);if(f.isDefaultPrevented())return;r.removeClass("active"),i.addClass("active"),this.sliding=!1,this.$element.trigger("slid")}return s&&this.cycle(),this}},e.fn.carousel=function(n){return this.each(function(){var r=e(this),i=r.data("carousel"),s=e.extend({},e.fn.carousel.defaults,typeof n=="object"&&n),o=typeof n=="string"?n:s.slide;i||r.data("carousel",i=new t(this,s)),typeof n=="number"?i.to(n):o?i[o]():s.interval&&i.cycle()})},e.fn.carousel.defaults={interval:5e3,pause:"hover"},e.fn.carousel.Constructor=t,e(function(){e("body").on("click.carousel.data-api","[data-slide]",function(t){var n=e(this),r,i=e(n.attr("data-target")||(r=n.attr("href"))&&r.replace(/.*(?=#[^\s]+$)/,"")),s=!i.data("modal")&&e.extend({},i.data(),n.data());i.carousel(s),t.preventDefault()})})}(window.jQuery),!function(e){"use strict";var t=function(t,n){this.$element=e(t),this.options=e.extend({},e.fn.collapse.defaults,n),this.options.parent&&(this.$parent=e(this.options.parent)),this.options.toggle&&this.toggle()};t.prototype={constructor:t,dimension:function(){var e=this.$element.hasClass("width");return e?"width":"height"},show:function(){var t,n,r,i;if(this.transitioning)return;t=this.dimension(),n=e.camelCase(["scroll",t].join("-")),r=this.$parent&&this.$parent.find("> .accordion-group > .in");if(r&&r.length){i=r.data("collapse");if(i&&i.transitioning)return;r.collapse("hide"),i||r.data("collapse",null)}this.$element[t](0),this.transition("addClass",e.Event("show"),"shown"),e.support.transition&&this.$element[t](this.$element[0][n])},hide:function(){var t;if(this.transitioning)return;t=this.dimension(),this.reset(this.$element[t]()),this.transition("removeClass",e.Event("hide"),"hidden"),this.$element[t](0)},reset:function(e){var t=this.dimension();return this.$element.removeClass("collapse")[t](e||"auto")[0].offsetWidth,this.$element[e!==null?"addClass":"removeClass"]("collapse"),this},transition:function(t,n,r){var i=this,s=function(){n.type=="show"&&i.reset(),i.transitioning=0,i.$element.trigger(r)};this.$element.trigger(n);if(n.isDefaultPrevented())return;this.transitioning=1,this.$element[t]("in"),e.support.transition&&this.$element.hasClass("collapse")?this.$element.one(e.support.transition.end,s):s()},toggle:function(){this[this.$element.hasClass("in")?"hide":"show"]()}},e.fn.collapse=function(n){return this.each(function(){var r=e(this),i=r.data("collapse"),s=typeof n=="object"&&n;i||r.data("collapse",i=new t(this,s)),typeof n=="string"&&i[n]()})},e.fn.collapse.defaults={toggle:!0},e.fn.collapse.Constructor=t,e(function(){e("body").on("click.collapse.data-api","[data-toggle=collapse]",function(t){var n=e(this),r,i=n.attr("data-target")||t.preventDefault()||(r=n.attr("href"))&&r.replace(/.*(?=#[^\s]+$)/,""),s=e(i).data("collapse")?"toggle":n.data();n[e(i).hasClass("in")?"addClass":"removeClass"]("collapsed"),e(i).collapse(s)})})}(window.jQuery),!function(e){"use strict";function r(){i(e(t)).removeClass("open")}function i(t){var n=t.attr("data-target"),r;return n||(n=t.attr("href"),n=n&&n.replace(/.*(?=#[^\s]*$)/,"")),r=e(n),r.length||(r=t.parent()),r}var t="[data-toggle=dropdown]",n=function(t){var n=e(t).on("click.dropdown.data-api",this.toggle);e("html").on("click.dropdown.data-api",function(){n.parent().removeClass("open")})};n.prototype={constructor:n,toggle:function(t){var n=e(this),s,o;if(n.is(".disabled, :disabled"))return;return s=i(n),o=s.hasClass("open"),r(),o||(s.toggleClass("open"),n.focus()),!1},keydown:function(t){var n,r,s,o,u,a;if(!/(38|40|27)/.test(t.keyCode))return;n=e(this),t.preventDefault(),t.stopPropagation();if(n.is(".disabled, :disabled"))return;o=i(n),u=o.hasClass("open");if(!u||u&&t.keyCode==27)return n.click();r=e("[role=menu] li:not(.divider) a",o);if(!r.length)return;a=r.index(r.filter(":focus")),t.keyCode==38&&a>0&&a--,t.keyCode==40&&a<r.length-1&&a++,~a||(a=0),r.eq(a).focus()}},e.fn.dropdown=function(t){return this.each(function(){var r=e(this),i=r.data("dropdown");i||r.data("dropdown",i=new n(this)),typeof t=="string"&&i[t].call(r)})},e.fn.dropdown.Constructor=n,e(function(){e("html").on("click.dropdown.data-api touchstart.dropdown.data-api",r),e("body").on("click.dropdown touchstart.dropdown.data-api",".dropdown",function(e){e.stopPropagation()}).on("click.dropdown.data-api touchstart.dropdown.data-api",t,n.prototype.toggle).on("keydown.dropdown.data-api touchstart.dropdown.data-api",t+", [role=menu]",n.prototype.keydown)})}(window.jQuery),!function(e){"use strict";var t=function(t,n){this.options=n,this.$element=e(t).delegate('[data-dismiss="modal"]',"click.dismiss.modal",e.proxy(this.hide,this)),this.options.remote&&this.$element.find(".modal-body").load(this.options.remote)};t.prototype={constructor:t,toggle:function(){return this[this.isShown?"hide":"show"]()},show:function(){var t=this,n=e.Event("show");this.$element.trigger(n);if(this.isShown||n.isDefaultPrevented())return;e("body").addClass("modal-open"),this.isShown=!0,this.escape(),this.backdrop(function(){var n=e.support.transition&&t.$element.hasClass("fade");t.$element.parent().length||t.$element.appendTo(document.body),t.$element.show(),n&&t.$element[0].offsetWidth,t.$element.addClass("in").attr("aria-hidden",!1).focus(),t.enforceFocus(),n?t.$element.one(e.support.transition.end,function(){t.$element.trigger("shown")}):t.$element.trigger("shown")})},hide:function(t){t&&t.preventDefault();var n=this;t=e.Event("hide"),this.$element.trigger(t);if(!this.isShown||t.isDefaultPrevented())return;this.isShown=!1,e("body").removeClass("modal-open"),this.escape(),e(document).off("focusin.modal"),this.$element.removeClass("in").attr("aria-hidden",!0),e.support.transition&&this.$element.hasClass("fade")?this.hideWithTransition():this.hideModal()},enforceFocus:function(){var t=this;e(document).on("focusin.modal",function(e){t.$element[0]!==e.target&&!t.$element.has(e.target).length&&t.$element.focus()})},escape:function(){var e=this;this.isShown&&this.options.keyboard?this.$element.on("keyup.dismiss.modal",function(t){t.which==27&&e.hide()}):this.isShown||this.$element.off("keyup.dismiss.modal")},hideWithTransition:function(){var t=this,n=setTimeout(function(){t.$element.off(e.support.transition.end),t.hideModal()},500);this.$element.one(e.support.transition.end,function(){clearTimeout(n),t.hideModal()})},hideModal:function(e){this.$element.hide().trigger("hidden"),this.backdrop()},removeBackdrop:function(){this.$backdrop.remove(),this.$backdrop=null},backdrop:function(t){var n=this,r=this.$element.hasClass("fade")?"fade":"";if(this.isShown&&this.options.backdrop){var i=e.support.transition&&r;this.$backdrop=e('<div class="modal-backdrop '+r+'" />').appendTo(document.body),this.options.backdrop!="static"&&this.$backdrop.click(e.proxy(this.hide,this)),i&&this.$backdrop[0].offsetWidth,this.$backdrop.addClass("in"),i?this.$backdrop.one(e.support.transition.end,t):t()}else!this.isShown&&this.$backdrop?(this.$backdrop.removeClass("in"),e.support.transition&&this.$element.hasClass("fade")?this.$backdrop.one(e.support.transition.end,e.proxy(this.removeBackdrop,this)):this.removeBackdrop()):t&&t()}},e.fn.modal=function(n){return this.each(function(){var r=e(this),i=r.data("modal"),s=e.extend({},e.fn.modal.defaults,r.data(),typeof n=="object"&&n);i||r.data("modal",i=new t(this,s)),typeof n=="string"?i[n]():s.show&&i.show()})},e.fn.modal.defaults={backdrop:!0,keyboard:!0,show:!0},e.fn.modal.Constructor=t,e(function(){e("body").on("click.modal.data-api",'[data-toggle="modal"]',function(t){var n=e(this),r=n.attr("href"),i=e(n.attr("data-target")||r&&r.replace(/.*(?=#[^\s]+$)/,"")),s=i.data("modal")?"toggle":e.extend({remote:!/#/.test(r)&&r},i.data(),n.data());t.preventDefault(),i.modal(s).one("hide",function(){n.focus()})})})}(window.jQuery),!function(e){"use strict";var t=function(e,t){this.init("tooltip",e,t)};t.prototype={constructor:t,init:function(t,n,r){var i,s;this.type=t,this.$element=e(n),this.options=this.getOptions(r),this.enabled=!0,this.options.trigger=="click"?this.$element.on("click."+this.type,this.options.selector,e.proxy(this.toggle,this)):this.options.trigger!="manual"&&(i=this.options.trigger=="hover"?"mouseenter":"focus",s=this.options.trigger=="hover"?"mouseleave":"blur",this.$element.on(i+"."+this.type,this.options.selector,e.proxy(this.enter,this)),this.$element.on(s+"."+this.type,this.options.selector,e.proxy(this.leave,this))),this.options.selector?this._options=e.extend({},this.options,{trigger:"manual",selector:""}):this.fixTitle()},getOptions:function(t){return t=e.extend({},e.fn[this.type].defaults,t,this.$element.data()),t.delay&&typeof t.delay=="number"&&(t.delay={show:t.delay,hide:t.delay}),t},enter:function(t){var n=e(t.currentTarget)[this.type](this._options).data(this.type);if(!n.options.delay||!n.options.delay.show)return n.show();clearTimeout(this.timeout),n.hoverState="in",this.timeout=setTimeout(function(){n.hoverState=="in"&&n.show()},n.options.delay.show)},leave:function(t){var n=e(t.currentTarget)[this.type](this._options).data(this.type);this.timeout&&clearTimeout(this.timeout);if(!n.options.delay||!n.options.delay.hide)return n.hide();n.hoverState="out",this.timeout=setTimeout(function(){n.hoverState=="out"&&n.hide()},n.options.delay.hide)},show:function(){var e,t,n,r,i,s,o;if(this.hasContent()&&this.enabled){e=this.tip(),this.setContent(),this.options.animation&&e.addClass("fade"),s=typeof this.options.placement=="function"?this.options.placement.call(this,e[0],this.$element[0]):this.options.placement,t=/in/.test(s),e.remove().css({top:0,left:0,display:"block"}).appendTo(t?this.$element:document.body),n=this.getPosition(t),r=e[0].offsetWidth,i=e[0].offsetHeight;switch(t?s.split(" ")[1]:s){case"bottom":o={top:n.top+n.height,left:n.left+n.width/2-r/2};break;case"top":o={top:n.top-i,left:n.left+n.width/2-r/2};break;case"left":o={top:n.top+n.height/2-i/2,left:n.left-r};break;case"right":o={top:n.top+n.height/2-i/2,left:n.left+n.width}}e.css(o).addClass(s).addClass("in")}},setContent:function(){var e=this.tip(),t=this.getTitle();e.find(".tooltip-inner")[this.options.html?"html":"text"](t),e.removeClass("fade in top bottom left right")},hide:function(){function r(){var t=setTimeout(function(){n.off(e.support.transition.end).remove()},500);n.one(e.support.transition.end,function(){clearTimeout(t),n.remove()})}var t=this,n=this.tip();return n.removeClass("in"),e.support.transition&&this.$tip.hasClass("fade")?r():n.remove(),this},fixTitle:function(){var e=this.$element;(e.attr("title")||typeof e.attr("data-original-title")!="string")&&e.attr("data-original-title",e.attr("title")||"").removeAttr("title")},hasContent:function(){return this.getTitle()},getPosition:function(t){return e.extend({},t?{top:0,left:0}:this.$element.offset(),{width:this.$element[0].offsetWidth,height:this.$element[0].offsetHeight})},getTitle:function(){var e,t=this.$element,n=this.options;return e=t.attr("data-original-title")||(typeof n.title=="function"?n.title.call(t[0]):n.title),e},tip:function(){return this.$tip=this.$tip||e(this.options.template)},validate:function(){this.$element[0].parentNode||(this.hide(),this.$element=null,this.options=null)},enable:function(){this.enabled=!0},disable:function(){this.enabled=!1},toggleEnabled:function(){this.enabled=!this.enabled},toggle:function(){this[this.tip().hasClass("in")?"hide":"show"]()},destroy:function(){this.hide().$element.off("."+this.type).removeData(this.type)}},e.fn.tooltip=function(n){return this.each(function(){var r=e(this),i=r.data("tooltip"),s=typeof n=="object"&&n;i||r.data("tooltip",i=new t(this,s)),typeof n=="string"&&i[n]()})},e.fn.tooltip.Constructor=t,e.fn.tooltip.defaults={animation:!0,placement:"top",selector:!1,template:'<div class="tooltip"><div class="tooltip-arrow"></div><div class="tooltip-inner"></div></div>',trigger:"hover",title:"",delay:0,html:!0}}(window.jQuery),!function(e){"use strict";var t=function(e,t){this.init("popover",e,t)};t.prototype=e.extend({},e.fn.tooltip.Constructor.prototype,{constructor:t,setContent:function(){var e=this.tip(),t=this.getTitle(),n=this.getContent();e.find(".popover-title")[this.options.html?"html":"text"](t),e.find(".popover-content > *")[this.options.html?"html":"text"](n),e.removeClass("fade top bottom left right in")},hasContent:function(){return this.getTitle()||this.getContent()},getContent:function(){var e,t=this.$element,n=this.options;return e=t.attr("data-content")||(typeof n.content=="function"?n.content.call(t[0]):n.content),e},tip:function(){return this.$tip||(this.$tip=e(this.options.template)),this.$tip},destroy:function(){this.hide().$element.off("."+this.type).removeData(this.type)}}),e.fn.popover=function(n){return this.each(function(){var r=e(this),i=r.data("popover"),s=typeof n=="object"&&n;i||r.data("popover",i=new t(this,s)),typeof n=="string"&&i[n]()})},e.fn.popover.Constructor=t,e.fn.popover.defaults=e.extend({},e.fn.tooltip.defaults,{placement:"right",trigger:"click",content:"",template:'<div class="popover"><div class="arrow"></div><div class="popover-inner"><h3 class="popover-title"></h3><div class="popover-content"><p></p></div></div></div>'})}(window.jQuery),!function(e){"use strict";function t(t,n){var r=e.proxy(this.process,this),i=e(t).is("body")?e(window):e(t),s;this.options=e.extend({},e.fn.scrollspy.defaults,n),this.$scrollElement=i.on("scroll.scroll-spy.data-api",r),this.selector=(this.options.target||(s=e(t).attr("href"))&&s.replace(/.*(?=#[^\s]+$)/,"")||"")+" .nav li > a",this.$body=e("body"),this.refresh(),this.process()}t.prototype={constructor:t,refresh:function(){var t=this,n;this.offsets=e([]),this.targets=e([]),n=this.$body.find(this.selector).map(function(){var t=e(this),n=t.data("target")||t.attr("href"),r=/^#\w/.test(n)&&e(n);return r&&r.length&&[[r.position().top,n]]||null}).sort(function(e,t){return e[0]-t[0]}).each(function(){t.offsets.push(this[0]),t.targets.push(this[1])})},process:function(){var e=this.$scrollElement.scrollTop()+this.options.offset,t=this.$scrollElement[0].scrollHeight||this.$body[0].scrollHeight,n=t-this.$scrollElement.height(),r=this.offsets,i=this.targets,s=this.activeTarget,o;if(e>=n)return s!=(o=i.last()[0])&&this.activate(o);for(o=r.length;o--;)s!=i[o]&&e>=r[o]&&(!r[o+1]||e<=r[o+1])&&this.activate(i[o])},activate:function(t){var n,r;this.activeTarget=t,e(this.selector).parent(".active").removeClass("active"),r=this.selector+'[data-target="'+t+'"],'+this.selector+'[href="'+t+'"]',n=e(r).parent("li").addClass("active"),n.parent(".dropdown-menu").length&&(n=n.closest("li.dropdown").addClass("active")),n.trigger("activate")}},e.fn.scrollspy=function(n){return this.each(function(){var r=e(this),i=r.data("scrollspy"),s=typeof n=="object"&&n;i||r.data("scrollspy",i=new t(this,s)),typeof n=="string"&&i[n]()})},e.fn.scrollspy.Constructor=t,e.fn.scrollspy.defaults={offset:10},e(window).on("load",function(){e('[data-spy="scroll"]').each(function(){var t=e(this);t.scrollspy(t.data())})})}(window.jQuery),!function(e){"use strict";var t=function(t){this.element=e(t)};t.prototype={constructor:t,show:function(){var t=this.element,n=t.closest("ul:not(.dropdown-menu)"),r=t.attr("data-target"),i,s,o;r||(r=t.attr("href"),r=r&&r.replace(/.*(?=#[^\s]*$)/,""));if(t.parent("li").hasClass("active"))return;i=n.find(".active a").last()[0],o=e.Event("show",{relatedTarget:i}),t.trigger(o);if(o.isDefaultPrevented())return;s=e(r),this.activate(t.parent("li"),n),this.activate(s,s.parent(),function(){t.trigger({type:"shown",relatedTarget:i})})},activate:function(t,n,r){function o(){i.removeClass("active").find("> .dropdown-menu > .active").removeClass("active"),t.addClass("active"),s?(t[0].offsetWidth,t.addClass("in")):t.removeClass("fade"),t.parent(".dropdown-menu")&&t.closest("li.dropdown").addClass("active"),r&&r()}var i=n.find("> .active"),s=r&&e.support.transition&&i.hasClass("fade");s?i.one(e.support.transition.end,o):o(),i.removeClass("in")}},e.fn.tab=function(n){return this.each(function(){var r=e(this),i=r.data("tab");i||r.data("tab",i=new t(this)),typeof n=="string"&&i[n]()})},e.fn.tab.Constructor=t,e(function(){e("body").on("click.tab.data-api",'[data-toggle="tab"], [data-toggle="pill"]',function(t){t.preventDefault(),e(this).tab("show")})})}(window.jQuery),!function(e){"use strict";var t=function(t,n){this.$element=e(t),this.options=e.extend({},e.fn.typeahead.defaults,n),this.matcher=this.options.matcher||this.matcher,this.sorter=this.options.sorter||this.sorter,this.highlighter=this.options.highlighter||this.highlighter,this.updater=this.options.updater||this.updater,this.$menu=e(this.options.menu).appendTo("body"),this.source=this.options.source,this.shown=!1,this.listen()};t.prototype={constructor:t,select:function(){var e=this.$menu.find(".active").attr("data-value");return this.$element.val(this.updater(e)).change(),this.hide()},updater:function(e){return e},show:function(){var t=e.extend({},this.$element.offset(),{height:this.$element[0].offsetHeight});return this.$menu.css({top:t.top+t.height,left:t.left}),this.$menu.show(),this.shown=!0,this},hide:function(){return this.$menu.hide(),this.shown=!1,this},lookup:function(t){var n;return this.query=this.$element.val(),!this.query||this.query.length<this.options.minLength?this.shown?this.hide():this:(n=e.isFunction(this.source)?this.source(this.query,e.proxy(this.process,this)):this.source,n?this.process(n):this)},process:function(t){var n=this;return t=e.grep(t,function(e){return n.matcher(e)}),t=this.sorter(t),t.length?this.render(t.slice(0,this.options.items)).show():this.shown?this.hide():this},matcher:function(e){return~e.toLowerCase().indexOf(this.query.toLowerCase())},sorter:function(e){var t=[],n=[],r=[],i;while(i=e.shift())i.toLowerCase().indexOf(this.query.toLowerCase())?~i.indexOf(this.query)?n.push(i):r.push(i):t.push(i);return t.concat(n,r)},highlighter:function(e){var t=this.query.replace(/[\-\[\]{}()*+?.,\\\^$|#\s]/g,"\\$&");return e.replace(new RegExp("("+t+")","ig"),function(e,t){return"<strong>"+t+"</strong>"})},render:function(t){var n=this;return t=e(t).map(function(t,r){return t=e(n.options.item).attr("data-value",r),t.find("a").html(n.highlighter(r)),t[0]}),t.first().addClass("active"),this.$menu.html(t),this},next:function(t){var n=this.$menu.find(".active").removeClass("active"),r=n.next();r.length||(r=e(this.$menu.find("li")[0])),r.addClass("active")},prev:function(e){var t=this.$menu.find(".active").removeClass("active"),n=t.prev();n.length||(n=this.$menu.find("li").last()),n.addClass("active")},listen:function(){this.$element.on("blur",e.proxy(this.blur,this)).on("keypress",e.proxy(this.keypress,this)).on("keyup",e.proxy(this.keyup,this)),(e.browser.webkit||e.browser.msie)&&this.$element.on("keydown",e.proxy(this.keydown,this)),this.$menu.on("click",e.proxy(this.click,this)).on("mouseenter","li",e.proxy(this.mouseenter,this))},move:function(e){if(!this.shown)return;switch(e.keyCode){case 9:case 13:case 27:e.preventDefault();break;case 38:e.preventDefault(),this.prev();break;case 40:e.preventDefault(),this.next()}e.stopPropagation()},keydown:function(t){this.suppressKeyPressRepeat=!~e.inArray(t.keyCode,[40,38,9,13,27]),this.move(t)},keypress:function(e){if(this.suppressKeyPressRepeat)return;this.move(e)},keyup:function(e){switch(e.keyCode){case 40:case 38:break;case 9:case 13:if(!this.shown)return;this.select();break;case 27:if(!this.shown)return;this.hide();break;default:this.lookup()}e.stopPropagation(),e.preventDefault()},blur:function(e){var t=this;setTimeout(function(){t.hide()},150)},click:function(e){e.stopPropagation(),e.preventDefault(),this.select()},mouseenter:function(t){this.$menu.find(".active").removeClass("active"),e(t.currentTarget).addClass("active")}},e.fn.typeahead=function(n){return this.each(function(){var r=e(this),i=r.data("typeahead"),s=typeof n=="object"&&n;i||r.data("typeahead",i=new t(this,s)),typeof n=="string"&&i[n]()})},e.fn.typeahead.defaults={source:[],items:8,menu:'<ul class="typeahead dropdown-menu"></ul>',item:'<li><a href="#"></a></li>',minLength:1},e.fn.typeahead.Constructor=t,e(function(){e("body").on("focus.typeahead.data-api",'[data-provide="typeahead"]',function(t){var n=e(this);if(n.data("typeahead"))return;t.preventDefault(),n.typeahead(n.data())})})}(window.jQuery),!function(e){"use strict";var t=function(t,n){this.options=e.extend({},e.fn.affix.defaults,n),this.$window=e(window).on("scroll.affix.data-api",e.proxy(this.checkPosition,this)),this.$element=e(t),this.checkPosition()};t.prototype.checkPosition=function(){if(!this.$element.is(":visible"))return;var t=e(document).height(),n=this.$window.scrollTop(),r=this.$element.offset(),i=this.options.offset,s=i.bottom,o=i.top,u="affix affix-top affix-bottom",a;typeof i!="object"&&(s=o=i),typeof o=="function"&&(o=i.top()),typeof s=="function"&&(s=i.bottom()),a=this.unpin!=null&&n+this.unpin<=r.top?!1:s!=null&&r.top+this.$element.height()>=t-s?"bottom":o!=null&&n<=o?"top":!1;if(this.affixed===a)return;this.affixed=a,this.unpin=a=="bottom"?r.top-n:null,this.$element.removeClass(u).addClass("affix"+(a?"-"+a:""))},e.fn.affix=function(n){return this.each(function(){var r=e(this),i=r.data("affix"),s=typeof n=="object"&&n;i||r.data("affix",i=new t(this,s)),typeof n=="string"&&i[n]()})},e.fn.affix.Constructor=t,e.fn.affix.defaults={offset:0},e(window).on("load",function(){e('[data-spy="affix"]').each(function(){var t=e(this),n=t.data();n.offset=n.offset||{},n.offsetBottom&&(n.offset.bottom=n.offsetBottom),n.offsetTop&&(n.offset.top=n.offsetTop),t.affix(n)})})}(window.jQuery);
\ No newline at end of file
diff --git a/docs/assets/js/bootstrap.min.tmp.js b/docs/assets/js/bootstrap.min.tmp.js
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/docs/base-css.html b/docs/base-css.html
index f1401d688f33221ad663c73536d5c64321adebfa..7671d2ad6f00735158526ae44462360fdb40dad9 100644
--- a/docs/base-css.html
+++ b/docs/base-css.html
@@ -118,7 +118,7 @@
</div>
<h2 id="body-copy">Body copy</h2>
- <p>Bootstrap's global default <code>font-size</code> is <strong>14px</strong>, with a <code>line-height</code> of <strong>20px</strong>. This is applied to the <code><body></code> and all paragraphs. In addition, <code><p></code> (paragraphs) receive a bottom margin of half their line-height (9px by default).</p>
+ <p>Bootstrap's global default <code>font-size</code> is <strong>14px</strong>, with a <code>line-height</code> of <strong>20px</strong>. This is applied to the <code><body></code> and all paragraphs. In addition, <code><p></code> (paragraphs) receive a bottom margin of half their line-height (10px by default).</p>
<div class="bs-docs-example">
<p>Nullam quis risus eget urna mollis ornare vel eu leo. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Nullam id dolor id nibh ultricies vehicula.</p>
<p>Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Donec ullamcorper nulla non metus auctor fringilla. Duis mollis, est non commodo luctus, nisi erat porttitor ligula, eget lacinia odio sem nec elit. Donec ullamcorper nulla non metus auctor fringilla.</p>
@@ -233,7 +233,7 @@
<h2 id="blockquotes">Blockquotes</h2>
<p>For quoting blocks of content from another source within your document.</p>
- <h3>Default blockqoute</h3>
+ <h3>Default blockquote</h3>
<p>Wrap <code><blockquote></code> around any <abbr title="HyperText Markup Language">HTML</abbr> as the quote. For straight quotes we recommend a <code><p></code>.</p>
<div class="bs-docs-example">
<blockquote>
@@ -686,6 +686,12 @@ For example, <code><section></code> should be wrapped as inlin
</td>
<td>Indicates a dangerous or potentially negative action.</td>
</tr>
+ <tr>
+ <td>
+ <code>.warning</code>
+ </td>
+ <td>Indicates a warning that might need attention.</td>
+ </tr>
<tr>
<td>
<code>.info</code>
@@ -717,12 +723,18 @@ For example, <code><section></code> should be wrapped as inlin
<td>02/04/2012</td>
<td>Declined</td>
</tr>
- <tr class="info">
+ <tr class="warning">
<td>3</td>
<td>TB - Monthly</td>
<td>03/04/2012</td>
<td>Pending</td>
</tr>
+ <tr class="info">
+ <td>4</td>
+ <td>TB - Monthly</td>
+ <td>04/04/2012</td>
+ <td>Call in to confirm</td>
+ </tr>
</tbody>
</table>
</div>
@@ -1355,7 +1367,7 @@ For example, <code><section></code> should be wrapped as inlin
</pre>
<h3>Validation states</h3>
- <p>Bootstrap includes validation styles for error, warning, and success messages. To use, add the appropriate class to the surrounding <code>.control-group</code>.</p>
+ <p>Bootstrap includes validation styles for error, warning, info, and success messages. To use, add the appropriate class to the surrounding <code>.control-group</code>.</p>
<form class="bs-docs-example form-horizontal">
<div class="control-group warning">
@@ -1372,6 +1384,13 @@ For example, <code><section></code> should be wrapped as inlin
<span class="help-inline">Please correct the error</span>
</div>
</div>
+ <div class="control-group info">
+ <label class="control-label" for="inputError">Input with info</label>
+ <div class="controls">
+ <input type="text" id="inputError">
+ <span class="help-inline">Username is taken</span>
+ </div>
+ </div>
<div class="control-group success">
<label class="control-label" for="inputSuccess">Input with success</label>
<div class="controls">
@@ -1756,7 +1775,7 @@ For example, <code><section></code> should be wrapped as inlin
</ul>
<h3>Glyphicons attribution</h3>
- <p><a href="http://glyphicons.com/">Glyphicons</a> Halflings are normally not available for free, but an arrangement between Bootstrap and the Glyphicons creators have made this possible at not cost to you as developers. As a thank you, we ask you to include an optional link back to <a href="http://glyphicons.com/">Glyphicons</a> whenever practical.</p>
+ <p><a href="http://glyphicons.com/">Glyphicons</a> Halflings are normally not available for free, but an arrangement between Bootstrap and the Glyphicons creators have made this possible at no cost to you as developers. As a thank you, we ask you to include an optional link back to <a href="http://glyphicons.com/">Glyphicons</a> whenever practical.</p>
<hr class="bs-docs-separator">
@@ -1881,7 +1900,8 @@ For example, <code><section></code> should be wrapped as inlin
<label class="control-label" for="inputIcon">Email address</label>
<div class="controls">
<div class="input-prepend">
- <span class="add-on"><i class="icon-envelope"><i><span><input class="span2" id="inputIcon" type="text">
+ <span class="add-on"><i class="icon-envelope"></i></span>
+ <input class="span2" id="inputIcon" type="text">
</div>
</div>
</pre>
diff --git a/docs/components.html b/docs/components.html
index 828ad7be2e2d29619d842fcf36904a6518b63232..c93fc2fac9982da79400c105787f6a3fc3966385 100644
--- a/docs/components.html
+++ b/docs/components.html
@@ -1941,7 +1941,7 @@
<h3>Dismiss buttons</h3>
<p>Mobile Safari and Mobile Opera browsers, in addition to the <code>data-dismiss="alert"</code> attribute, require an <code>href="#"</code> for the dismissal of alerts when using an <code><a></code> tag.</p>
- <pre class="prettyprint linenums"><a href="#" class="close" data-dismiss="alert">×</button></pre>
+ <pre class="prettyprint linenums"><a href="#" class="close" data-dismiss="alert">×</a></pre>
<p>Alternatively, you may use a <code><button></code> element with the data attribute, which we have opted to do for our docs. When using <code><button></code>, you must include <code>type="button"</code> or your forms may not submit.</p>
<pre class="prettyprint linenums"><button type="button" class="close" data-dismiss="alert">×</button></pre>
diff --git a/docs/components/alert.html b/docs/components/alert.html
deleted file mode 100644
index 3e7d935e55db1a05d4b063cacb03fb28da7bb621..0000000000000000000000000000000000000000
--- a/docs/components/alert.html
+++ /dev/null
@@ -1,63 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
- <head>
- <meta charset="utf-8">
- <title>Bootstrap, from Twitter</title>
- <meta name="viewport" content="width=device-width, initial-scale=1.0">
- <meta name="description" content="">
- <meta name="author" content="">
-
- <!-- Le styles -->
- <link href="../assets/css/bootstrap.css" rel="stylesheet">
- <link href="../assets/css/bootstrap-responsive.css" rel="stylesheet">
-
- <!-- Le HTML5 shim, for IE6-8 support of HTML5 elements -->
- <!--[if lt IE 9]>
- <script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script>
- <![endif]-->
-
- <!-- Le fav and touch icons -->
- <link rel="shortcut icon" href="../assets/ico/favicon.ico">
- <link rel="apple-touch-icon-precomposed" sizes="144x144" href="../assets/ico/apple-touch-icon-144-precomposed.png">
- <link rel="apple-touch-icon-precomposed" sizes="114x114" href="../assets/ico/apple-touch-icon-114-precomposed.png">
- <link rel="apple-touch-icon-precomposed" sizes="72x72" href="../assets/ico/apple-touch-icon-72-precomposed.png">
- <link rel="apple-touch-icon-precomposed" href="../assets/ico/apple-touch-icon-57-precomposed.png">
- </head>
-
- <body>
-
- <div class="container">
-
-
-
- <h1>Bootstrap alert</h1>
-
- <br>
-
- <div class="alert">
- <button type="button" class="close" data-dismiss="alert">×</button>
- <strong>Warning!</strong> Best check yo self, you're not looking too good.
- </div>
-
-
- </div> <!-- /container -->
-
- <!-- Le javascript
- ================================================== -->
- <!-- Placed at the end of the document so the pages load faster -->
- <script src="../assets/js/jquery.js"></script>
- <script src="../assets/js/bootstrap-transition.js"></script>
- <script src="../assets/js/bootstrap-alert.js"></script>
- <script src="../assets/js/bootstrap-modal.js"></script>
- <script src="../assets/js/bootstrap-dropdown.js"></script>
- <script src="../assets/js/bootstrap-scrollspy.js"></script>
- <script src="../assets/js/bootstrap-tab.js"></script>
- <script src="../assets/js/bootstrap-tooltip.js"></script>
- <script src="../assets/js/bootstrap-popover.js"></script>
- <script src="../assets/js/bootstrap-button.js"></script>
- <script src="../assets/js/bootstrap-collapse.js"></script>
- <script src="../assets/js/bootstrap-carousel.js"></script>
- <script src="../assets/js/bootstrap-typeahead.js"></script>
-
- </body>
-</html>
diff --git a/docs/components/breadcrumb.html b/docs/components/breadcrumb.html
deleted file mode 100644
index 5f273442be653bee8ec76f46abf93fe16a90a4b6..0000000000000000000000000000000000000000
--- a/docs/components/breadcrumb.html
+++ /dev/null
@@ -1,66 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
- <head>
- <meta charset="utf-8">
- <title>Bootstrap, from Twitter</title>
- <meta name="viewport" content="width=device-width, initial-scale=1.0">
- <meta name="description" content="">
- <meta name="author" content="">
-
- <!-- Le styles -->
- <link href="../assets/css/bootstrap.css" rel="stylesheet">
- <link href="../assets/css/bootstrap-responsive.css" rel="stylesheet">
-
- <!-- Le HTML5 shim, for IE6-8 support of HTML5 elements -->
- <!--[if lt IE 9]>
- <script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script>
- <![endif]-->
-
- <!-- Le fav and touch icons -->
- <link rel="shortcut icon" href="../assets/ico/favicon.ico">
- <link rel="apple-touch-icon-precomposed" sizes="144x144" href="../assets/ico/apple-touch-icon-144-precomposed.png">
- <link rel="apple-touch-icon-precomposed" sizes="114x114" href="../assets/ico/apple-touch-icon-114-precomposed.png">
- <link rel="apple-touch-icon-precomposed" sizes="72x72" href="../assets/ico/apple-touch-icon-72-precomposed.png">
- <link rel="apple-touch-icon-precomposed" href="../assets/ico/apple-touch-icon-57-precomposed.png">
- </head>
-
- <body>
-
- <div class="container">
-
-
-
- <h1>Bootstrap breadcrumb</h1>
-
- <br>
-
- <ul class="breadcrumb">
- <li><a href="#">Home</a> <span class="divider">/</span></li>
- <li><a href="#">Page</a> <span class="divider">/</span></li>
- <li><a href="#">Second page</a> <span class="divider">/</span></li>
- <li class="active">Current page</li>
- </ul>
-
-
-
- </div> <!-- /container -->
-
- <!-- Le javascript
- ================================================== -->
- <!-- Placed at the end of the document so the pages load faster -->
- <script src="../assets/js/jquery.js"></script>
- <script src="../assets/js/bootstrap-transition.js"></script>
- <script src="../assets/js/bootstrap-alert.js"></script>
- <script src="../assets/js/bootstrap-modal.js"></script>
- <script src="../assets/js/bootstrap-dropdown.js"></script>
- <script src="../assets/js/bootstrap-scrollspy.js"></script>
- <script src="../assets/js/bootstrap-tab.js"></script>
- <script src="../assets/js/bootstrap-tooltip.js"></script>
- <script src="../assets/js/bootstrap-popover.js"></script>
- <script src="../assets/js/bootstrap-button.js"></script>
- <script src="../assets/js/bootstrap-collapse.js"></script>
- <script src="../assets/js/bootstrap-carousel.js"></script>
- <script src="../assets/js/bootstrap-typeahead.js"></script>
-
- </body>
-</html>
diff --git a/docs/components/button-group.html b/docs/components/button-group.html
deleted file mode 100644
index 80ee9e3910604329117de2e05c8063d1986035cc..0000000000000000000000000000000000000000
--- a/docs/components/button-group.html
+++ /dev/null
@@ -1,71 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
- <head>
- <meta charset="utf-8">
- <title>Bootstrap, from Twitter</title>
- <meta name="viewport" content="width=device-width, initial-scale=1.0">
- <meta name="description" content="">
- <meta name="author" content="">
-
- <!-- Le styles -->
- <link href="../assets/css/bootstrap.css" rel="stylesheet">
- <link href="../assets/css/bootstrap-responsive.css" rel="stylesheet">
-
- <!-- Le HTML5 shim, for IE6-8 support of HTML5 elements -->
- <!--[if lt IE 9]>
- <script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script>
- <![endif]-->
-
- <!-- Le fav and touch icons -->
- <link rel="shortcut icon" href="../assets/ico/favicon.ico">
- <link rel="apple-touch-icon-precomposed" sizes="144x144" href="../assets/ico/apple-touch-icon-144-precomposed.png">
- <link rel="apple-touch-icon-precomposed" sizes="114x114" href="../assets/ico/apple-touch-icon-114-precomposed.png">
- <link rel="apple-touch-icon-precomposed" sizes="72x72" href="../assets/ico/apple-touch-icon-72-precomposed.png">
- <link rel="apple-touch-icon-precomposed" href="../assets/ico/apple-touch-icon-57-precomposed.png">
- </head>
-
- <body>
-
- <div class="container">
-
-
-
- <h1>Bootstrap button group</h1>
-
- <div class="btn-group">
- <button type="button" class="btn">Button text</button>
- <button type="button" class="btn">Button text</button>
- <button type="button" class="btn">Button text</button>
- </div>
-
- <br>
-
- <div class="btn-group">
- <a class="btn" href="#">Link button text</a>
- <a class="btn" href="#">Link button text</a>
- <a class="btn" href="#">Link button text</a>
- </div>
-
-
-
- </div> <!-- /container -->
-
- <!-- Le javascript
- ================================================== -->
- <!-- Placed at the end of the document so the pages load faster -->
- <script src="../assets/js/jquery.js"></script>
- <script src="../assets/js/bootstrap-transition.js"></script>
- <script src="../assets/js/bootstrap-alert.js"></script>
- <script src="../assets/js/bootstrap-modal.js"></script>
- <script src="../assets/js/bootstrap-dropdown.js"></script>
- <script src="../assets/js/bootstrap-scrollspy.js"></script>
- <script src="../assets/js/bootstrap-tab.js"></script>
- <script src="../assets/js/bootstrap-tooltip.js"></script>
- <script src="../assets/js/bootstrap-popover.js"></script>
- <script src="../assets/js/bootstrap-button.js"></script>
- <script src="../assets/js/bootstrap-collapse.js"></script>
- <script src="../assets/js/bootstrap-carousel.js"></script>
- <script src="../assets/js/bootstrap-typeahead.js"></script>
-
- </body>
-</html>
diff --git a/docs/components/button.html b/docs/components/button.html
deleted file mode 100644
index 2d1569307f765330087d6313ad7f4e6313cabba2..0000000000000000000000000000000000000000
--- a/docs/components/button.html
+++ /dev/null
@@ -1,61 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
- <head>
- <meta charset="utf-8">
- <title>Bootstrap, from Twitter</title>
- <meta name="viewport" content="width=device-width, initial-scale=1.0">
- <meta name="description" content="">
- <meta name="author" content="">
-
- <!-- Le styles -->
- <link href="../assets/css/bootstrap.css" rel="stylesheet">
- <link href="../assets/css/bootstrap-responsive.css" rel="stylesheet">
-
- <!-- Le HTML5 shim, for IE6-8 support of HTML5 elements -->
- <!--[if lt IE 9]>
- <script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script>
- <![endif]-->
-
- <!-- Le fav and touch icons -->
- <link rel="shortcut icon" href="../assets/ico/favicon.ico">
- <link rel="apple-touch-icon-precomposed" sizes="144x144" href="../assets/ico/apple-touch-icon-144-precomposed.png">
- <link rel="apple-touch-icon-precomposed" sizes="114x114" href="../assets/ico/apple-touch-icon-114-precomposed.png">
- <link rel="apple-touch-icon-precomposed" sizes="72x72" href="../assets/ico/apple-touch-icon-72-precomposed.png">
- <link rel="apple-touch-icon-precomposed" href="../assets/ico/apple-touch-icon-57-precomposed.png">
- </head>
-
- <body>
-
- <div class="container">
-
-
-
- <h1>Bootstrap button</h1>
-
- <p><button type="button" class="btn">Button text</button></p>
-
- <p><a class="btn" href="#">Link button text</a></p>
-
-
-
- </div> <!-- /container -->
-
- <!-- Le javascript
- ================================================== -->
- <!-- Placed at the end of the document so the pages load faster -->
- <script src="../assets/js/jquery.js"></script>
- <script src="../assets/js/bootstrap-transition.js"></script>
- <script src="../assets/js/bootstrap-alert.js"></script>
- <script src="../assets/js/bootstrap-modal.js"></script>
- <script src="../assets/js/bootstrap-dropdown.js"></script>
- <script src="../assets/js/bootstrap-scrollspy.js"></script>
- <script src="../assets/js/bootstrap-tab.js"></script>
- <script src="../assets/js/bootstrap-tooltip.js"></script>
- <script src="../assets/js/bootstrap-popover.js"></script>
- <script src="../assets/js/bootstrap-button.js"></script>
- <script src="../assets/js/bootstrap-collapse.js"></script>
- <script src="../assets/js/bootstrap-carousel.js"></script>
- <script src="../assets/js/bootstrap-typeahead.js"></script>
-
- </body>
-</html>
diff --git a/docs/components/dropdown.html b/docs/components/dropdown.html
deleted file mode 100644
index 5ddbe6625d7c83107524d0fcfc356a061bb0bef9..0000000000000000000000000000000000000000
--- a/docs/components/dropdown.html
+++ /dev/null
@@ -1,66 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
- <head>
- <meta charset="utf-8">
- <title>Bootstrap, from Twitter</title>
- <meta name="viewport" content="width=device-width, initial-scale=1.0">
- <meta name="description" content="">
- <meta name="author" content="">
-
- <!-- Le styles -->
- <link href="../assets/css/bootstrap.css" rel="stylesheet">
- <link href="../assets/css/bootstrap-responsive.css" rel="stylesheet">
-
- <!-- Le HTML5 shim, for IE6-8 support of HTML5 elements -->
- <!--[if lt IE 9]>
- <script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script>
- <![endif]-->
-
- <!-- Le fav and touch icons -->
- <link rel="shortcut icon" href="../assets/ico/favicon.ico">
- <link rel="apple-touch-icon-precomposed" sizes="144x144" href="../assets/ico/apple-touch-icon-144-precomposed.png">
- <link rel="apple-touch-icon-precomposed" sizes="114x114" href="../assets/ico/apple-touch-icon-114-precomposed.png">
- <link rel="apple-touch-icon-precomposed" sizes="72x72" href="../assets/ico/apple-touch-icon-72-precomposed.png">
- <link rel="apple-touch-icon-precomposed" href="../assets/ico/apple-touch-icon-57-precomposed.png">
- </head>
-
- <body>
-
- <div class="container">
-
-
-
- <h1>Bootstrap dropdown</h1>
-
- <ul class="dropdown-menu" role="menu" aria-labelledby="dropdownMenu" style="display: block; position: static;">
- <li><a tabindex="-1" href="#">Action</a></li>
- <li><a tabindex="-1" href="#">Another action</a></li>
- <li><a tabindex="-1" href="#">Something else here</a></li>
- <li class="divider"></li>
- <li><a tabindex="-1" href="#">Separated link</a></li>
- </ul>
-
-
-
-
- </div> <!-- /container -->
-
- <!-- Le javascript
- ================================================== -->
- <!-- Placed at the end of the document so the pages load faster -->
- <script src="../assets/js/jquery.js"></script>
- <script src="../assets/js/bootstrap-transition.js"></script>
- <script src="../assets/js/bootstrap-alert.js"></script>
- <script src="../assets/js/bootstrap-modal.js"></script>
- <script src="../assets/js/bootstrap-dropdown.js"></script>
- <script src="../assets/js/bootstrap-scrollspy.js"></script>
- <script src="../assets/js/bootstrap-tab.js"></script>
- <script src="../assets/js/bootstrap-tooltip.js"></script>
- <script src="../assets/js/bootstrap-popover.js"></script>
- <script src="../assets/js/bootstrap-button.js"></script>
- <script src="../assets/js/bootstrap-collapse.js"></script>
- <script src="../assets/js/bootstrap-carousel.js"></script>
- <script src="../assets/js/bootstrap-typeahead.js"></script>
-
- </body>
-</html>
diff --git a/docs/components/form.html b/docs/components/form.html
deleted file mode 100644
index 0f70ccb408b6653ec526898db9ef1ab1a191dbef..0000000000000000000000000000000000000000
--- a/docs/components/form.html
+++ /dev/null
@@ -1,100 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
- <head>
- <meta charset="utf-8">
- <title>Bootstrap, from Twitter</title>
- <meta name="viewport" content="width=device-width, initial-scale=1.0">
- <meta name="description" content="">
- <meta name="author" content="">
-
- <!-- Le styles -->
- <link href="../assets/css/bootstrap.css" rel="stylesheet">
- <link href="../assets/css/bootstrap-responsive.css" rel="stylesheet">
-
- <!-- Le HTML5 shim, for IE6-8 support of HTML5 elements -->
- <!--[if lt IE 9]>
- <script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script>
- <![endif]-->
-
- <!-- Le fav and touch icons -->
- <link rel="shortcut icon" href="../assets/ico/favicon.ico">
- <link rel="apple-touch-icon-precomposed" sizes="144x144" href="../assets/ico/apple-touch-icon-144-precomposed.png">
- <link rel="apple-touch-icon-precomposed" sizes="114x114" href="../assets/ico/apple-touch-icon-114-precomposed.png">
- <link rel="apple-touch-icon-precomposed" sizes="72x72" href="../assets/ico/apple-touch-icon-72-precomposed.png">
- <link rel="apple-touch-icon-precomposed" href="../assets/ico/apple-touch-icon-57-precomposed.png">
- </head>
-
- <body>
-
- <div class="container">
-
-
-
- <h1>Bootstrap form</h1>
-
- <form class="horizontal-form">
- <div class="control-group">
- <label class="control-label" for="">Email</label>
- <div class="controls">
- <input type="text" placeholder="Email">
- </div>
- </div>
- <div class="control-group">
- <label class="control-label" for="">Password</label>
- <div class="controls">
- <input type="password" placeholder="Password">
- </div>
- </div>
- <div class="control-group">
- <label class="control-label" for="">Checkbox</label>
- <div class="controls">
- <label class="checkbox">
- <input type="checkbox" value="">
- Option one is this and that—be sure to include why it's great
- </label>
- </div>
- </div>
- <div class="control-group">
- <label class="control-label" for="">Radios</label>
- <div class="controls">
- <label class="radio">
- <input type="radio" name="optionsRadios" id="optionsRadios1" value="option1" checked>
- Option one is this and that—be sure to include why it's great
- </label>
- <label class="radio">
- <input type="radio" name="optionsRadios" id="optionsRadios2" value="option2">
- Option two can be something else and selecting it will deselect option one
- </label>
- </div>
- </div>
- <div class="control-group">
- <div class="controls">
- <button type="submit" class="btn">Form action</button>
- </div>
- </div>
- </form>
-
-
-
-
- </div> <!-- /container -->
-
- <!-- Le javascript
- ================================================== -->
- <!-- Placed at the end of the document so the pages load faster -->
- <script src="../assets/js/jquery.js"></script>
- <script src="../assets/js/bootstrap-transition.js"></script>
- <script src="../assets/js/bootstrap-alert.js"></script>
- <script src="../assets/js/bootstrap-modal.js"></script>
- <script src="../assets/js/bootstrap-dropdown.js"></script>
- <script src="../assets/js/bootstrap-scrollspy.js"></script>
- <script src="../assets/js/bootstrap-tab.js"></script>
- <script src="../assets/js/bootstrap-tooltip.js"></script>
- <script src="../assets/js/bootstrap-popover.js"></script>
- <script src="../assets/js/bootstrap-button.js"></script>
- <script src="../assets/js/bootstrap-collapse.js"></script>
- <script src="../assets/js/bootstrap-carousel.js"></script>
- <script src="../assets/js/bootstrap-typeahead.js"></script>
-
- </body>
-</html>
diff --git a/docs/components/icon.html b/docs/components/icon.html
deleted file mode 100644
index 473492269a7eebeb74901d1fb0a7f22a8749f205..0000000000000000000000000000000000000000
--- a/docs/components/icon.html
+++ /dev/null
@@ -1,60 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
- <head>
- <meta charset="utf-8">
- <title>Bootstrap, from Twitter</title>
- <meta name="viewport" content="width=device-width, initial-scale=1.0">
- <meta name="description" content="">
- <meta name="author" content="">
-
- <!-- Le styles -->
- <link href="../assets/css/bootstrap.css" rel="stylesheet">
- <link href="../assets/css/bootstrap-responsive.css" rel="stylesheet">
-
- <!-- Le HTML5 shim, for IE6-8 support of HTML5 elements -->
- <!--[if lt IE 9]>
- <script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script>
- <![endif]-->
-
- <!-- Le fav and touch icons -->
- <link rel="shortcut icon" href="../assets/ico/favicon.ico">
- <link rel="apple-touch-icon-precomposed" sizes="144x144" href="../assets/ico/apple-touch-icon-144-precomposed.png">
- <link rel="apple-touch-icon-precomposed" sizes="114x114" href="../assets/ico/apple-touch-icon-114-precomposed.png">
- <link rel="apple-touch-icon-precomposed" sizes="72x72" href="../assets/ico/apple-touch-icon-72-precomposed.png">
- <link rel="apple-touch-icon-precomposed" href="../assets/ico/apple-touch-icon-57-precomposed.png">
- </head>
-
- <body>
-
- <div class="container">
-
-
-
- <h1>Bootstrap form</h1>
-
- <p><i class="icon-ok"></i> Praesent commodo cursus magna, vel scelerisque nisl consectetur et.</p>
-
-
-
-
- </div> <!-- /container -->
-
- <!-- Le javascript
- ================================================== -->
- <!-- Placed at the end of the document so the pages load faster -->
- <script src="../assets/js/jquery.js"></script>
- <script src="../assets/js/bootstrap-transition.js"></script>
- <script src="../assets/js/bootstrap-alert.js"></script>
- <script src="../assets/js/bootstrap-modal.js"></script>
- <script src="../assets/js/bootstrap-dropdown.js"></script>
- <script src="../assets/js/bootstrap-scrollspy.js"></script>
- <script src="../assets/js/bootstrap-tab.js"></script>
- <script src="../assets/js/bootstrap-tooltip.js"></script>
- <script src="../assets/js/bootstrap-popover.js"></script>
- <script src="../assets/js/bootstrap-button.js"></script>
- <script src="../assets/js/bootstrap-collapse.js"></script>
- <script src="../assets/js/bootstrap-carousel.js"></script>
- <script src="../assets/js/bootstrap-typeahead.js"></script>
-
- </body>
-</html>
diff --git a/docs/components/modal.html b/docs/components/modal.html
deleted file mode 100644
index 04aaa771b448e59eb5b215c61e9212b0b83bee64..0000000000000000000000000000000000000000
--- a/docs/components/modal.html
+++ /dev/null
@@ -1,72 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
- <head>
- <meta charset="utf-8">
- <title>Bootstrap, from Twitter</title>
- <meta name="viewport" content="width=device-width, initial-scale=1.0">
- <meta name="description" content="">
- <meta name="author" content="">
-
- <!-- Le styles -->
- <link href="../assets/css/bootstrap.css" rel="stylesheet">
- <link href="../assets/css/bootstrap-responsive.css" rel="stylesheet">
-
- <!-- Le HTML5 shim, for IE6-8 support of HTML5 elements -->
- <!--[if lt IE 9]>
- <script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script>
- <![endif]-->
-
- <!-- Le fav and touch icons -->
- <link rel="shortcut icon" href="../assets/ico/favicon.ico">
- <link rel="apple-touch-icon-precomposed" sizes="144x144" href="../assets/ico/apple-touch-icon-144-precomposed.png">
- <link rel="apple-touch-icon-precomposed" sizes="114x114" href="../assets/ico/apple-touch-icon-114-precomposed.png">
- <link rel="apple-touch-icon-precomposed" sizes="72x72" href="../assets/ico/apple-touch-icon-72-precomposed.png">
- <link rel="apple-touch-icon-precomposed" href="../assets/ico/apple-touch-icon-57-precomposed.png">
- </head>
-
- <body>
-
- <div class="container">
-
-
-
- <h1>Bootstrap modal</h1>
-
- <br>
-
- <div class="modal" style="position: relative; top: auto; left: auto; margin: 0 auto 20px; z-index: 1; max-width: 100%;">
- <div class="modal-header">
- <button type="button" class="close" data-dismiss="modal">×</button>
- <h3>Modal header</h3>
- </div>
- <div class="modal-body">
- <p>One fine body...</p>
- </div>
- <div class="modal-footer">
- <a href="#" class="btn">Close</a>
- <a href="#" class="btn btn-primary">Save changes</a>
- </div>
- </div>
-
-
- </div> <!-- /container -->
-
- <!-- Le javascript
- ================================================== -->
- <!-- Placed at the end of the document so the pages load faster -->
- <script src="../assets/js/jquery.js"></script>
- <script src="../assets/js/bootstrap-transition.js"></script>
- <script src="../assets/js/bootstrap-alert.js"></script>
- <script src="../assets/js/bootstrap-modal.js"></script>
- <script src="../assets/js/bootstrap-dropdown.js"></script>
- <script src="../assets/js/bootstrap-scrollspy.js"></script>
- <script src="../assets/js/bootstrap-tab.js"></script>
- <script src="../assets/js/bootstrap-tooltip.js"></script>
- <script src="../assets/js/bootstrap-popover.js"></script>
- <script src="../assets/js/bootstrap-button.js"></script>
- <script src="../assets/js/bootstrap-collapse.js"></script>
- <script src="../assets/js/bootstrap-carousel.js"></script>
- <script src="../assets/js/bootstrap-typeahead.js"></script>
-
- </body>
-</html>
diff --git a/docs/components/nav.html b/docs/components/nav.html
deleted file mode 100644
index a58aa449e1008b440e93d81466d45712d3e74894..0000000000000000000000000000000000000000
--- a/docs/components/nav.html
+++ /dev/null
@@ -1,77 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
- <head>
- <meta charset="utf-8">
- <title>Bootstrap, from Twitter</title>
- <meta name="viewport" content="width=device-width, initial-scale=1.0">
- <meta name="description" content="">
- <meta name="author" content="">
-
- <!-- Le styles -->
- <link href="../assets/css/bootstrap.css" rel="stylesheet">
- <link href="../assets/css/bootstrap-responsive.css" rel="stylesheet">
-
- <!-- Le HTML5 shim, for IE6-8 support of HTML5 elements -->
- <!--[if lt IE 9]>
- <script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script>
- <![endif]-->
-
- <!-- Le fav and touch icons -->
- <link rel="shortcut icon" href="../assets/ico/favicon.ico">
- <link rel="apple-touch-icon-precomposed" sizes="144x144" href="../assets/ico/apple-touch-icon-144-precomposed.png">
- <link rel="apple-touch-icon-precomposed" sizes="114x114" href="../assets/ico/apple-touch-icon-114-precomposed.png">
- <link rel="apple-touch-icon-precomposed" sizes="72x72" href="../assets/ico/apple-touch-icon-72-precomposed.png">
- <link rel="apple-touch-icon-precomposed" href="../assets/ico/apple-touch-icon-57-precomposed.png">
- </head>
-
- <body>
-
- <div class="container">
-
-
-
- <h1>Bootstrap nav</h1>
-
- <br>
-
- <ul class="nav nav-tabs">
- <li class="active"><a href="#">Nav link</a></li>
- <li><a href="#">Nav link</a></li>
- <li><a href="#">Nav link</a></li>
- <li><a href="#">Nav link</a></li>
- <li><a href="#">Nav link</a></li>
- </ul>
-
- <br>
-
- <ul class="nav nav-pills">
- <li class="active"><a href="#">Nav link</a></li>
- <li><a href="#">Nav link</a></li>
- <li><a href="#">Nav link</a></li>
- <li><a href="#">Nav link</a></li>
- <li><a href="#">Nav link</a></li>
- </ul>
-
-
-
- </div> <!-- /container -->
-
- <!-- Le javascript
- ================================================== -->
- <!-- Placed at the end of the document so the pages load faster -->
- <script src="../assets/js/jquery.js"></script>
- <script src="../assets/js/bootstrap-transition.js"></script>
- <script src="../assets/js/bootstrap-alert.js"></script>
- <script src="../assets/js/bootstrap-modal.js"></script>
- <script src="../assets/js/bootstrap-dropdown.js"></script>
- <script src="../assets/js/bootstrap-scrollspy.js"></script>
- <script src="../assets/js/bootstrap-tab.js"></script>
- <script src="../assets/js/bootstrap-tooltip.js"></script>
- <script src="../assets/js/bootstrap-popover.js"></script>
- <script src="../assets/js/bootstrap-button.js"></script>
- <script src="../assets/js/bootstrap-collapse.js"></script>
- <script src="../assets/js/bootstrap-carousel.js"></script>
- <script src="../assets/js/bootstrap-typeahead.js"></script>
-
- </body>
-</html>
diff --git a/docs/components/pagination.html b/docs/components/pagination.html
deleted file mode 100644
index ef56df2eaa8e5c06f393a80990f72e77e38d77d4..0000000000000000000000000000000000000000
--- a/docs/components/pagination.html
+++ /dev/null
@@ -1,70 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
- <head>
- <meta charset="utf-8">
- <title>Bootstrap, from Twitter</title>
- <meta name="viewport" content="width=device-width, initial-scale=1.0">
- <meta name="description" content="">
- <meta name="author" content="">
-
- <!-- Le styles -->
- <link href="../assets/css/bootstrap.css" rel="stylesheet">
- <link href="../assets/css/bootstrap-responsive.css" rel="stylesheet">
-
- <!-- Le HTML5 shim, for IE6-8 support of HTML5 elements -->
- <!--[if lt IE 9]>
- <script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script>
- <![endif]-->
-
- <!-- Le fav and touch icons -->
- <link rel="shortcut icon" href="../assets/ico/favicon.ico">
- <link rel="apple-touch-icon-precomposed" sizes="144x144" href="../assets/ico/apple-touch-icon-144-precomposed.png">
- <link rel="apple-touch-icon-precomposed" sizes="114x114" href="../assets/ico/apple-touch-icon-114-precomposed.png">
- <link rel="apple-touch-icon-precomposed" sizes="72x72" href="../assets/ico/apple-touch-icon-72-precomposed.png">
- <link rel="apple-touch-icon-precomposed" href="../assets/ico/apple-touch-icon-57-precomposed.png">
- </head>
-
- <body>
-
- <div class="container">
-
-
-
- <h1>Bootstrap breadcrumb</h1>
-
- <br>
-
- <div class="pagination">
- <ul>
- <li class="disabled"><a href="#">«</a></li>
- <li class="active"><a href="#">1</a></li>
- <li><a href="#">2</a></li>
- <li><a href="#">3</a></li>
- <li><a href="#">4</a></li>
- <li><a href="#">5</a></li>
- <li><a href="#">»</a></li>
- </ul>
- </div>
-
-
- </div> <!-- /container -->
-
- <!-- Le javascript
- ================================================== -->
- <!-- Placed at the end of the document so the pages load faster -->
- <script src="../assets/js/jquery.js"></script>
- <script src="../assets/js/bootstrap-transition.js"></script>
- <script src="../assets/js/bootstrap-alert.js"></script>
- <script src="../assets/js/bootstrap-modal.js"></script>
- <script src="../assets/js/bootstrap-dropdown.js"></script>
- <script src="../assets/js/bootstrap-scrollspy.js"></script>
- <script src="../assets/js/bootstrap-tab.js"></script>
- <script src="../assets/js/bootstrap-tooltip.js"></script>
- <script src="../assets/js/bootstrap-popover.js"></script>
- <script src="../assets/js/bootstrap-button.js"></script>
- <script src="../assets/js/bootstrap-collapse.js"></script>
- <script src="../assets/js/bootstrap-carousel.js"></script>
- <script src="../assets/js/bootstrap-typeahead.js"></script>
-
- </body>
-</html>
diff --git a/docs/components/popover.html b/docs/components/popover.html
deleted file mode 100644
index 4b73f395dcf6ade612373ee7c80dfa31a936f039..0000000000000000000000000000000000000000
--- a/docs/components/popover.html
+++ /dev/null
@@ -1,62 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
- <head>
- <meta charset="utf-8">
- <title>Bootstrap, from Twitter</title>
- <meta name="viewport" content="width=device-width, initial-scale=1.0">
- <meta name="description" content="">
- <meta name="author" content="">
-
- <!-- Le styles -->
- <link href="../assets/css/bootstrap.css" rel="stylesheet">
- <link href="../assets/css/bootstrap-responsive.css" rel="stylesheet">
-
- <!-- Le HTML5 shim, for IE6-8 support of HTML5 elements -->
- <!--[if lt IE 9]>
- <script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script>
- <![endif]-->
-
- <!-- Le fav and touch icons -->
- <link rel="shortcut icon" href="../assets/ico/favicon.ico">
- <link rel="apple-touch-icon-precomposed" sizes="144x144" href="../assets/ico/apple-touch-icon-144-precomposed.png">
- <link rel="apple-touch-icon-precomposed" sizes="114x114" href="../assets/ico/apple-touch-icon-114-precomposed.png">
- <link rel="apple-touch-icon-precomposed" sizes="72x72" href="../assets/ico/apple-touch-icon-72-precomposed.png">
- <link rel="apple-touch-icon-precomposed" href="../assets/ico/apple-touch-icon-57-precomposed.png">
- </head>
-
- <body>
-
- <div class="container">
-
-
-
- <h1>Bootstrap popover</h1>
-
- <br>
-
- <a href="#" class="btn btn-large btn-danger" rel="popover" title="A Title" data-content="And here's some amazing content. It's very engaging. right?">Hover for popover</a>
-
-
-
-
- </div> <!-- /container -->
-
- <!-- Le javascript
- ================================================== -->
- <!-- Placed at the end of the document so the pages load faster -->
- <script src="../assets/js/jquery.js"></script>
- <script src="../assets/js/bootstrap-transition.js"></script>
- <script src="../assets/js/bootstrap-alert.js"></script>
- <script src="../assets/js/bootstrap-modal.js"></script>
- <script src="../assets/js/bootstrap-dropdown.js"></script>
- <script src="../assets/js/bootstrap-scrollspy.js"></script>
- <script src="../assets/js/bootstrap-tab.js"></script>
- <script src="../assets/js/bootstrap-tooltip.js"></script>
- <script src="../assets/js/bootstrap-popover.js"></script>
- <script src="../assets/js/bootstrap-button.js"></script>
- <script src="../assets/js/bootstrap-collapse.js"></script>
- <script src="../assets/js/bootstrap-carousel.js"></script>
- <script src="../assets/js/bootstrap-typeahead.js"></script>
-
- </body>
-</html>
diff --git a/docs/components/progress-bar.html b/docs/components/progress-bar.html
deleted file mode 100644
index 69204e6be6b9194495edd28ed58c6c5b2292e477..0000000000000000000000000000000000000000
--- a/docs/components/progress-bar.html
+++ /dev/null
@@ -1,62 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
- <head>
- <meta charset="utf-8">
- <title>Bootstrap, from Twitter</title>
- <meta name="viewport" content="width=device-width, initial-scale=1.0">
- <meta name="description" content="">
- <meta name="author" content="">
-
- <!-- Le styles -->
- <link href="../assets/css/bootstrap.css" rel="stylesheet">
- <link href="../assets/css/bootstrap-responsive.css" rel="stylesheet">
-
- <!-- Le HTML5 shim, for IE6-8 support of HTML5 elements -->
- <!--[if lt IE 9]>
- <script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script>
- <![endif]-->
-
- <!-- Le fav and touch icons -->
- <link rel="shortcut icon" href="../assets/ico/favicon.ico">
- <link rel="apple-touch-icon-precomposed" sizes="144x144" href="../assets/ico/apple-touch-icon-144-precomposed.png">
- <link rel="apple-touch-icon-precomposed" sizes="114x114" href="../assets/ico/apple-touch-icon-114-precomposed.png">
- <link rel="apple-touch-icon-precomposed" sizes="72x72" href="../assets/ico/apple-touch-icon-72-precomposed.png">
- <link rel="apple-touch-icon-precomposed" href="../assets/ico/apple-touch-icon-57-precomposed.png">
- </head>
-
- <body>
-
- <div class="container">
-
-
-
- <h1>Bootstrap progress bar</h1>
-
- <br>
-
- <div class="progress">
- <div class="bar" style="width: 60%;"></div>
- </div>
-
-
- </div> <!-- /container -->
-
- <!-- Le javascript
- ================================================== -->
- <!-- Placed at the end of the document so the pages load faster -->
- <script src="../assets/js/jquery.js"></script>
- <script src="../assets/js/bootstrap-transition.js"></script>
- <script src="../assets/js/bootstrap-alert.js"></script>
- <script src="../assets/js/bootstrap-modal.js"></script>
- <script src="../assets/js/bootstrap-dropdown.js"></script>
- <script src="../assets/js/bootstrap-scrollspy.js"></script>
- <script src="../assets/js/bootstrap-tab.js"></script>
- <script src="../assets/js/bootstrap-tooltip.js"></script>
- <script src="../assets/js/bootstrap-popover.js"></script>
- <script src="../assets/js/bootstrap-button.js"></script>
- <script src="../assets/js/bootstrap-collapse.js"></script>
- <script src="../assets/js/bootstrap-carousel.js"></script>
- <script src="../assets/js/bootstrap-typeahead.js"></script>
-
- </body>
-</html>
diff --git a/docs/components/table.html b/docs/components/table.html
deleted file mode 100644
index a3c898270c8106a2e9004079fbaa46f582562910..0000000000000000000000000000000000000000
--- a/docs/components/table.html
+++ /dev/null
@@ -1,89 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
- <head>
- <meta charset="utf-8">
- <title>Bootstrap, from Twitter</title>
- <meta name="viewport" content="width=device-width, initial-scale=1.0">
- <meta name="description" content="">
- <meta name="author" content="">
-
- <!-- Le styles -->
- <link href="../assets/css/bootstrap.css" rel="stylesheet">
- <link href="../assets/css/bootstrap-responsive.css" rel="stylesheet">
-
- <!-- Le HTML5 shim, for IE6-8 support of HTML5 elements -->
- <!--[if lt IE 9]>
- <script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script>
- <![endif]-->
-
- <!-- Le fav and touch icons -->
- <link rel="shortcut icon" href="../assets/ico/favicon.ico">
- <link rel="apple-touch-icon-precomposed" sizes="144x144" href="../assets/ico/apple-touch-icon-144-precomposed.png">
- <link rel="apple-touch-icon-precomposed" sizes="114x114" href="../assets/ico/apple-touch-icon-114-precomposed.png">
- <link rel="apple-touch-icon-precomposed" sizes="72x72" href="../assets/ico/apple-touch-icon-72-precomposed.png">
- <link rel="apple-touch-icon-precomposed" href="../assets/ico/apple-touch-icon-57-precomposed.png">
- </head>
-
- <body>
-
- <div class="container">
-
-
-
- <h1>Bootstrap form</h1>
-
- <table class="table">
- <thead>
- <tr>
- <th>#</th>
- <th>First Name</th>
- <th>Last Name</th>
- <th>Username</th>
- </tr>
- </thead>
- <tbody>
- <tr>
- <td>1</td>
- <td>Mark</td>
- <td>Otto</td>
- <td>@mdo</td>
- </tr>
- <tr>
- <td>2</td>
- <td>Jacob</td>
- <td>Thornton</td>
- <td>@fat</td>
- </tr>
- <tr>
- <td>3</td>
- <td>Larry</td>
- <td>the Bird</td>
- <td>@twitter</td>
- </tr>
- </tbody>
- </table>
-
-
-
-
- </div> <!-- /container -->
-
- <!-- Le javascript
- ================================================== -->
- <!-- Placed at the end of the document so the pages load faster -->
- <script src="../assets/js/jquery.js"></script>
- <script src="../assets/js/bootstrap-transition.js"></script>
- <script src="../assets/js/bootstrap-alert.js"></script>
- <script src="../assets/js/bootstrap-modal.js"></script>
- <script src="../assets/js/bootstrap-dropdown.js"></script>
- <script src="../assets/js/bootstrap-scrollspy.js"></script>
- <script src="../assets/js/bootstrap-tab.js"></script>
- <script src="../assets/js/bootstrap-tooltip.js"></script>
- <script src="../assets/js/bootstrap-popover.js"></script>
- <script src="../assets/js/bootstrap-button.js"></script>
- <script src="../assets/js/bootstrap-collapse.js"></script>
- <script src="../assets/js/bootstrap-carousel.js"></script>
- <script src="../assets/js/bootstrap-typeahead.js"></script>
-
- </body>
-</html>
diff --git a/docs/components/tooltip.html b/docs/components/tooltip.html
deleted file mode 100644
index afbaa9fad97526d9abe85736d7e6f9db365ddd59..0000000000000000000000000000000000000000
--- a/docs/components/tooltip.html
+++ /dev/null
@@ -1,62 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
- <head>
- <meta charset="utf-8">
- <title>Bootstrap, from Twitter</title>
- <meta name="viewport" content="width=device-width, initial-scale=1.0">
- <meta name="description" content="">
- <meta name="author" content="">
-
- <!-- Le styles -->
- <link href="../assets/css/bootstrap.css" rel="stylesheet">
- <link href="../assets/css/bootstrap-responsive.css" rel="stylesheet">
-
- <!-- Le HTML5 shim, for IE6-8 support of HTML5 elements -->
- <!--[if lt IE 9]>
- <script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script>
- <![endif]-->
-
- <!-- Le fav and touch icons -->
- <link rel="shortcut icon" href="../assets/ico/favicon.ico">
- <link rel="apple-touch-icon-precomposed" sizes="144x144" href="../assets/ico/apple-touch-icon-144-precomposed.png">
- <link rel="apple-touch-icon-precomposed" sizes="114x114" href="../assets/ico/apple-touch-icon-114-precomposed.png">
- <link rel="apple-touch-icon-precomposed" sizes="72x72" href="../assets/ico/apple-touch-icon-72-precomposed.png">
- <link rel="apple-touch-icon-precomposed" href="../assets/ico/apple-touch-icon-57-precomposed.png">
- </head>
-
- <body>
-
- <div class="container">
-
-
-
- <h1>Bootstrap tooltip</h1>
-
- <br>
-
- <p>Tight pants next level keffiyeh <a href="#" rel="tooltip" title="Default tooltip">you probably</a> haven't heard of them. Photo booth beard raw denim letterpress vegan messenger bag stumptown.</p>
-
-
-
-
- </div> <!-- /container -->
-
- <!-- Le javascript
- ================================================== -->
- <!-- Placed at the end of the document so the pages load faster -->
- <script src="../assets/js/jquery.js"></script>
- <script src="../assets/js/bootstrap-transition.js"></script>
- <script src="../assets/js/bootstrap-alert.js"></script>
- <script src="../assets/js/bootstrap-modal.js"></script>
- <script src="../assets/js/bootstrap-dropdown.js"></script>
- <script src="../assets/js/bootstrap-scrollspy.js"></script>
- <script src="../assets/js/bootstrap-tab.js"></script>
- <script src="../assets/js/bootstrap-tooltip.js"></script>
- <script src="../assets/js/bootstrap-popover.js"></script>
- <script src="../assets/js/bootstrap-button.js"></script>
- <script src="../assets/js/bootstrap-collapse.js"></script>
- <script src="../assets/js/bootstrap-carousel.js"></script>
- <script src="../assets/js/bootstrap-typeahead.js"></script>
-
- </body>
-</html>
diff --git a/docs/getting-started.html b/docs/getting-started.html
index 952c246548a073cef2087847d7c7781690345005..78756ee75597487885db2fc26c340d277794929f 100644
--- a/docs/getting-started.html
+++ b/docs/getting-started.html
@@ -74,7 +74,7 @@
<header class="jumbotron subhead" id="overview">
<div class="container">
<h1>Getting started</h1>
- <p class="lead">Overview of the project, it's contents, and how to get started with a simple template.</p>
+ <p class="lead">Overview of the project, its contents, and how to get started with a simple template.</p>
</div>
</header>
@@ -114,7 +114,7 @@
</div>
<div class="span6">
<h2>Download source</h2>
- <p>Get the original files for all CSS and Javasript, along with a local copy of the docs by downloading the latest version directly from GitHub.</p>
+ <p>Get the original files for all CSS and JavaScript, along with a local copy of the docs by downloading the latest version directly from GitHub.</p>
<p><a class="btn btn-large" href="https://github.com/twitter/bootstrap/zipball/master" >Download Bootstrap source</a></p>
</div>
</div>
diff --git a/docs/index.html b/docs/index.html
index 74a45aa6dfd561241dff4a92140008e7ead91f89..c6103995462b1ca54a9c2315f9f047956033c3d0 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -77,7 +77,7 @@
<ul class="masthead-links">
<li><a href="http://github.com/twitter/bootstrap" >GitHub project</a></li>
<li><a href="./extend.html" >Extend</a></li>
- <li>Version 2.1.0</li>
+ <li>Version 2.1.1</li>
</ul>
</div>
</div>
diff --git a/docs/javascript.html b/docs/javascript.html
index f6c8c428b0dcd4e51f1bd236b53a7e65b30b0f67..5ee75ab64d00216db541c03982a01f5e5c24f4ea 100644
--- a/docs/javascript.html
+++ b/docs/javascript.html
@@ -376,7 +376,7 @@ $('#myModal').on('hidden', function () {
- <!-- Dropdown
+ <!-- Dropdowns
================================================== -->
<section id="dropdowns">
<div class="page-header">
@@ -430,7 +430,7 @@ $('#myModal').on('hidden', function () {
</div>
</div>
</div> <!-- /navbar-example -->
- </div>
+ </div>
<h3>Within tabs</h3>
<div class="bs-docs-example">
@@ -467,7 +467,7 @@ $('#myModal').on('hidden', function () {
</ul>
</li>
</ul> <!-- /tabs -->
- </div>
+ </div>
<hr class="bs-docs-separator">
@@ -479,7 +479,7 @@ $('#myModal').on('hidden', function () {
<p>Add <code>data-toggle="dropdown"</code> to a link or button to toggle a dropdown.</p>
<pre class="prettyprint linenums">
<div class="dropdown">
- <a class="dropdown-toggle" href="#">Dropdown trigger</a>
+ <a class="dropdown-toggle" data-toggle="dropdown" href="#">Dropdown trigger</a>
<ul class="dropdown-menu" role="menu" aria-labelledby="dLabel">
...
</ul>
@@ -925,6 +925,53 @@ $('a[data-toggle="tab"]').on('shown', function (e) {
<a href="#" class="btn btn-large btn-danger" rel="popover" title="A Title" data-content="And here's some amazing content. It's very engaging. right?">Click to toggle popover</a>
</div>
+ <h3>Dynamic popover</h3>
+ <p>Add a <code>.dynamic</code> class to your popovers and you can control the width and color of both the inner arrow and the arrow border.</p>
+ <pre class="prettyprint linenums">
+.popover.dynamic {
+ &.top {
+ .arrow:before { #popoverArrowDynamic > .top-outer-arrow(@popoverArrowWidth, @dynamicPopoverOuterWidth, @popoverArrowOuterColor); }
+ .arrow:after { #popoverArrowDynamic > .top-inner-arrow(@popoverArrowWidth, @color); }
+ }
+}
+ </pre>
+ <div class="bs-docs-example bs-docs-example-popover">
+ <div class="popover dynamic top">
+ <div class="arrow"></div>
+ <h3 class="popover-title">Popover top</h3>
+ <div class="popover-content">
+ <p>Sed posuere consectetur est at lobortis. Aenean eu leo quam. Pellentesque ornare sem lacinia quam venenatis vestibulum.</p>
+ </div>
+ </div>
+
+ <div class="popover dynamic right">
+ <div class="arrow"></div>
+ <h3 class="popover-title">Popover right</h3>
+ <div class="popover-content">
+ <p>Sed posuere consectetur est at lobortis. Aenean eu leo quam. Pellentesque ornare sem lacinia quam venenatis vestibulum.</p>
+ </div>
+ </div>
+
+ <div class="popover dynamic bottom">
+ <div class="arrow"></div>
+ <h3 class="popover-title">Popover bottom</h3>
+ <div class="popover-content">
+ <p>Sed posuere consectetur est at lobortis. Aenean eu leo quam. Pellentesque ornare sem lacinia quam venenatis vestibulum.</p>
+ </div>
+ </div>
+
+ <div class="popover dynamic left">
+ <div class="arrow"></div>
+ <h3 class="popover-title">Popover left</h3>
+ <div class="popover-content">
+ <p>Sed posuere consectetur est at lobortis. Aenean eu leo quam. Pellentesque ornare sem lacinia quam venenatis vestibulum.</p>
+ </div>
+ </div>
+
+ <div class="clearfix"></div>
+ </div>
+
+
<hr class="bs-docs-separator">
@@ -1606,7 +1653,7 @@ $('.carousel').carousel({
<h3>Via data attributes</h3>
<p>To easily add affix behavior to any element, just add <code>data-spy="affix"</code> to the element you want to spy on. Then use offsets to define when to toggle the pinning of an element on and off.</p>
- <pre class="prettyprint linenums"><div data-spy="affix" data-offset-top="200">...</body></pre>
+ <pre class="prettyprint linenums"><div data-spy="affix" data-offset-top="200">...</div></pre>
<div class="alert alert-info">
<strong>Heads up!</strong>
diff --git a/docs/scaffolding.html b/docs/scaffolding.html
index a8edd1705b1ed6b73ded742f9f5730412f54fdd5..a78b1b5b47216e369b746a29a821ca0a9ca9bcdb 100644
--- a/docs/scaffolding.html
+++ b/docs/scaffolding.html
@@ -117,7 +117,7 @@
<ul>
<li>Remove <code>margin</code> on the body</li>
<li>Set <code>background-color: white;</code> on the <code>body</code></li>
- <li>Use the <code>@baseFontFamily</code>, <code>@baseFontSize</code>, and <code>@baseLineHeight</code> attributes as our typographyic base</li>
+ <li>Use the <code>@baseFontFamily</code>, <code>@baseFontSize</code>, and <code>@baseLineHeight</code> attributes as our typographic base</li>
<li>Set the global link color via <code>@linkColor</code> and apply link underlines only on <code>:hover</code></li>
</ul>
<p>These styles can be found within <strong>scaffolding.less</strong>.</p>
@@ -138,7 +138,7 @@
</div>
<h2>Live grid example</h2>
- <p>The default Bootstrap grid system utilizes <strong>12 columns</strong>, making for a 940px wide container without <a href="#responsive">responsive features</a> enabled. With the responsive CSS file added, the grid adapts to be 724px and 1170px wide depending on your viewport. Below 767px viewports, the columns become fluid and stack vertically.</p>
+ <p>The default Bootstrap grid system utilizes <strong>12 columns</strong>, making for a 940px wide container without <a href="./scaffolding.html#responsive">responsive features</a> enabled. With the responsive CSS file added, the grid adapts to be 724px and 1170px wide depending on your viewport. Below 767px viewports, the columns become fluid and stack vertically.</p>
<div class="bs-docs-grid">
<div class="row show-grid">
<div class="span1">1</div>
@@ -199,8 +199,6 @@
<h2>Nesting columns</h2>
<p>To nest your content with the default grid, add a new <code>.row</code> and set of <code>.span*</code> columns within an existing <code>.span*</code> column. Nested rows should include a set of columns that add up to the number of columns of its parent.</p>
- <h3>Example</h3>
- <p>Here two nested <code>.span4</code> columns are placed within a <code>.span8</code>.</p>
<div class="row show-grid">
<div class="span9">
Level 1 of column
diff --git a/docs/templates/pages/base-css.mustache b/docs/templates/pages/base-css.mustache
index 46b15523433913ac93e62fb3824652168998da19..c22fa9821ab33a38644e2929f7af6179ea685017 100644
--- a/docs/templates/pages/base-css.mustache
+++ b/docs/templates/pages/base-css.mustache
@@ -49,7 +49,7 @@
{{! Body copy }}
<h2 id="body-copy">{{_i}}Body copy{{/i}}</h2>
- <p>{{_i}}Bootstrap's global default <code>font-size</code> is <strong>14px</strong>, with a <code>line-height</code> of <strong>20px</strong>. This is applied to the <code><body></code> and all paragraphs. In addition, <code><p></code> (paragraphs) receive a bottom margin of half their line-height (9px by default).{{/i}}</p>
+ <p>{{_i}}Bootstrap's global default <code>font-size</code> is <strong>14px</strong>, with a <code>line-height</code> of <strong>20px</strong>. This is applied to the <code><body></code> and all paragraphs. In addition, <code><p></code> (paragraphs) receive a bottom margin of half their line-height (10px by default).{{/i}}</p>
<div class="bs-docs-example">
<p>Nullam quis risus eget urna mollis ornare vel eu leo. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Nullam id dolor id nibh ultricies vehicula.</p>
<p>Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Donec ullamcorper nulla non metus auctor fringilla. Duis mollis, est non commodo luctus, nisi erat porttitor ligula, eget lacinia odio sem nec elit. Donec ullamcorper nulla non metus auctor fringilla.</p>
@@ -170,7 +170,7 @@
<h2 id="blockquotes">{{_i}}Blockquotes{{/i}}</h2>
<p>{{_i}}For quoting blocks of content from another source within your document.{{/i}}</p>
- <h3>{{_i}}Default blockqoute{{/i}}</h3>
+ <h3>{{_i}}Default blockquote{{/i}}</h3>
<p>{{_i}}Wrap <code><blockquote></code> around any <abbr title="HyperText Markup Language">HTML</abbr> as the quote. For straight quotes we recommend a <code><p></code>.{{/i}}</p>
<div class="bs-docs-example">
<blockquote>
@@ -623,6 +623,12 @@
</td>
<td>{{_i}}Indicates a dangerous or potentially negative action.{{/i}}</td>
</tr>
+ <tr>
+ <td>
+ <code>.warning</code>
+ </td>
+ <td>{{_i}}Indicates a warning that might need attention.{{/i}}</td>
+ </tr>
<tr>
<td>
<code>.info</code>
@@ -654,12 +660,18 @@
<td>02/04/2012</td>
<td>Declined</td>
</tr>
- <tr class="info">
+ <tr class="warning">
<td>3</td>
<td>TB - Monthly</td>
<td>03/04/2012</td>
<td>Pending</td>
</tr>
+ <tr class="info">
+ <td>4</td>
+ <td>TB - Monthly</td>
+ <td>04/04/2012</td>
+ <td>Call in to confirm</td>
+ </tr>
</tbody>
</table>
</div>{{! /example }}
@@ -1292,7 +1304,7 @@
</pre>
<h3>{{_i}}Validation states{{/i}}</h3>
- <p>{{_i}}Bootstrap includes validation styles for error, warning, and success messages. To use, add the appropriate class to the surrounding <code>.control-group</code>.{{/i}}</p>
+ <p>{{_i}}Bootstrap includes validation styles for error, warning, info, and success messages. To use, add the appropriate class to the surrounding <code>.control-group</code>.{{/i}}</p>
<form class="bs-docs-example form-horizontal">
<div class="control-group warning">
@@ -1309,6 +1321,13 @@
<span class="help-inline">{{_i}}Please correct the error{{/i}}</span>
</div>
</div>
+ <div class="control-group info">
+ <label class="control-label" for="inputError">{{_i}}Input with info{{/i}}</label>
+ <div class="controls">
+ <input type="text" id="inputError">
+ <span class="help-inline">{{_i}}Username is taken{{/i}}</span>
+ </div>
+ </div>
<div class="control-group success">
<label class="control-label" for="inputSuccess">{{_i}}Input with success{{/i}}</label>
<div class="controls">
@@ -1693,7 +1712,7 @@
</ul>
<h3>Glyphicons attribution</h3>
- <p>{{_i}}<a href="http://glyphicons.com/">Glyphicons</a> Halflings are normally not available for free, but an arrangement between Bootstrap and the Glyphicons creators have made this possible at not cost to you as developers. As a thank you, we ask you to include an optional link back to <a href="http://glyphicons.com/">Glyphicons</a> whenever practical.{{/i}}</p>
+ <p>{{_i}}<a href="http://glyphicons.com/">Glyphicons</a> Halflings are normally not available for free, but an arrangement between Bootstrap and the Glyphicons creators have made this possible at no cost to you as developers. As a thank you, we ask you to include an optional link back to <a href="http://glyphicons.com/">Glyphicons</a> whenever practical.{{/i}}</p>
<hr class="bs-docs-separator">
@@ -1818,7 +1837,8 @@
<label class="control-label" for="inputIcon">{{_i}}Email address{{/i}}</label>
<div class="controls">
<div class="input-prepend">
- <span class="add-on"><i class="icon-envelope"><i><span><input class="span2" id="inputIcon" type="text">
+ <span class="add-on"><i class="icon-envelope"></i></span>
+ <input class="span2" id="inputIcon" type="text">
</div>
</div>
</pre>
diff --git a/docs/templates/pages/components.mustache b/docs/templates/pages/components.mustache
index 8187ce084a3ede839128fb0679951298ef855894..596c006c6ed733360fc1a47f8e57a47b6fc5411a 100644
--- a/docs/templates/pages/components.mustache
+++ b/docs/templates/pages/components.mustache
@@ -1870,7 +1870,7 @@
<h3>{{_i}}Dismiss buttons{{/i}}</h3>
<p>{{_i}}Mobile Safari and Mobile Opera browsers, in addition to the <code>data-dismiss="alert"</code> attribute, require an <code>href="#"</code> for the dismissal of alerts when using an <code><a></code> tag.{{/i}}</p>
- <pre class="prettyprint linenums"><a href="#" class="close" data-dismiss="alert">×</button></pre>
+ <pre class="prettyprint linenums"><a href="#" class="close" data-dismiss="alert">×</a></pre>
<p>{{_i}}Alternatively, you may use a <code><button></code> element with the data attribute, which we have opted to do for our docs. When using <code><button></code>, you must include <code>type="button"</code> or your forms may not submit.{{/i}}</p>
<pre class="prettyprint linenums"><button type="button" class="close" data-dismiss="alert">×</button></pre>
diff --git a/docs/templates/pages/getting-started.mustache b/docs/templates/pages/getting-started.mustache
index 8b58e62b72c89806c9c2bb6f492eb44b0d824261..f27c0834e2ede1959d934534d127e79b7c0cbc2f 100644
--- a/docs/templates/pages/getting-started.mustache
+++ b/docs/templates/pages/getting-started.mustache
@@ -3,7 +3,7 @@
<header class="jumbotron subhead" id="overview">
<div class="container">
<h1>{{_i}}Getting started{{/i}}</h1>
- <p class="lead">{{_i}}Overview of the project, it's contents, and how to get started with a simple template.{{/i}}</p>
+ <p class="lead">{{_i}}Overview of the project, its contents, and how to get started with a simple template.{{/i}}</p>
</div>
</header>
@@ -43,7 +43,7 @@
</div>
<div class="span6">
<h2>Download source</h2>
- <p>Get the original files for all CSS and Javasript, along with a local copy of the docs by downloading the latest version directly from GitHub.</p>
+ <p>Get the original files for all CSS and JavaScript, along with a local copy of the docs by downloading the latest version directly from GitHub.</p>
<p><a class="btn btn-large" href="https://github.com/twitter/bootstrap/zipball/master" {{#production}}onclick="_gaq.push(['_trackEvent', 'Getting started', 'Download', 'Download source']);"{{/production}}>Download Bootstrap source</a></p>
</div>
</div>
diff --git a/docs/templates/pages/index.mustache b/docs/templates/pages/index.mustache
index 654a988469d5c993b9a1f105c69b0cdd57493c88..f02b8d505db7c1ba6e12faccc61c80b81ed7c62c 100644
--- a/docs/templates/pages/index.mustache
+++ b/docs/templates/pages/index.mustache
@@ -2,11 +2,11 @@
<div class="container">
<h1>Bootstrap</h1>
<p>Sleek, intuitive, and powerful front-end framework for faster and easier web development.</p>
- <p><a href="assets/bootstrap.zip" class="btn btn-primary btn-large" {{#production}}onclick="_gaq.push(['_trackEvent', 'Jumbotron actions', 'Download', 'Download 2.1.0']);"{{/production}}>{{_i}}Download Bootstrap{{/i}}</a></p>
+ <p><a href="assets/bootstrap.zip" class="btn btn-primary btn-large" {{#production}}onclick="_gaq.push(['_trackEvent', 'Jumbotron actions', 'Download', 'Download 2.1.1']);"{{/production}}>{{_i}}Download Bootstrap{{/i}}</a></p>
<ul class="masthead-links">
<li><a href="http://github.com/twitter/bootstrap" {{#production}}onclick="_gaq.push(['_trackEvent', 'Jumbotron actions', 'Jumbotron links', 'GitHub project']);"{{/production}}>GitHub project</a></li>
<li><a href="./extend.html" {{#production}}onclick="_gaq.push(['_trackEvent', 'Jumbotron actions', 'Jumbotron links', 'Extend']);"{{/production}}>Extend</a></li>
- <li>Version 2.1.0</li>
+ <li>Version 2.1.1</li>
</ul>
</div>
</div>
diff --git a/docs/templates/pages/javascript.mustache b/docs/templates/pages/javascript.mustache
index c9e1b612b058bf9d18129c8d937eb35d69a50228..2ee086847da8bdf99d8d75aa0f9052751d283ff2 100644
--- a/docs/templates/pages/javascript.mustache
+++ b/docs/templates/pages/javascript.mustache
@@ -306,7 +306,7 @@ $('#myModal').on('hidden', function () {
- <!-- Dropdown
+ <!-- Dropdowns
================================================== -->
<section id="dropdowns">
<div class="page-header">
@@ -409,7 +409,7 @@ $('#myModal').on('hidden', function () {
<p>{{_i}}Add <code>data-toggle="dropdown"</code> to a link or button to toggle a dropdown.{{/i}}</p>
<pre class="prettyprint linenums">
<div class="dropdown">
- <a class="dropdown-toggle" href="#">Dropdown trigger</a>
+ <a class="dropdown-toggle" data-toggle="dropdown" href="#">Dropdown trigger</a>
<ul class="dropdown-menu" role="menu" aria-labelledby="dLabel">
...
</ul>
@@ -1536,7 +1536,7 @@ $('.carousel').carousel({
<h3>{{_i}}Via data attributes{{/i}}</h3>
<p>{{_i}}To easily add affix behavior to any element, just add <code>data-spy="affix"</code> to the element you want to spy on. Then use offsets to define when to toggle the pinning of an element on and off.{{/i}}</p>
- <pre class="prettyprint linenums"><div data-spy="affix" data-offset-top="200">...</body></pre>
+ <pre class="prettyprint linenums"><div data-spy="affix" data-offset-top="200">...</div></pre>
<div class="alert alert-info">
<strong>{{_i}}Heads up!{{/i}}</strong>
diff --git a/docs/templates/pages/scaffolding.mustache b/docs/templates/pages/scaffolding.mustache
index 724ab5e53eed97c4345162d2903e4654c3ee5bf2..3fb7841b1350b24da73c13082803ccf7a9ef3580 100644
--- a/docs/templates/pages/scaffolding.mustache
+++ b/docs/templates/pages/scaffolding.mustache
@@ -46,7 +46,7 @@
<ul>
<li>{{_i}}Remove <code>margin</code> on the body{{/i}}</li>
<li>{{_i}}Set <code>background-color: white;</code> on the <code>body</code>{{/i}}</li>
- <li>{{_i}}Use the <code>@baseFontFamily</code>, <code>@baseFontSize</code>, and <code>@baseLineHeight</code> attributes as our typographyic base{{/i}}</li>
+ <li>{{_i}}Use the <code>@baseFontFamily</code>, <code>@baseFontSize</code>, and <code>@baseLineHeight</code> attributes as our typographic base{{/i}}</li>
<li>{{_i}}Set the global link color via <code>@linkColor</code> and apply link underlines only on <code>:hover</code>{{/i}}</li>
</ul>
<p>{{_i}}These styles can be found within <strong>scaffolding.less</strong>.{{/i}}</p>
@@ -67,7 +67,7 @@
</div>
<h2>{{_i}}Live grid example{{/i}}</h2>
- <p>{{_i}}The default Bootstrap grid system utilizes <strong>12 columns</strong>, making for a 940px wide container without <a href="#responsive">responsive features</a> enabled. With the responsive CSS file added, the grid adapts to be 724px and 1170px wide depending on your viewport. Below 767px viewports, the columns become fluid and stack vertically.{{/i}}</p>
+ <p>{{_i}}The default Bootstrap grid system utilizes <strong>12 columns</strong>, making for a 940px wide container without <a href="./scaffolding.html#responsive">responsive features</a> enabled. With the responsive CSS file added, the grid adapts to be 724px and 1170px wide depending on your viewport. Below 767px viewports, the columns become fluid and stack vertically.{{/i}}</p>
<div class="bs-docs-grid">
<div class="row show-grid">
<div class="span1">1</div>
@@ -128,8 +128,6 @@
<h2>{{_i}}Nesting columns{{/i}}</h2>
<p>{{_i}}To nest your content with the default grid, add a new <code>.row</code> and set of <code>.span*</code> columns within an existing <code>.span*</code> column. Nested rows should include a set of columns that add up to the number of columns of its parent.{{/i}}</p>
- <h3>{{_i}}Example{{/i}}</h3>
- <p>{{_i}}Here two nested <code>.span4</code> columns are placed within a <code>.span8</code>.{{/i}}</p>
<div class="row show-grid">
<div class="span9">
{{_i}}Level 1 of column{{/i}}
diff --git a/js/bootstrap-affix.js b/js/bootstrap-affix.js
index c6b8208a6ef9300253c467ca2d5c32033a5ee671..c49d6e9dac09e0b7d8fe0c873fc887249b7516b7 100644
--- a/js/bootstrap-affix.js
+++ b/js/bootstrap-affix.js
@@ -1,5 +1,5 @@
/* ==========================================================
- * bootstrap-affix.js v2.1.0
+ * bootstrap-affix.js v2.1.1
* http://twitter.github.com/bootstrap/javascript.html#affix
* ==========================================================
* Copyright 2012 Twitter, Inc.
diff --git a/js/bootstrap-alert.js b/js/bootstrap-alert.js
index 4dd31adb22f6e06d17240edfd6d3a22b92e7718c..51273ab9d2d8616cf66479cbbd0f7f6173f17dcb 100644
--- a/js/bootstrap-alert.js
+++ b/js/bootstrap-alert.js
@@ -1,5 +1,5 @@
/* ==========================================================
- * bootstrap-alert.js v2.1.0
+ * bootstrap-alert.js v2.1.1
* http://twitter.github.com/bootstrap/javascript.html#alerts
* ==========================================================
* Copyright 2012 Twitter, Inc.
diff --git a/js/bootstrap-button.js b/js/bootstrap-button.js
index d0413d6efbc760fd3c50771e11944622278208ec..702198f6d06a75e973821917313853010dc5a2d5 100644
--- a/js/bootstrap-button.js
+++ b/js/bootstrap-button.js
@@ -1,5 +1,5 @@
/* ============================================================
- * bootstrap-button.js v2.1.0
+ * bootstrap-button.js v2.1.1
* http://twitter.github.com/bootstrap/javascript.html#buttons
* ============================================================
* Copyright 2012 Twitter, Inc.
diff --git a/js/bootstrap-carousel.js b/js/bootstrap-carousel.js
index 0b87eb8a2459ea40a0bdf88fb4ef5a3f7839166f..5c194b4287baaf967b676a00788ebbe84d30d6cd 100644
--- a/js/bootstrap-carousel.js
+++ b/js/bootstrap-carousel.js
@@ -1,5 +1,5 @@
/* ==========================================================
- * bootstrap-carousel.js v2.1.0
+ * bootstrap-carousel.js v2.1.1
* http://twitter.github.com/bootstrap/javascript.html#carousel
* ==========================================================
* Copyright 2012 Twitter, Inc.
diff --git a/js/bootstrap-collapse.js b/js/bootstrap-collapse.js
index 391d91281bc2d804063e0868455b7402477ab1be..8116f2255388bb397df4789008f34c4be0c74438 100644
--- a/js/bootstrap-collapse.js
+++ b/js/bootstrap-collapse.js
@@ -1,5 +1,5 @@
/* =============================================================
- * bootstrap-collapse.js v2.1.0
+ * bootstrap-collapse.js v2.1.1
* http://twitter.github.com/bootstrap/javascript.html#collapse
* =============================================================
* Copyright 2012 Twitter, Inc.
diff --git a/js/bootstrap-dropdown.js b/js/bootstrap-dropdown.js
index ab601e9e5bf7a284d2e403b682fc352cd840a37b..bd97356d1802773186bea7da4c5ce1ecc1ce12eb 100644
--- a/js/bootstrap-dropdown.js
+++ b/js/bootstrap-dropdown.js
@@ -1,5 +1,5 @@
/* ============================================================
- * bootstrap-dropdown.js v2.1.0
+ * bootstrap-dropdown.js v2.1.1
* http://twitter.github.com/bootstrap/javascript.html#dropdowns
* ============================================================
* Copyright 2012 Twitter, Inc.
diff --git a/js/bootstrap-modal.js b/js/bootstrap-modal.js
index 62fbc951b5ddc91846fb3c7ec73da0db0c70f0dd..f1622b1c65f7e0aeb4ed9351224eefa57285cbc2 100644
--- a/js/bootstrap-modal.js
+++ b/js/bootstrap-modal.js
@@ -1,5 +1,5 @@
/* =========================================================
- * bootstrap-modal.js v2.1.0
+ * bootstrap-modal.js v2.1.1
* http://twitter.github.com/bootstrap/javascript.html#modals
* =========================================================
* Copyright 2012 Twitter, Inc.
diff --git a/js/bootstrap-popover.js b/js/bootstrap-popover.js
index 4ce7a16d3f3c01cd000e937d87e9089de41dd261..941372285cb38be1699d4a65d2a984b79561e6ea 100644
--- a/js/bootstrap-popover.js
+++ b/js/bootstrap-popover.js
@@ -1,5 +1,5 @@
/* ===========================================================
- * bootstrap-popover.js v2.1.0
+ * bootstrap-popover.js v2.1.1
* http://twitter.github.com/bootstrap/javascript.html#popovers
* ===========================================================
* Copyright 2012 Twitter, Inc.
diff --git a/js/bootstrap-scrollspy.js b/js/bootstrap-scrollspy.js
index df70ebdd715da5417e4ba67d9a6d3a70844947c1..e740ac01f71084618df29431cd7f63561bd8c630 100644
--- a/js/bootstrap-scrollspy.js
+++ b/js/bootstrap-scrollspy.js
@@ -1,5 +1,5 @@
/* =============================================================
- * bootstrap-scrollspy.js v2.1.0
+ * bootstrap-scrollspy.js v2.1.1
* http://twitter.github.com/bootstrap/javascript.html#scrollspy
* =============================================================
* Copyright 2012 Twitter, Inc.
diff --git a/js/bootstrap-tab.js b/js/bootstrap-tab.js
index df2a7f7a06fa66345931410cbe734cc3bf763cbf..070deb8f4ddae41e9bae6ad0ee835d9b97f17a45 100644
--- a/js/bootstrap-tab.js
+++ b/js/bootstrap-tab.js
@@ -1,5 +1,5 @@
/* ========================================================
- * bootstrap-tab.js v2.1.0
+ * bootstrap-tab.js v2.1.1
* http://twitter.github.com/bootstrap/javascript.html#tabs
* ========================================================
* Copyright 2012 Twitter, Inc.
diff --git a/js/bootstrap-tooltip.js b/js/bootstrap-tooltip.js
index 4d06dfcc9b1675abb34f19b70c07a54a88aadd86..ed6288531604595c43f3f4abef03697441fd4514 100644
--- a/js/bootstrap-tooltip.js
+++ b/js/bootstrap-tooltip.js
@@ -1,5 +1,5 @@
/* ===========================================================
- * bootstrap-tooltip.js v2.1.0
+ * bootstrap-tooltip.js v2.1.1
* http://twitter.github.com/bootstrap/javascript.html#tooltips
* Inspired by the original jQuery.tipsy by Jason Frame
* ===========================================================
diff --git a/js/bootstrap-transition.js b/js/bootstrap-transition.js
index f0913d861a060e9b5cc4730aa302ed1aaaad24ba..fedc90a83e1bf23cc813ab9bb6f14f61f8505818 100644
--- a/js/bootstrap-transition.js
+++ b/js/bootstrap-transition.js
@@ -1,5 +1,5 @@
/* ===================================================
- * bootstrap-transition.js v2.1.0
+ * bootstrap-transition.js v2.1.1
* http://twitter.github.com/bootstrap/javascript.html#transitions
* ===================================================
* Copyright 2012 Twitter, Inc.
diff --git a/js/bootstrap-typeahead.js b/js/bootstrap-typeahead.js
index ae57221c11a77d0f837d15937335fa4af748fedf..6ceacd61dcd7bbfda6fd72210ef1cc6195500ad4 100644
--- a/js/bootstrap-typeahead.js
+++ b/js/bootstrap-typeahead.js
@@ -1,5 +1,5 @@
/* =============================================================
- * bootstrap-typeahead.js v2.1.0
+ * bootstrap-typeahead.js v2.1.1
* http://twitter.github.com/bootstrap/javascript.html#typeahead
* =============================================================
* Copyright 2012 Twitter, Inc.
diff --git a/js/tests/unit/bootstrap-tooltip.js b/js/tests/unit/bootstrap-tooltip.js
index 2eb8c8f7c9ac11aab3fd3b50154336c0e98a1363..9844d6460f7b0fdd0065d4776a3556e078d0ba5c 100644
--- a/js/tests/unit/bootstrap-tooltip.js
+++ b/js/tests/unit/bootstrap-tooltip.js
@@ -113,7 +113,7 @@ $(function () {
}, 50)
})
- test("should show tooltip if leave event hasn't occured before delay expires", function () {
+ test("should show tooltip if leave event hasn't occurred before delay expires", function () {
var tooltip = $('<a href="#" rel="tooltip" title="Another tooltip"></a>')
.appendTo('#qunit-fixture')
.tooltip({ delay: 150 })
diff --git a/less/bootstrap.less b/less/bootstrap.less
index f0df4f1d542dffeb5292437c7c26137ab6b50ca2..aaa3d8a6f207e37c2f33374885ae94beb5595724 100644
--- a/less/bootstrap.less
+++ b/less/bootstrap.less
@@ -1,5 +1,5 @@
/*!
- * Bootstrap v2.1.0
+ * Bootstrap v2.1.1
*
* Copyright 2012 Twitter, Inc
* Licensed under the Apache License v2.0
diff --git a/less/buttons.less b/less/buttons.less
index 077616e990bf38de04855c75f4eb04f2caca972d..59653c1bf596205c33c8254598eccb3c651cbce9 100644
--- a/less/buttons.less
+++ b/less/buttons.less
@@ -96,7 +96,7 @@
.btn-mini {
padding: 2px 6px;
font-size: @baseFontSize - 3px;
- line-height: @baseLineHeight - 4px;
+ line-height: @baseLineHeight - 3px;
}
// Block button
diff --git a/less/component-animations.less b/less/component-animations.less
index 2166776d98ba7807e54353a475707cfd4571c80a..d614263a76a75f04614c9205a74f373f74012a41 100644
--- a/less/component-animations.less
+++ b/less/component-animations.less
@@ -15,7 +15,6 @@
position: relative;
height: 0;
overflow: hidden;
- overflow: visible \9;
.transition(height .35s ease);
&.in {
height: auto;
diff --git a/less/dropdowns.less b/less/dropdowns.less
index e83915dba51d47e24e5055e03058a8dd6cfcdf62..390c374974e604f4027434402977bb4610e53f34 100644
--- a/less/dropdowns.less
+++ b/less/dropdowns.less
@@ -148,7 +148,7 @@
.caret {
border-top: 0;
border-bottom: 4px solid @black;
- content: "\2191";
+ content: "";
}
// Different positioning for bottom up menu
.dropdown-menu {
@@ -172,7 +172,7 @@
-moz-border-radius: 0 6px 6px 6px;
border-radius: 0 6px 6px 6px;
}
-.dropdown-submenu:hover .dropdown-menu {
+.dropdown-submenu:hover > .dropdown-menu {
display: block;
}
diff --git a/less/forms.less b/less/forms.less
index 77b5135a404043729e0614c11508f334eb0de1bf..5a8463344f35d7de1b77c56488b0e2a479f08bc5 100644
--- a/less/forms.less
+++ b/less/forms.less
@@ -349,6 +349,10 @@ input[type="checkbox"][readonly] {
.control-group.success {
.formFieldState(@successText, @successText, @successBackground);
}
+// Success
+.control-group.info {
+ .formFieldState(@infoText, @infoText, @infoBackground);
+}
// HTML5 invalid states
// Shares styles with the .control-group.error above
@@ -441,7 +445,6 @@ select:focus:required:invalid {
}
.add-on,
.btn {
- margin-left: -1px;
vertical-align: top;
.border-radius(0);
}
@@ -466,6 +469,10 @@ select:focus:required:invalid {
.uneditable-input {
.border-radius(@inputBorderRadius 0 0 @inputBorderRadius);
}
+ .add-on,
+ .btn {
+ margin-left: -1px;
+ }
.add-on:last-child,
.btn:last-child {
.border-radius(0 @inputBorderRadius @inputBorderRadius 0);
@@ -510,16 +517,16 @@ input.search-query {
.border-radius(0); // Override due to specificity
}
.form-search .input-append .search-query {
- .border-radius(14px 0 0 14px)
+ .border-radius(14px 0 0 14px);
}
.form-search .input-append .btn {
- .border-radius(0 14px 14px 0)
+ .border-radius(0 14px 14px 0);
}
.form-search .input-prepend .search-query {
- .border-radius(0 14px 14px 0)
+ .border-radius(0 14px 14px 0);
}
.form-search .input-prepend .btn {
- .border-radius(14px 0 0 14px)
+ .border-radius(14px 0 0 14px);
}
diff --git a/less/mixins.less b/less/mixins.less
index db60f1aea296a009522dcde5b39ee850fde56e86..c5acc0523ae3e263683f725dc0412f19f225cca7 100644
--- a/less/mixins.less
+++ b/less/mixins.less
@@ -175,6 +175,10 @@
select,
textarea {
color: @textColor;
+ }
+ input,
+ select,
+ textarea {
border-color: @borderColor;
.box-shadow(inset 0 1px 1px rgba(0,0,0,.075)); // Redeclare so transitions work
&:focus {
@@ -512,8 +516,6 @@
margin-top: (@navbarHeight - @elementHeight) / 2;
}
-
-
// Grid System
// -----------
diff --git a/less/navbar.less b/less/navbar.less
index 70501e4595919305e283d6929ba391022698e092..63d95fe9f253df8e4066208a7c01d1443c044a74 100644
--- a/less/navbar.less
+++ b/less/navbar.less
@@ -221,6 +221,7 @@
}
.navbar .nav.pull-right {
float: right; // redeclare due to specificity
+ margin-right: 0; // remove margin on float right nav
}
.navbar .nav > li {
float: left;
diff --git a/less/pager.less b/less/pager.less
index 2b854b4bef92844e974ae71b3d9d5f3b4f46c174..a7629d3db73b287c2399222f1b1c115b0528c0b8 100644
--- a/less/pager.less
+++ b/less/pager.less
@@ -12,7 +12,8 @@
.pager li {
display: inline;
}
-.pager a {
+.pager a,
+.pager span {
display: inline-block;
padding: 5px 14px;
background-color: #fff;
@@ -23,14 +24,16 @@
text-decoration: none;
background-color: #f5f5f5;
}
-.pager .next a {
+.pager .next a,
+.pager .next span {
float: right;
}
.pager .previous a {
float: left;
}
.pager .disabled a,
-.pager .disabled a:hover {
+.pager .disabled a:hover,
+.pager .disabled span {
color: @grayLight;
background-color: #fff;
cursor: default;
diff --git a/less/popovers.less b/less/popovers.less
index 2b3f1b059956b337dad93eab3644d835854557a7..579c84dfe3fafd9413d34648d931263f42bff795 100644
--- a/less/popovers.less
+++ b/less/popovers.less
@@ -115,3 +115,111 @@
}
}
}
+// Dynamic Popover Border & Arrow Sizes
+// ------------------------------------
+
+#popoverArrowDynamic {
+ .dynamic-arrow-styles() {
+ content: " ";
+ height: 0;
+ width: 0;
+ position: absolute;
+ z-index: 10;
+ border: solid transparent;
+ }
+ .top-outer-arrow(@innerArrowWidth: @popoverArrowWidth, @popoverOutlineWidth: @dynamicPopoverOuterWidth, @outerColor: @popoverArrowOuterColor) {
+ .dynamic-arrow-styles();
+ top: 0;
+ left: (@innerArrowWidth + @popoverOutlineWidth) * -1;
+ border-width: @innerArrowWidth + @popoverOutlineWidth;
+ border-top-color: @outerColor;
+ }
+ .left-outer-arrow(@innerArrowWidth: @popoverArrowWidth, @popoverOutlineWidth: @dynamicPopoverOuterWidth, @outerColor: @popoverArrowOuterColor) {
+ .dynamic-arrow-styles();
+ left: 0;
+ top: (@innerArrowWidth + @popoverOutlineWidth) * -1;
+ border-width: @innerArrowWidth + @popoverOutlineWidth;
+ border-left-color: @outerColor;
+ }
+ .bottom-outer-arrow(@innerArrowWidth: @popoverArrowWidth, @popoverOutlineWidth: @dynamicPopoverOuterWidth, @outerColor: @popoverArrowOuterColor) {
+ .dynamic-arrow-styles();
+ top: (@innerArrowWidth + @popoverOutlineWidth) * -2;
+ right: (@innerArrowWidth + @popoverOutlineWidth) * -1;
+ border-width: @innerArrowWidth + @popoverOutlineWidth;
+ border-bottom-color: @outerColor;
+ }
+ .right-outer-arrow(@innerArrowWidth: @popoverArrowWidth, @popoverOutlineWidth: @dynamicPopoverOuterWidth, @outerColor: @popoverArrowOuterColor) {
+ .dynamic-arrow-styles();
+ right: 0;
+ top: (@innerArrowWidth + @popoverOutlineWidth) * -1;
+ border-width: @innerArrowWidth + @popoverOutlineWidth;
+ border-right-color: @outerColor;
+ }
+ .top-inner-arrow(@innerArrowWidth: @popoverArrowWidth, @color: @popoverBackground) {
+ .dynamic-arrow-styles();
+ border-width: @innerArrowWidth;
+ border-top-color: @color;
+ top: 0;
+ left: -@innerArrowWidth;
+ }
+ .left-inner-arrow(@innerArrowWidth: @popoverArrowWidth, @color: @popoverBackground) {
+ .dynamic-arrow-styles();
+ border-width: @innerArrowWidth;
+ border-left-color: @color;
+ left: 0;
+ top: -@innerArrowWidth;
+ }
+ .bottom-inner-arrow(@innerArrowWidth: @popoverArrowWidth, @color: @popoverBackground) {
+ .dynamic-arrow-styles();
+ border-width: @innerArrowWidth;
+ border-bottom-color: @color;
+ top: @innerArrowWidth * -2;
+ left: -@innerArrowWidth;
+ }
+ .right-inner-arrow(@innerArrowWidth: @popoverArrowWidth, @color: @popoverBackground) {
+ .dynamic-arrow-styles();
+ border-width: @innerArrowWidth;
+ border-right-color: @color;
+ left: @innerArrowWidth * -2;
+ top: -@innerArrowWidth;
+ }
+}
+// Uncomment the following lines and add the additional class `.dynamic` to your popovers
+// in order to control their overall size and the outline stroke width
+
+.popover.dynamic {
+ &:after {
+ display: block;
+ position: relative;
+ }
+ .arrow {
+ width: 0;
+ height: 0;
+ border-color: transparent;
+ margin: 0;
+ }
+ &.top .arrow { bottom: 0; border-width: 0 0 0 0; }
+ &.left .arrow { right: 0; border-width: 0 0 0 0; }
+ &.bottom .arrow { top: 0; border-width: 0 0 0 0; }
+ &.right .arrow { left: 0; border-width: 0 0 0 0; }
+
+ &.top {
+ .arrow:before { #popoverArrowDynamic > .top-outer-arrow(); }
+ .arrow:after { #popoverArrowDynamic > .top-inner-arrow(); }
+ }
+
+ &.left {
+ .arrow:before { #popoverArrowDynamic > .left-outer-arrow(); }
+ .arrow:after { #popoverArrowDynamic > .left-inner-arrow(); }
+ }
+
+ &.bottom {
+ .arrow:before { #popoverArrowDynamic > .bottom-outer-arrow(); }
+ .arrow:after { #popoverArrowDynamic > .bottom-inner-arrow(); }
+ }
+
+ &.right {
+ .arrow:before { #popoverArrowDynamic > .right-outer-arrow(); }
+ .arrow:after { #popoverArrowDynamic > .right-inner-arrow(); }
+ }
+}
diff --git a/less/responsive-navbar.less b/less/responsive-navbar.less
index 3498863c82b926614c51e420f8c7d748418e9224..4ffa5a9fecb39335933d32f715ac8e3ad7d24b99 100644
--- a/less/responsive-navbar.less
+++ b/less/responsive-navbar.less
@@ -115,6 +115,12 @@
.nav-collapse .dropdown-menu .divider {
display: none;
}
+ .nav-collapse .nav > li > .dropdown-menu {
+ &:before,
+ &:after {
+ display: none;
+ }
+ }
// Forms in navbar
.nav-collapse .navbar-form,
.nav-collapse .navbar-search {
@@ -125,6 +131,11 @@
border-bottom: 1px solid @navbarBackground;
.box-shadow(~"inset 0 1px 0 rgba(255,255,255,.1), 0 1px 0 rgba(255,255,255,.1)");
}
+ .navbar-inverse .nav-collapse .navbar-form,
+ .navbar-inverse .nav-collapse .navbar-search {
+ border-top-color: @navbarInverseBackground;
+ border-bottom-color: @navbarInverseBackground;
+ }
// Pull right (secondary) nav content
.navbar .nav-collapse .nav.pull-right {
float: none;
diff --git a/less/responsive.less b/less/responsive.less
index 5a62e4a5076f927dbef9021ebb85b34b32b55644..87b34708538beb7ed4ac31e2c19b338a6131061d 100644
--- a/less/responsive.less
+++ b/less/responsive.less
@@ -1,5 +1,5 @@
/*!
- * Bootstrap Responsive v2.1.0
+ * Bootstrap Responsive v2.1.1
*
* Copyright 2012 Twitter, Inc
* Licensed under the Apache License v2.0
diff --git a/less/sprites.less b/less/sprites.less
index 8d5e40e7ab68407d6ba95b31de3b6fee6830a1e8..9bf970fa9b64a7791509c1b32f5a1743a19eb115 100644
--- a/less/sprites.less
+++ b/less/sprites.less
@@ -30,8 +30,14 @@
/* White icons with optional class, or on hover/active states of certain elements */
.icon-white,
-.nav > .active > a > [class^="icon-"],
-.nav > .active > a > [class*=" icon-"],
+.nav-tabs > .active > a > [class^="icon-"],
+.nav-tabs > .active > a > [class*=" icon-"],
+.nav-pills > .active > a > [class^="icon-"],
+.nav-pills > .active > a > [class*=" icon-"],
+.nav-list > .active > a > [class^="icon-"],
+.nav-list > .active > a > [class*=" icon-"],
+.navbar-inverse .nav > .active > a > [class^="icon-"],
+.navbar-inverse .nav > .active > a > [class*=" icon-"],
.dropdown-menu > li > a:hover > [class^="icon-"],
.dropdown-menu > li > a:hover > [class*=" icon-"],
.dropdown-menu > .active > a > [class^="icon-"],
diff --git a/less/tables.less b/less/tables.less
index 853b97e3902c1ee425128e0ba3c79b3fa29d4e14..0f0c310e0bfd1ce5af084ca4ce1c1a7066d8d525 100644
--- a/less/tables.less
+++ b/less/tables.less
@@ -219,6 +219,9 @@ table {
tbody tr.error td {
background-color: @errorBackground;
}
+ tbody tr.warning td {
+ background-color: @warningBackground;
+ }
tbody tr.info td {
background-color: @infoBackground;
}
diff --git a/less/tests/css-tests.html b/less/tests/css-tests.html
index 6786454cc7ea744443115cf97bdaf21b096f012a..c922f07db39159c67ffdc0975b9c31e104636c6a 100644
--- a/less/tests/css-tests.html
+++ b/less/tests/css-tests.html
@@ -597,6 +597,19 @@
<h1>Forms</h1>
</div>
+<h4>Horizontal form errors</h4>
+<form class="form-horizontal">
+ <div class="control-group error">
+ <label class="control-label" for="inputError">Radio with error</label>
+ <div class="controls">
+ <label class="radio">
+ <input type="radio" id="inputError"> Oh hai
+ </label>
+ <span class="help-inline">Please correct the error</span>
+ </div>
+ </div>
+</form>
+
<div class="row">
<div class="span4">
<h4>Prepend and append on inputs</h4>
@@ -622,7 +635,7 @@
</div>
</form>
</div><!--/span-->
- <div class="span6">
+ <div class="span4">
<h4>Prepend and append with uneditable</h4>
<form>
<div class="input-prepend">
@@ -640,6 +653,24 @@
</div>
</form>
</div><!--/span-->
+ <div class="span4">
+ <h4>Prepend with type="submit"</h4>
+ <form class="form-search">
+ <div class="input-append">
+ <input type="text" class="span2 search-query" value="" name="q">
+ <input type="submit" value="Search" class="btn">
+ </div>
+ </form>
+ <div class="input-append">
+ <input type="text" class="span2" value="" name="">
+ <input type="submit" value="Button" class="btn">
+ </div>
+ <div class="input-append">
+ <input type="text" size="16" id="appendedInputButtons" class="span2">
+ <input type="submit" value="Search" class="btn">
+ <button type="button" class="btn">Options</button>
+ </div>
+ </div><!--/span-->
</div><!--/row-->
<h4>Fluid prepended and appended inputs</h4>
diff --git a/less/variables.less b/less/variables.less
index a5c8cdd9893841e9dba79ac432d3f76669e881a5..e302e43a1d2401a65959ae2fc68dc0388fbf1493 100644
--- a/less/variables.less
+++ b/less/variables.less
@@ -57,7 +57,6 @@
@headingsFontWeight: bold; // instead of browser default, bold
@headingsColor: inherit; // empty to use BS default, @textColor
-
// Tables
// -------------------------
@tableBackground: transparent; // overall background-color
@@ -65,7 +64,6 @@
@tableBackgroundHover: #f5f5f5; // for hover
@tableBorder: #ddd; // table and cell border
-
// Buttons
// -------------------------
@btnBackground: @white;
@@ -107,12 +105,11 @@
@dropdownDividerBottom: @white;
@dropdownLinkColor: @grayDark;
-
@dropdownLinkColorHover: @white;
-@dropdownLinkBackgroundHover: @dropdownLinkBackgroundActive;
-
@dropdownLinkColorActive: @dropdownLinkColor;
+
@dropdownLinkBackgroundActive: @linkColor;
+@dropdownLinkBackgroundHover: @dropdownLinkBackgroundActive;
@@ -157,12 +154,12 @@
@navbarCollapseWidth: 979px;
@navbarHeight: 40px;
-@navbarBackground: darken(@navbarBackgroundHighlight, 5%);
@navbarBackgroundHighlight: #ffffff;
+@navbarBackground: darken(@navbarBackgroundHighlight, 5%);
@navbarBorder: darken(@navbarBackground, 12%);
-@navbarText: @gray;
-@navbarLinkColor: @gray;
+@navbarText: #777;
+@navbarLinkColor: #777;
@navbarLinkColorHover: @grayDark;
@navbarLinkColorActive: @gray;
@navbarLinkBackgroundHover: transparent;
@@ -225,21 +222,22 @@
// Tooltips and popovers
// -------------------------
-@tooltipColor: #fff;
-@tooltipBackground: #000;
-@tooltipArrowWidth: 5px;
-@tooltipArrowColor: @tooltipBackground;
+@tooltipColor: #fff;
+@tooltipBackground: #000;
+@tooltipArrowWidth: 5px;
+@tooltipArrowColor: @tooltipBackground;
-@popoverBackground: #fff;
-@popoverArrowWidth: 10px;
-@popoverArrowColor: #fff;
-@popoverTitleBackground: darken(@popoverBackground, 3%);
+@popoverBackground: #fff;
+@popoverArrowWidth: 10px;
+@popoverArrowColor: #fff;
+@popoverTitleBackground: darken(@popoverBackground, 3%);
// Special enhancement for popovers
-@popoverArrowOuterWidth: @popoverArrowWidth + 1;
-@popoverArrowOuterColor: rgba(0,0,0,.25);
-
+@popoverArrowOuterWidth: @popoverArrowWidth + 1;
+@popoverArrowOuterColor: rgba(0,0,0,.25);
+// Enhancements for dynamic popovers
+@dynamicPopoverOuterWidth: 2px;
// GRID
// --------------------------------------------------
diff --git a/package.json b/package.json
index 1e85f927bd93cc13693e9d7103c9b38b6e69ae52..f0be5d5f4264f09576b50d86a30807523bb35237 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
{
"name": "bootstrap"
, "description": "Sleek, intuitive, and powerful front-end framework for faster and easier web development."
- , "version": "2.1.0"
+ , "version": "2.1.1"
, "keywords": ["bootstrap", "css"]
, "homepage": "http://twitter.github.com/bootstrap/"
, "author": "Twitter Inc."