Merge branch 'master' of github.com:twbs/bootstrap

.gitignore

@@ -34,7 +34,8 @@ nbproject
 .komodotools
 
 # grunt-html-validation
-validation-staus.json
+validation-status.json
+validation-report.json
 
 # Folders to ignore
 .hg

CONTRIBUTING.md

@@ -15,21 +15,13 @@ We only accept issues that are bug reports or feature requests. Bugs must be iso
 
 
 
-## Key branches
-
-- `master` is the latest, deployed version.
-- `gh-pages` is the hosted docs (not to be used for pull requests).
-- `*-wip` is the official work in progress branch for the next release.
-
-
-
 ## Pull requests
 
-- Try to submit pull requests against the latest `*-wip` branch for easier merging
-- CSS changes must be done in .less files first, never just the compiled files
-- If modifying the .less files, always recompile and commit the compiled files bootstrap.css and bootstrap.min.css
+- CSS changes must be done in `.less` files first, never just the compiled `.css` files
+- If modifying the `.less` files, always recompile and commit the compiled files `bootstrap.css` and `bootstrap.min.css`
 - Try not to pollute your pull request with unintended changes--keep them simple and small
 - Try to share which browsers your code has been tested in before submitting a pull request
+- Pull requests should always be against the `master` branch, never against `gh-pages`.
 
 
 

README.md

-# [Bootstrap v3.0.0](http://getbootstrap.com) [![Build Status](https://secure.travis-ci.org/twbs/bootstrap.png)](http://travis-ci.org/twbs/bootstrap)
+# [Bootstrap](http://getbootstrap.com) [![Build Status](https://secure.travis-ci.org/twbs/bootstrap.png)](http://travis-ci.org/twbs/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).
 
