+
+
+
+# [Bootstrap v3.0.0](http://twitter.github.com/bootstrap) [](http://travis-ci.org/twitter/bootstrap)
Bootstrap is a sleek, intuitive, and powerful front-end framework for faster and easier web development, created and maintained by [Mark Otto](http://twitter.com/mdo) and [Jacob Thornton](http://twitter.com/fat).
-To get started, checkout http://getbootstrap.com!
+To get started, checkout [http://getbootstrap.com](http://getbootstrap.com)!
@@ -30,7 +34,7 @@ And constructed with the following guidelines:
* New additions without breaking backward compatibility bumps the minor (and resets the patch)
* Bug fixes and misc changes bumps the patch
-For more information on SemVer, please visit http://semver.org/.
+For more information on SemVer, please visit [http://semver.org/](http://semver.org/).
@@ -85,13 +89,13 @@ Thanks!
**Mark Otto**
-+ http://twitter.com/mdo
-+ http://github.com/mdo
++ [http://twitter.com/mdo](http://twitter.com/mdo)
++ [http://github.com/mdo](http://github.com/mdo)
**Jacob Thornton**
-+ http://twitter.com/fat
-+ http://github.com/fat
++ [http://twitter.com/fat](http://twitter.com/fat)
++ [http://github.com/fat](http://github.com/fat)
@@ -103,7 +107,7 @@ Licensed under the Apache License, Version 2.0 (the "License");
you may not use this work except in compliance with the License.
You may obtain a copy of the License in the LICENSE file, or at:
- http://www.apache.org/licenses/LICENSE-2.0
+ [http://www.apache.org/licenses/LICENSE-2.0](http://www.apache.org/licenses/LICENSE-2.0)
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index 10a05729c9..dc4ff24a02 100644
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@ -694,9 +694,9 @@ blockquote {
blockquote p {
margin-bottom: 0;
- font-size: 16px;
+ font-size: 17.5px;
font-weight: 300;
- line-height: 25px;
+ line-height: 1.25;
}
blockquote small {
@@ -1439,24 +1439,30 @@ table {
}
.table-bordered thead:first-child tr:first-child > th:first-child,
-.table-bordered tbody:first-child tr:first-child > td:first-child {
+.table-bordered tbody:first-child tr:first-child > td:first-child,
+.table-bordered tbody:first-child tr:first-child > th:first-child {
border-top-left-radius: 4px;
}
.table-bordered thead:first-child tr:first-child > th:last-child,
-.table-bordered tbody:first-child tr:first-child > td:last-child {
+.table-bordered tbody:first-child tr:first-child > td:last-child,
+.table-bordered tbody:first-child tr:first-child > th:last-child {
border-top-right-radius: 4px;
}
.table-bordered thead:last-child tr:last-child > th:first-child,
.table-bordered tbody:last-child tr:last-child > td:first-child,
-.table-bordered tfoot:last-child tr:last-child > td:first-child {
+.table-bordered tbody:last-child tr:last-child > th:first-child,
+.table-bordered tfoot:last-child tr:last-child > td:first-child,
+.table-bordered tfoot:last-child tr:last-child > th:first-child {
border-bottom-left-radius: 4px;
}
.table-bordered thead:last-child tr:last-child > th:last-child,
.table-bordered tbody:last-child tr:last-child > td:last-child,
-.table-bordered tfoot:last-child tr:last-child > td:last-child {
+.table-bordered tbody:last-child tr:last-child > th:last-child,
+.table-bordered tfoot:last-child tr:last-child > td:last-child,
+.table-bordered tfoot:last-child tr:last-child > th:last-child {
border-bottom-right-radius: 4px;
}
@@ -1487,8 +1493,8 @@ table {
background-color: #f9f9f9;
}
-.table-hover tbody tr:hover td,
-.table-hover tbody tr:hover th {
+.table-hover tbody tr:hover > td,
+.table-hover tbody tr:hover > th {
background-color: #f5f5f5;
}
@@ -1499,35 +1505,35 @@ table th[class*="span"] {
margin-left: 0;
}
-.table tbody tr.success td {
+.table tbody tr.success > td {
background-color: #dff0d8;
}
-.table tbody tr.error td {
+.table tbody tr.error > td {
background-color: #f2dede;
}
-.table tbody tr.warning td {
+.table tbody tr.warning > td {
background-color: #fcf8e3;
}
-.table tbody tr.info td {
+.table tbody tr.info > td {
background-color: #d9edf7;
}
-.table-hover tbody tr.success:hover td {
+.table-hover tbody tr.success:hover > td {
background-color: #d0e9c6;
}
-.table-hover tbody tr.error:hover td {
+.table-hover tbody tr.error:hover > td {
background-color: #ebcccc;
}
-.table-hover tbody tr.warning:hover td {
+.table-hover tbody tr.warning:hover > td {
background-color: #faf2cc;
}
-.table-hover tbody tr.info:hover td {
+.table-hover tbody tr.info:hover > td {
background-color: #c4e3f3;
}
@@ -3360,8 +3366,8 @@ fieldset[disabled] .navbar .btn-navbar {
}
.navbar .nav li.dropdown > a:hover .caret {
- border-top-color: #555555;
- border-bottom-color: #555555;
+ border-top-color: #333333;
+ border-bottom-color: #333333;
}
.navbar .nav li.dropdown.open > .dropdown-toggle,
@@ -3842,6 +3848,7 @@ fieldset[disabled] .navbar-inverse .btn-navbar {
display: block;
padding: 5px;
font-size: 11px;
+ line-height: 1.4;
opacity: 0;
filter: alpha(opacity=0);
visibility: visible;
@@ -3924,7 +3931,7 @@ fieldset[disabled] .navbar-inverse .btn-navbar {
left: 0;
z-index: 1010;
display: none;
- width: 236px;
+ max-width: 276px;
padding: 1px;
text-align: left;
white-space: normal;
@@ -3966,6 +3973,10 @@ fieldset[disabled] .navbar-inverse .btn-navbar {
border-radius: 5px 5px 0 0;
}
+.popover-title:empty {
+ display: none;
+}
+
.popover-content {
padding: 9px 14px;
}
diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css
index cd2e93436d..978f68ba92 100644
--- a/docs/assets/css/docs.css
+++ b/docs/assets/css/docs.css
@@ -528,6 +528,9 @@ h2 + .row {
/* Example page
------------------------- */
+.bootstrap-examples h4 {
+ margin: 10px 0 5px;
+}
.bootstrap-examples p {
font-size: 13px;
line-height: 18px;
diff --git a/docs/assets/img/bootstrap-docs-readme.png b/docs/assets/img/bootstrap-docs-readme.png
new file mode 100644
index 0000000000..36603bd3b4
Binary files /dev/null and b/docs/assets/img/bootstrap-docs-readme.png differ
diff --git a/docs/assets/img/examples/bootstrap-example-carousel.png b/docs/assets/img/examples/bootstrap-example-carousel.png
index a2f668abe1..725fe07b9e 100644
Binary files a/docs/assets/img/examples/bootstrap-example-carousel.png and b/docs/assets/img/examples/bootstrap-example-carousel.png differ
diff --git a/docs/assets/img/examples/bootstrap-example-fluid.jpg b/docs/assets/img/examples/bootstrap-example-fluid.jpg
deleted file mode 100644
index d616ba001b..0000000000
Binary files a/docs/assets/img/examples/bootstrap-example-fluid.jpg and /dev/null differ
diff --git a/docs/assets/img/examples/bootstrap-example-fluid.png b/docs/assets/img/examples/bootstrap-example-fluid.png
new file mode 100644
index 0000000000..5f49a332f3
Binary files /dev/null and b/docs/assets/img/examples/bootstrap-example-fluid.png differ
diff --git a/docs/assets/img/examples/bootstrap-example-hero.jpg b/docs/assets/img/examples/bootstrap-example-hero.jpg
deleted file mode 100644
index a9662d2b4b..0000000000
Binary files a/docs/assets/img/examples/bootstrap-example-hero.jpg and /dev/null differ
diff --git a/docs/assets/img/examples/bootstrap-example-justified-nav.png b/docs/assets/img/examples/bootstrap-example-justified-nav.png
new file mode 100644
index 0000000000..3d1e233891
Binary files /dev/null and b/docs/assets/img/examples/bootstrap-example-justified-nav.png differ
diff --git a/docs/assets/img/examples/bootstrap-example-marketing-narrow.png b/docs/assets/img/examples/bootstrap-example-marketing-narrow.png
index a7ac9ef98b..4bca8cdafd 100644
Binary files a/docs/assets/img/examples/bootstrap-example-marketing-narrow.png and b/docs/assets/img/examples/bootstrap-example-marketing-narrow.png differ
diff --git a/docs/assets/img/examples/bootstrap-example-marketing.png b/docs/assets/img/examples/bootstrap-example-marketing.png
new file mode 100644
index 0000000000..206e26e342
Binary files /dev/null and b/docs/assets/img/examples/bootstrap-example-marketing.png differ
diff --git a/docs/assets/img/examples/bootstrap-example-signin.png b/docs/assets/img/examples/bootstrap-example-signin.png
index 39210096b4..b649a985dc 100644
Binary files a/docs/assets/img/examples/bootstrap-example-signin.png and b/docs/assets/img/examples/bootstrap-example-signin.png differ
diff --git a/docs/assets/img/examples/bootstrap-example-starter.jpg b/docs/assets/img/examples/bootstrap-example-starter.jpg
deleted file mode 100644
index 3b1cbf9e78..0000000000
Binary files a/docs/assets/img/examples/bootstrap-example-starter.jpg and /dev/null differ
diff --git a/docs/assets/img/examples/bootstrap-example-starter.png b/docs/assets/img/examples/bootstrap-example-starter.png
new file mode 100644
index 0000000000..1bf4b85ece
Binary files /dev/null and b/docs/assets/img/examples/bootstrap-example-starter.png differ
diff --git a/docs/assets/img/examples/bootstrap-example-sticky-footer.png b/docs/assets/img/examples/bootstrap-example-sticky-footer.png
index c2255044df..fb80e7b92f 100644
Binary files a/docs/assets/img/examples/bootstrap-example-sticky-footer.png and b/docs/assets/img/examples/bootstrap-example-sticky-footer.png differ
diff --git a/docs/assets/js/application.js b/docs/assets/js/application.js
index ba77673000..cc442ade4f 100644
--- a/docs/assets/js/application.js
+++ b/docs/assets/js/application.js
@@ -43,14 +43,14 @@
// tooltip demo
$('.tooltip-demo').tooltip({
- selector: "a[rel=tooltip]"
+ selector: "a[data-toggle=tooltip]"
})
$('.tooltip-test').tooltip()
$('.popover-test').popover()
// popover demo
- $("a[rel=popover]")
+ $("a[data-toggle=popover]")
.popover()
.click(function(e) {
e.preventDefault()
@@ -153,4 +153,4 @@ $.ajaxTransport('jsonpi', function(opts, originalOptions, jqXHR) {
}
})
-}(window.jQuery)
\ No newline at end of file
+}(window.jQuery)
diff --git a/docs/assets/js/bootstrap-carousel.js b/docs/assets/js/bootstrap-carousel.js
index d9c580e855..fad16def24 100644
--- a/docs/assets/js/bootstrap-carousel.js
+++ b/docs/assets/js/bootstrap-carousel.js
@@ -108,6 +108,7 @@
e = $.Event('slide', {
relatedTarget: $next[0]
+ , direction: direction
})
if ($next.hasClass('active')) return
@@ -187,11 +188,18 @@
/* CAROUSEL DATA-API
* ================= */
- $(document).on('click.carousel.data-api', '[data-slide]', function (e) {
+ $(document).on('click.carousel.data-api', '[data-slide], [data-slide-to]', function (e) {
var $this = $(this), href
, $target = $($this.attr('data-target') || (href = $this.attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '')) //strip for ie7
, options = $.extend({}, $target.data(), $this.data())
+ , slideIndex
+
$target.carousel(options)
+
+ if (slideIndex = $this.attr('data-slide-to')) {
+ $target.data('carousel').pause().to(slideIndex).cycle()
+ }
+
e.preventDefault()
})
diff --git a/docs/assets/js/bootstrap-collapse.js b/docs/assets/js/bootstrap-collapse.js
index 48dea44c48..e1d5a856e8 100644
--- a/docs/assets/js/bootstrap-collapse.js
+++ b/docs/assets/js/bootstrap-collapse.js
@@ -129,7 +129,7 @@
return this.each(function () {
var $this = $(this)
, data = $this.data('collapse')
- , options = typeof option == 'object' && option
+ , options = $.extend({}, $.fn.collapse.defaults, $this.data(), typeof option == 'object' && option)
if (!data) $this.data('collapse', (data = new Collapse(this, options)))
if (typeof option == 'string') data[option]()
})
diff --git a/docs/assets/js/bootstrap-dropdown.js b/docs/assets/js/bootstrap-dropdown.js
index 93d645970d..37819e361a 100644
--- a/docs/assets/js/bootstrap-dropdown.js
+++ b/docs/assets/js/bootstrap-dropdown.js
@@ -81,7 +81,10 @@
isActive = $parent.hasClass('open')
- if (!isActive || (isActive && e.keyCode == 27)) return $this.click()
+ if (!isActive || (isActive && e.keyCode == 27)) {
+ if (e.which == 27) $parent.find(toggle).focus()
+ return $this.click()
+ }
$items = $('[role=menu] li:not(.divider):visible a', $parent)
@@ -154,7 +157,7 @@
$(document)
.on('click.dropdown.data-api touchstart.dropdown.data-api', clearMenus)
- .on('click.dropdown touchstart.dropdown.data-api', '.dropdown form', function (e) { e.stopPropagation() })
+ .on('click.dropdown.data-api touchstart.dropdown.data-api', '.dropdown form', function (e) { e.stopPropagation() })
.on('touchstart.dropdown.data-api', '.dropdown-menu', function (e) { e.stopPropagation() })
.on('click.dropdown.data-api touchstart.dropdown.data-api' , toggle, Dropdown.prototype.toggle)
.on('keydown.dropdown.data-api touchstart.dropdown.data-api', toggle + ', [role=menu]' , Dropdown.prototype.keydown)
diff --git a/docs/assets/js/bootstrap-popover.js b/docs/assets/js/bootstrap-popover.js
index dc639a63e2..4480c6cb67 100644
--- a/docs/assets/js/bootstrap-popover.js
+++ b/docs/assets/js/bootstrap-popover.js
@@ -99,7 +99,7 @@
placement: 'right'
, trigger: 'click'
, content: ''
- , template: 'Add .disabled to a <li> in the dropdown to disable the link.
+<ul class="dropdown-menu" role="menu" aria-labelledby="dropdownMenu"> + <li><a tabindex="-1" href="#">Regular link</a></li> + <li><a tabindex="-1" href="#">Disabled link</a></li> + <li><a tabindex="-1" href="#">Another link</a></li> +</ul>@@ -185,9 +204,9 @@
<div class="btn-group"> - <button class="btn">1</button> - <button class="btn">2</button> - <button class="btn">3</button> + <button class="btn">Left</button> + <button class="btn">Middle</button> + <button class="btn">Right</button> </div>@@ -1977,7 +1996,7 @@
<button class="close">×</button>-
iOS devices require an href="#" for click events if you would rather use an anchor.
+iOS devices require an href="#" for click events if you would rather use an anchor.
<a class="close" href="#">×</a>