@@ -10,7 +10,7 @@ To get started, check out [http://getbootstrap.com](http://getbootstrap.com)!
 
 Three quick start options are available:
 
-* [Download the latest release](https://github.com/twbs/bootstrap/zipball/3.0.0-wip).
+* [Download the latest release](https://github.com/twbs/bootstrap/releases/tag/v3.0.0).
 * Clone the repo: `git clone git://github.com/twbs/bootstrap.git`.
 * Install with [Bower](http://bower.io): `bower install bootstrap`.
 
@@ -138,4 +138,4 @@ For more information on SemVer, please visit [http://semver.org/](http://semver.
 
 ## Copyright and license
 
-Copyright 2012 Twitter, Inc under [the Apache 2.0 license](LICENSE).
+Copyright 2013 Twitter, Inc under [the Apache 2.0 license](LICENSE).

_includes/header.html

@@ -6,7 +6,7 @@
 <title>
   {% if page.title == "Bootstrap" %}
     {{ page.title }}
-  {% else if %}
+  {% else %}
     {{ page.title }} &middot; Bootstrap
   {% endif %}
 </title>

components.html

@@ -289,7 +289,7 @@ base_url: "../"
 </div>
 {% endhighlight %}
 
-    <h3 id="dropdowns-alignment">Aligninment options</h3>
+    <h3 id="dropdowns-alignment">Alignment options</h3>
     <p>Add <code>.pull-right</code> to a <code>.dropdown-menu</code> to right align the dropdown menu.</p>
 {% highlight html %}
 <ul class="dropdown-menu pull-right" role="menu" aria-labelledby="dLabel">
@@ -1163,7 +1163,7 @@ base_url: "../"
 
 <div class="input-group">
   <input type="text" class="form-control">
-  <div class="input-group-btn btn-group">
+  <div class="input-group-btn">
     <!-- Button and dropdown menu -->
   </div>
 </div>

css.html

@@ -76,7 +76,7 @@ base_url: "../"
     <h3 id="grid-media-queries">Media queries</h3>
     <p>We use the following media queries to create the key breakpoints in our grid system.</p>
 {% highlight css %}
-/* Extra small devices (phones, up to 480px) */
+/* Extra small devices (phones, less than 768px) */
 /* No media query since this is the default in Bootstrap */
 
 /* Small devices (tablets, 768px and up) */

dist/css/bootstrap.css

@@ -1522,7 +1522,8 @@ table th[class*="col-"] {
 
 .table-hover > tbody > tr > td.success:hover,
 .table-hover > tbody > tr > th.success:hover,
-.table-hover > tbody > tr.success:hover > td {
+.table-hover > tbody > tr.success:hover > td,
+.table-hover > tbody > tr.success:hover > th {
   background-color: #d0e9c6;
   border-color: #c9e2b3;
 }
@@ -1545,7 +1546,8 @@ table th[class*="col-"] {
 
 .table-hover > tbody > tr > td.danger:hover,
 .table-hover > tbody > tr > th.danger:hover,
-.table-hover > tbody > tr.danger:hover > td {
+.table-hover > tbody > tr.danger:hover > td,
+.table-hover > tbody > tr.danger:hover > th {
   background-color: #ebcccc;
   border-color: #e6c1c7;
 }
@@ -1568,7 +1570,8 @@ table th[class*="col-"] {
 
 .table-hover > tbody > tr > td.warning:hover,
 .table-hover > tbody > tr > th.warning:hover,
-.table-hover > tbody > tr.warning:hover > td {
+.table-hover > tbody > tr.warning:hover > td,
+.table-hover > tbody > tr.warning:hover > th {
   background-color: #faf2cc;
   border-color: #f8e5be;
 }

examples/justified-nav/justified-nav.css

@@ -38,7 +38,6 @@ body {
   background-image: -moz-linear-gradient(top, #f5f5f5 0%, #e5e5e5 100%); /* FF3.6+ */
   background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#f5f5f5), color-stop(100%,#e5e5e5)); /* Chrome,Safari4+ */
   background-image: -webkit-linear-gradient(top, #f5f5f5 0%,#e5e5e5 100%); /* Chrome 10+,Safari 5.1+ */
-  background-image: -ms-linear-gradient(top, #f5f5f5 0%,#e5e5e5 100%); /* IE10+ */
   background-image: -o-linear-gradient(top, #f5f5f5 0%,#e5e5e5 100%); /* Opera 11.10+ */
   filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#f5f5f5', endColorstr='#e5e5e5',GradientType=0 ); /* IE6-9 */
   background-image: linear-gradient(top, #f5f5f5 0%,#e5e5e5 100%); /* W3C */

examples/non-responsive/non-responsive.css

-
 /* Template-specific stuff
  *
- * Customizations just for the template—these are not necessary for anything
+ * Customizations just for the template; these are not necessary for anything
  * with disabling the responsiveness.
  */
 

getting-started.html

@@ -22,9 +22,9 @@ base_url: "../"
     <h3 id="download-additional">Additional downloads</h3>
     <div class="bs-docs-dl-options">
       <h4>
-        <a href="{{ site.download }}" onclick="_gaq.push(['_trackEvent', 'Getting started', 'Download', 'Download source']);">Download latest source code</a>
+        <a href="{{ site.download }}" onclick="_gaq.push(['_trackEvent', 'Getting started', 'Download', 'Download source']);">Download source code</a>
       </h4>
-      <p>Get the original files for all CSS and JavaScript by downloading the latest version directly from GitHub.</p>
+      <p>Get the original files for all CSS and JavaScript by downloading the full release directly from GitHub.</p>
       <h4>
         <a href="{{ site.repo }}" onclick="_gaq.push(['_trackEvent', 'Getting started', 'Download', 'GitHub project']);">Clone or fork via GitHub</a>
       </h4>

less/mixins.less

@@ -393,7 +393,8 @@
   .table-hover > tbody > tr {
     > td.@{state}:hover,
     > th.@{state}:hover,
-    &.@{state}:hover > td {
+    &.@{state}:hover > td,
+    &.@{state}:hover > th {
       background-color: darken(@background, 5%);
       border-color: darken(@border, 5%);
     }

validation-report.json

-[{"filename":"_gh_pages/components/index.html","error":false},{"filename":"_gh_pages/css/index.html","error":false},{"filename":"_gh_pages/customize/index.html","error":false},{"filename":"_gh_pages/examples/carousel/index.html","error":false},{"filename":"_gh_pages/examples/grid/index.html","error":false},{"filename":"_gh_pages/examples/jumbotron-narrow/index.html","error":false},{"filename":"_gh_pages/examples/jumbotron/index.html","error":false},{"filename":"_gh_pages/examples/justified-nav/index.html","error":false},{"filename":"_gh_pages/examples/navbar-fixed-top/index.html","error":false},{"filename":"_gh_pages/examples/navbar-static-top/index.html","error":false},{"filename":"_gh_pages/examples/navbar/index.html","error":false},{"filename":"_gh_pages/examples/non-responsive/index.html","error":false},{"filename":"_gh_pages/examples/offcanvas/index.html","error":false},{"filename":"_gh_pages/examples/signin/index.html","error":false},{"filename":"_gh_pages/examples/starter-template/index.html","error":false},{"filename":"_gh_pages/examples/sticky-footer-navbar/index.html","error":false},{"filename":"_gh_pages/examples/sticky-footer/index.html","error":false},{"filename":"_gh_pages/examples/theme/index.html","error":false},{"filename":"_gh_pages/getting-started/index.html","error":false},{"filename":"_gh_pages/index.html","error":false},{"filename":"_gh_pages/javascript/index.html","error":false},{"filename":"_gh_pages/js/tests/index.html","error":false}]
\ No newline at end of file

validation-status.json

-{"_gh_pages/components/index.html":true,"_gh_pages/css/index.html":true,"_gh_pages/customize/index.html":true,"_gh_pages/examples/carousel/index.html":true,"_gh_pages/examples/grid/index.html":true,"_gh_pages/examples/jumbotron-narrow/index.html":true,"_gh_pages/examples/jumbotron/index.html":true,"_gh_pages/examples/justified-nav/index.html":true,"_gh_pages/examples/navbar-fixed-top/index.html":true,"_gh_pages/examples/navbar-static-top/index.html":true,"_gh_pages/examples/navbar/index.html":true,"_gh_pages/examples/non-responsive/index.html":true,"_gh_pages/examples/offcanvas/index.html":true,"_gh_pages/examples/signin/index.html":true,"_gh_pages/examples/starter-template/index.html":true,"_gh_pages/examples/sticky-footer-navbar/index.html":true,"_gh_pages/examples/sticky-footer/index.html":true,"_gh_pages/examples/theme/index.html":true,"_gh_pages/getting-started/index.html":true,"_gh_pages/index.html":true,"_gh_pages/javascript/index.html":true,"_gh_pages/js/tests/index.html":true}
\ No newline at end of file