Merge branch 'master' into gh-pages

Gruntfile.js

@@ -127,7 +127,7 @@ module.exports = function(grunt) {
 
     validation: {
       options: {
-        reset: true,
+        reset: true
       },
       files: {
         src: ["_gh_pages/**/*.html"]
@@ -169,7 +169,7 @@ module.exports = function(grunt) {
   grunt.registerTask('validate-html', ['jekyll', 'validation']);
 
   // Test task.
-  var testSubtasks = ['dist-css', 'jshint', 'qunit', 'validate-html'];
+  var testSubtasks = ['dist-css', 'jshint', 'qunit'];
   // Only run BrowserStack tests under Travis
   if (process.env.TRAVIS) {
     // Only run BrowserStack tests if this is a mainline commit in twbs/bootstrap, or you have your own BrowserStack key
@@ -202,7 +202,7 @@ module.exports = function(grunt) {
       var files = {}
       fs.readdirSync(type)
         .filter(function (path) {
-          return new RegExp('\\.' + type + '$').test(path)
+          return type == 'fonts' ? true : new RegExp('\\.' + type + '$').test(path)
         })
         .forEach(function (path) {
           return files[path] = fs.readFileSync(type + '/' + path, 'utf8')
@@ -211,7 +211,7 @@ module.exports = function(grunt) {
     }
 
     var customize = fs.readFileSync('customize.html', 'utf-8')
-    var files = '<!-- generated -->\n<script id="files">\n' + getFiles('js') + getFiles('less') + '<\/script>\n<!-- /generated -->'
-    fs.writeFileSync('customize.html', customize.replace(/<!-- generated -->(.|[\n\r])*<!-- \/generated -->/, files))
+    var files = '<!-- generated -->\n<script id="files">\n' + getFiles('js') + getFiles('less') + getFiles('fonts') + '<\/script>\n<!-- /generated -->'
+    fs.writeFileSync('customize.html', customize.replace(/<!-- generated -->(.|[\n\r])*<!-- \/generated -->/, '') + files)
   });
 };

README.md

@@ -22,7 +22,7 @@ Read the [Getting Started page](http://getbootstrap.com/getting-started/) for in
 
 Have a bug or a feature request? [Please open a new issue](https://github.com/twbs/bootstrap/issues). Before opening any issue, please search for existing issues and read the [Issue Guidelines](https://github.com/necolas/issue-guidelines), written by [Nicolas Gallagher](https://github.com/necolas/).
 
-You may use [this JS Bin](http://jsbin.com/aFacAf/1/edit) as a template for your bug reports.
+You may use [this JS Bin](http://jsbin.com/aKiCIDO/1/edit) as a template for your bug reports.
 
 
 

_config.yml

@@ -12,11 +12,12 @@ port:             9001
 
 # Custom vars
 repo:             https://github.com/twbs/bootstrap
-download:         https://github.com/twbs/bootstrap/archive/3.0.0-wip.zip
-download_dist:    http://getbootstrap.com/bs-v3.0.0-rc.2-dist.zip
+download:         https://github.com/twbs/bootstrap/archive/v3.0.0.zip
+download_dist:    https://github.com/twbs/bootstrap/releases/download/v3.0.0/bootstrap-3.0.0-dist.zip
 
 blog:             http://blog.getbootstrap.com
 expo:             http://expo.getbootstrap.com
 
-cdn_css:          //netdna.bootstrapcdn.com/bootstrap/3.0.0-wip/css/bootstrap.min.css
-cdn_js:           //netdna.bootstrapcdn.com/bootstrap/3.0.0-wip/js/bootstrap.min.js
+cdn_css:          //netdna.bootstrapcdn.com/bootstrap/3.0.0/css/bootstrap.min.css
+cdn_theme_css:    //netdna.bootstrapcdn.com/bootstrap/3.0.0/css/bootstrap-theme.min.css
+cdn_js:           //netdna.bootstrapcdn.com/bootstrap/3.0.0/js/bootstrap.min.js

_includes/nav-components.html

@@ -93,8 +93,7 @@
 <li>
   <a href="#alerts">Alerts</a>
   <ul class="nav">
-    <li><a href="#alerts-default">Default alert</a></li>
-    <li><a href="#alerts-alternatives">Contextual alternatives</a></li>
+    <li><a href="#alerts-examples">Examples</a></li>
     <li><a href="#alerts-dismissable">Dismissable alerts</a></li>
     <li><a href="#alerts-links">Links in alerts</a></li>
   </ul>
@@ -131,6 +130,7 @@
     <li><a href="#panels-basic">Basic example</a></li>
     <li><a href="#panels-heading">Panel with heading</a></li>
     <li><a href="#panels-alternatives">Contextual alternatives</a></li>
+    <li><a href="#panels-tables">With tables</a>
     <li><a href="#panels-list-group">With list groups</a>
   </ul>
 </li>

_includes/nav-css.html

@@ -46,6 +46,7 @@
     <li><a href="#tables-hover-rows">Hover rows</a></li>
     <li><a href="#tables-condensed">Condensed table</a></li>
     <li><a href="#tables-contextual-classes">Contextual classes</a></li>
+    <li><a href="#tables-responsive">Responsive tables</a></li>
   </ul>
 </li>
 <li>
@@ -70,6 +71,17 @@
     <li><a href="#buttons-tags">Button tags</a></li>
   </ul>
 </li>
-<li><a href="#images">Images</a></li>
-<li><a href="#helper-classes">Helper classes</a></li>
-<li><a href="#responsive-utilities">Responsive utilities</a></li>
+<li>
+  <a href="#images">Images</a>
+</li>
+<li>
+  <a href="#helper-classes">Helper classes</a>
+</li>
+<li>
+  <a href="#responsive-utilities">Responsive utilities</a>
+  <ul class="nav">
+    <li><a href="#responsive-utilities-classes">Available classes</a></li>
+    <li><a href="#responsive-utilities-print">Print classes</a></li>
+    <li><a href="#responsive-utilities-tests">Test cases</a></li>
+  </ul>
+</li>

_includes/nav-getting-started.html

 <li>
   <a href="#download">Download Bootstrap</a>
   <ul class="nav">
-    <li><a href="#download-source">Download source</a></li>
+    <li><a href="#download-compiled">Compiled CSS, JS, and fonts</a></li>
     <li><a href="#download-additional">Additional downloads</a></li>
     <li><a href="#download-cdn">Bootstrap CDN</a></li>
   </ul>

_includes/nav-main.html

@@ -7,7 +7,7 @@
         <span class="icon-bar"></span>
         <span class="icon-bar"></span>
       </button>
-      <a href="{{ page.base_url }}" class="navbar-brand">Bootstrap 3 RC2</a>
+      <a href="{{ page.base_url }}" class="navbar-brand">Bootstrap</a>
     </div>
     <nav class="collapse navbar-collapse bs-navbar-collapse" role="navigation">
       <ul class="nav navbar-nav">

_layouts/default.html

@@ -52,17 +52,21 @@
     <!-- Footer
     ================================================== -->
     <footer class="bs-footer" role="contentinfo">
-      {% include social-buttons.html %}
+      <div class="container">
+        {% include social-buttons.html %}
 
-      <p>Designed and built with all the love in the world by <a href="http://twitter.com/mdo" target="_blank">@mdo</a> and <a href="http://twitter.com/fat" target="_blank">@fat</a>.</p>
-      <p>Code licensed under <a href="http://www.apache.org/licenses/LICENSE-2.0" target="_blank">Apache License v2.0</a>, documentation under <a href="http://creativecommons.org/licenses/by/3.0/">CC BY 3.0</a>.</p>
-      <ul class="footer-links">
-        <li><a href="{{ site.blog }}">Blog</a></li>
-        <li class="muted">&middot;</li>
-        <li><a href="{{ site.repo }}/issues?state=open">Issues</a></li>
-        <li class="muted">&middot;</li>
-        <li><a href="{{ site.repo }}/releases">Releases</a></li>
-      </ul>
+        <p>Designed and built with all the love in the world by <a href="http://twitter.com/mdo" target="_blank">@mdo</a> and <a href="http://twitter.com/fat" target="_blank">@fat</a>.</p>
+        <p>Code licensed under <a href="http://www.apache.org/licenses/LICENSE-2.0" target="_blank">Apache License v2.0</a>, documentation under <a href="http://creativecommons.org/licenses/by/3.0/">CC BY 3.0</a>.</p>
+        <ul class="footer-links">
+          <li><a href="{{ page.base_url }}2.3.2/">Bootstrap 2.3.2 docs</a></li>
+          <li class="muted">&middot;</li>
+          <li><a href="{{ site.blog }}">Blog</a></li>
+          <li class="muted">&middot;</li>
+          <li><a href="{{ site.repo }}/issues?state=open">Issues</a></li>
+          <li class="muted">&middot;</li>
+          <li><a href="{{ site.repo }}/releases">Releases</a></li>
+        </ul>
+      </div>
     </footer>
 
     <!-- JS and analytics only. -->

_layouts/home.html

@@ -14,13 +14,16 @@
     <!-- Page content of course! -->
     {{ content }}
 
-    <!-- Callout for the old docs link -->
-    {% include old-bs-docs.html %}
-
     <footer class="container" role="contentinfo">
       {% include social-buttons.html %}
 
       <ul class="bs-masthead-links">
+        <li class="current-version">
+          Currently v3.0.0
+        </li>
+        <li>
+          <a href="{{ page.base_url }}2.3.2/">Bootstrap 2.3.2 docs</a>
+        </li>
         <li>
           <a href="{{ site.repo }}" onclick="_gaq.push(['_trackEvent', 'Jumbotron actions', 'Jumbotron links', 'GitHub project']);">GitHub project</a>
         </li>

assets/js/customizer.js

 window.onload = function () { // wait for load in a dumb way because B-0
-  var cw = '/*!\n * Bootstrap v3.0.0-rc.2\n *\n * Copyright 2013 Twitter, Inc\n * Licensed under the Apache License v2.0\n * http://www.apache.org/licenses/LICENSE-2.0\n *\n * Designed and built with all the love in the world @twitter by @mdo and @fat.\n */\n\n'
+  var cw = '/*!\n * Bootstrap v3.0.0\n *\n * Copyright 2013 Twitter, Inc\n * Licensed under the Apache License v2.0\n * http://www.apache.org/licenses/LICENSE-2.0\n *\n * Designed and built with all the love in the world @twitter by @mdo and @fat.\n */\n\n'
 
   function showError(msg, err) {
     $('<div id="bsCustomizerAlert" class="bs-customizer-alert">\
         <div class="container">\
           <a href="#bsCustomizerAlert" data-dismiss="alert" class="close pull-right">&times;</a>\
-          <p class="bs-customizer-alert-text">' + msg + '</p>' +
+          <p class="bs-customizer-alert-text"><span class="glyphicon glyphicon-warning-sign"></span>' + msg + '</p>' +
           (err.extract ? '<pre class="bs-customizer-alert-extract">' + err.extract.join('\n') + '</pre>' : '') + '\
         </div>\
       </div>').appendTo('body').alert()
@@ -51,7 +51,7 @@ window.onload = function () { // wait for load in a dumb way because B-0
       history.replaceState(false, document.title, window.location.origin + window.location.pathname + '?id=' + result.id)
     })
     .error(function(err) {
-      showError('<strong>Error</strong> Could not save gist file, configuration not saved.', err)
+      showError('<strong>Ruh roh!</strong> Could not save gist file, configuration not saved.', err)
     })
   }
 
@@ -107,8 +107,8 @@ window.onload = function () { // wait for load in a dumb way because B-0
     })
   }
 
-  function generateZip(css, js, complete) {
-    if (!css && !js) return showError('<strong>Error</strong> No Bootstrap files selected.', new Error('no Bootstrap'))
+  function generateZip(css, js, fonts, complete) {
+    if (!css && !js) return showError('<strong>Ruh roh!</strong> No Bootstrap files selected.', new Error('no Bootstrap'))
 
     var zip = new JSZip()
 
@@ -126,6 +126,13 @@ window.onload = function () { // wait for load in a dumb way because B-0
       }
     }
 
+    if (fonts) {
+      var fontsFolder = zip.folder('fonts')
+      for (var fileName in fonts) {
+        fontsFolder.file(fileName, fonts[fileName])
+      }
+    }
+
     var content = zip.generate({type:"blob"})
 
     complete(content)
@@ -141,6 +148,13 @@ window.onload = function () { // wait for load in a dumb way because B-0
     return result + '\n\n'
   }
 
+  function generateFonts() {
+    var glyphicons = $('#less-section [value="glyphicons.less"]:checked')
+    if (glyphicons.length) {
+      return __fonts
+    }
+  }
+
   function generateCSS() {
     var $checked = $('#less-section input:checked')
 
@@ -158,6 +172,8 @@ window.onload = function () { // wait for load in a dumb way because B-0
     css += __less['variables.less']
     if (vars) css += generateCustomCSS(vars)
     css += __less['mixins.less']
+    css += __less['normalize.less']
+    css += __less['scaffolding.less']
     css += $checked
       .map(function () { return __less[this.value] })
       .toArray()
@@ -172,7 +188,7 @@ window.onload = function () { // wait for load in a dumb way because B-0
         , filename: 'bootstrap.css'
       }).parse(css, function (err, tree) {
         if (err) {
-          return showError('<strong>Error</strong> Could not parse less files.', err)
+          return showError('<strong>Ruh roh!</strong> Could not parse less files.', err)
         }
         result = {
           'bootstrap.css'     : cw + tree.toCSS(),
@@ -180,7 +196,7 @@ window.onload = function () { // wait for load in a dumb way because B-0
         }
       })
     } catch (err) {
-      return showError('<strong>Error</strong> Could not parse less files.', err)
+      return showError('<strong>Ruh roh!</strong> Could not parse less files.', err)
     }
 
     return result
@@ -250,7 +266,7 @@ window.onload = function () { // wait for load in a dumb way because B-0
 
     $compileBtn.attr('disabled', 'disabled')
 
-    generateZip(generateCSS(), generateJavascript(), function (blob) {
+    generateZip(generateCSS(), generateJavascript(), generateFonts(), function (blob) {
       $compileBtn.removeAttr('disabled')
       saveAs(blob, "bootstrap.zip")
       createGist(getCustomizerData())
@@ -271,4 +287,4 @@ window.onload = function () { // wait for load in a dumb way because B-0
   }
 
   parseUrl()
-}
+}
\ No newline at end of file

dist/css/bootstrap-theme.css

@@ -199,16 +199,6 @@
           box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.25), 0 1px 2px rgba(0, 0, 0, 0.05);
 }
 
-.alert {
-  background-image: -webkit-gradient(linear, left 0%, left 100%, from(#fcf8e3), to(#f8efc0));
-  background-image: -webkit-linear-gradient(top, #fcf8e3, 0%, #f8efc0, 100%);
-  background-image: -moz-linear-gradient(top, #fcf8e3 0%, #f8efc0 100%);
-  background-image: linear-gradient(to bottom, #fcf8e3 0%, #f8efc0 100%);
-  background-repeat: repeat-x;
-  border-color: #f5e79e;
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffcf8e3', endColorstr='#fff8efc0', GradientType=0);
-}
-
 .alert-success {
   background-image: -webkit-gradient(linear, left 0%, left 100%, from(#dff0d8), to(#c8e5bc));
   background-image: -webkit-linear-gradient(top, #dff0d8, 0%, #c8e5bc, 100%);
@@ -229,6 +219,16 @@
   filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffd9edf7', endColorstr='#ffb9def0', GradientType=0);
 }
 
+.alert-warning {
+  background-image: -webkit-gradient(linear, left 0%, left 100%, from(#fcf8e3), to(#f8efc0));
+  background-image: -webkit-linear-gradient(top, #fcf8e3, 0%, #f8efc0, 100%);
+  background-image: -moz-linear-gradient(top, #fcf8e3 0%, #f8efc0 100%);
+  background-image: linear-gradient(to bottom, #fcf8e3 0%, #f8efc0 100%);
+  background-repeat: repeat-x;
+  border-color: #f5e79e;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffcf8e3', endColorstr='#fff8efc0', GradientType=0);
+}
+
 .alert-danger {
   background-image: -webkit-gradient(linear, left 0%, left 100%, from(#f2dede), to(#e7c3c3));
   background-image: -webkit-linear-gradient(top, #f2dede, 0%, #e7c3c3, 100%);
@@ -317,7 +317,7 @@
           box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05);
 }
 
-.panel-heading {
+.panel-default > .panel-heading {
   background-image: -webkit-gradient(linear, left 0%, left 100%, from(#f5f5f5), to(#e8e8e8));
   background-image: -webkit-linear-gradient(top, #f5f5f5, 0%, #e8e8e8, 100%);
   background-image: -moz-linear-gradient(top, #f5f5f5 0%, #e8e8e8 100%);

examples/carousel/carousel.css

@@ -19,7 +19,6 @@ body {
 }
 
 
-
 /* CUSTOMIZE THE CAROUSEL
 -------------------------------------------------- */
 
@@ -38,6 +37,7 @@ body {
 /* Declare heights because of positioning of img element */
 .carousel .item {
   height: 500px;
+  background-color: #777;
 }
 .carousel-inner > .item > img {
   position: absolute;
@@ -93,7 +93,7 @@ body {
 
 @media (min-width: 768px) {
 
-  /* Remve the edge padding needed for mobile */
+  /* Remove the edge padding needed for mobile */
   .marketing {
     padding-left: 0;
     padding-right: 0;

examples/jumbotron-narrow/jumbotron-narrow.css

@@ -4,7 +4,7 @@ body {
   padding-bottom: 20px;
 }
 
-/* Everything but the jumbotron gets side spacing for mobile-first views */
+/* Everything but the jumbotron gets side spacing for mobile first views */
 .header,
 .marketing,
 .footer {

examples/justified-nav/justified-nav.css

@@ -76,8 +76,6 @@ body {
   }
 }
 
-
-
 /* Responsive: Portrait tablets and up */
 @media screen and (min-width: 768px) {
   /* Remove the padding we set earlier */

examples/non-responsive/index.html

@@ -25,6 +25,45 @@
   </head>
 
   <body>
+
+    <!-- Fixed navbar -->
+    <div class="navbar navbar-default navbar-fixed-top">
+      <div class="container">
+        <div class="navbar-header">
+          <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
+            <span class="icon-bar"></span>
+            <span class="icon-bar"></span>
+            <span class="icon-bar"></span>
+          </button>
+          <a class="navbar-brand" href="#">Project name</a>
+        </div>
+        <div class="navbar-collapse collapse">
+          <ul class="nav navbar-nav">
+            <li class="active"><a href="#">Home</a></li>
+            <li><a href="#about">About</a></li>
+            <li><a href="#contact">Contact</a></li>
+            <li class="dropdown">
+              <a href="#" class="dropdown-toggle" data-toggle="dropdown">Dropdown <b class="caret"></b></a>
+              <ul class="dropdown-menu">
+                <li><a href="#">Action</a></li>
+                <li><a href="#">Another action</a></li>
+                <li><a href="#">Something else here</a></li>
+                <li class="divider"></li>
+                <li class="dropdown-header">Nav header</li>
+                <li><a href="#">Separated link</a></li>
+                <li><a href="#">One more separated link</a></li>
+              </ul>
+            </li>
+          </ul>
+          <ul class="nav navbar-nav navbar-right">
+            <li><a href="#">Link</a></li>
+            <li><a href="#">Link</a></li>
+            <li><a href="#">Link</a></li>
+          </ul>
+        </div><!--/.nav-collapse -->
+      </div>
+    </div>
+
     <div class="container">
 
       <div class="page-header">
@@ -35,6 +74,9 @@
       <h3>What changes</h3>
       <p>Note the lack of the <code>&lt;meta name="viewport" content="width=device-width, initial-scale=1.0"&gt;</code>, which disables the zooming aspect of sites in mobile devices. In addition, we reset our container's width and are basically good to go.</p>
 
+      <h3>Regarding navbars</h3>
+      <p>As a heads up, the navbar component is rather tricky here in that the styles for displaying it are rather specific and detailed. Overrides to ensure desktop styles display are not as performant or sleek as one would like. Just be aware there may be potential gotchas as you build on top of this example when using the navbar.</p>
+
       <h3>Non-responsive grid system</h3>
       <div class="row">
         <div class="col-xs-4">One third</div>
@@ -48,5 +90,7 @@
     <!-- Bootstrap core JavaScript
     ================================================== -->
     <!-- Placed at the end of the document so the pages load faster -->
+    <script src="../../assets/js/jquery.js"></script>
+    <script src="../../dist/js/bootstrap.min.js"></script>
   </body>
 </html>

examples/non-responsive/non-responsive.css

+
+/* Template-specific stuff
+ *
+ * Customizations just for the template—these are not necessary for anything
+ * with disabling the responsiveness.
+ */
+
+/* Account for fixed navbar */
+body {
+  padding-top: 70px;
+  padding-bottom: 30px;
+}
+
+/* Finesse the page header spacing */
+.page-header {
+  margin-bottom: 30px;
+}
+.page-header .lead {
+  margin-bottom: 10px;
+}
+
+
+/* Non-responsive overrides
+ *
+ * Utilitze the following CSS to disable the responsive-ness of the container,
+ * grid system, and navbar.
+ */
+
+/* Reset the container */
 .container {
   max-width: none !important;
   width: 970px;
 }
 
+/* Demonstrate the grids */
 .col-xs-4 {
   padding-top: 15px;
   padding-bottom: 15px;
@@ -11,3 +41,77 @@
   background-color: rgba(86,61,124,.15);
   border: 1px solid rgba(86,61,124,.2);
 }
+
+.container .navbar-header,
+.container .navbar-collapse {
+  margin-right: 0;
+  margin-left: 0;
+}
+
+/* Always float the navbar header */
+.navbar-header {
+  float: left;
+}
+
+/* Undo the collapsing navbar */
+.navbar-collapse {
+  display: block !important;
+  height: auto !important;
+  padding-bottom: 0;
+  overflow: visible !important;
+}
+
+.navbar-toggle {
+  display: none;
+}
+
+.navbar-brand {
+  margin-left: -15px;
+}
+
+/* Always apply the floated nav */
+.navbar-nav {
+  float: left;
+  margin: 0;
+}
+.navbar-nav > li {
+  float: left;
+}
+.navbar-nav > li > a {
+  padding: 15px;
+}
+
+/* Redeclare since we override the float above */
+.navbar-nav.navbar-right {
+  float: right;
+}
+
+/* Undo custom dropdowns */
+.navbar .open .dropdown-menu {
+  position: absolute;
+  float: left;
+  background-color: #fff;
+  border: 1px solid #cccccc;
+  border: 1px solid rgba(0, 0, 0, 0.15);
+  border-width: 0 1px 1px;
+  border-radius: 0 0 4px 4px;
+  -webkit-box-shadow: 0 6px 12px rgba(0, 0, 0, 0.175);
+          box-shadow: 0 6px 12px rgba(0, 0, 0, 0.175);
+}
+.navbar .open .dropdown-menu > li > a {
+  color: #333;
+}
+.navbar .open .dropdown-menu > li > a:hover,
+.navbar .open .dropdown-menu > li > a:focus,
+.navbar .open .dropdown-menu > .active > a,
+.navbar .open .dropdown-menu > .active > a:hover,
+.navbar .open .dropdown-menu > .active > a:focus {
+  color: #fff !important;
+  background-color: #428bca !important;
+}
+.navbar .open .dropdown-menu > .disabled > a,
+.navbar .open .dropdown-menu > .disabled > a:hover,
+.navbar .open .dropdown-menu > .disabled > a:focus {
+  color: #999 !important;
+  background-color: transparent !important;
+}

examples/theme/index.html

@@ -219,15 +219,15 @@
       <div class="page-header">
         <h1>Alerts</h1>
       </div>
-      <div class="alert">
-        <strong>Warning!</strong> Best check yo self, you're not looking too good.
-      </div>
       <div class="alert alert-success">
         <strong>Well done!</strong> You successfully read this important alert message.
       </div>
       <div class="alert alert-info">
         <strong>Heads up!</strong> This alert needs your attention, but it's not super important.
       </div>
+      <div class="alert alert-warning">
+        <strong>Warning!</strong> Best check yo self, you're not looking too good.
+      </div>
       <div class="alert alert-danger">
         <strong>Oh snap!</strong> Change a few things up and try submitting again.
       </div>
@@ -309,7 +309,7 @@
       </div>
       <div class="row">
         <div class="col-sm-4">
-          <div class="panel">
+          <div class="panel panel-default">
             <div class="panel-heading">
               <h3 class="panel-title">Panel title</h3>
             </div>

index.html

@@ -6,11 +6,10 @@ base_url: "./"
 
 <main class="bs-masthead" id="content" role="main">
   <div class="container">
-    <h1>Bootstrap 3</h1>
-    <p class="lead">Sleek, intuitive, and powerful mobile-first front-end framework for faster and easier web development.</p>
+    <h1>Bootstrap</h1>
+    <p class="lead">Sleek, intuitive, and powerful mobile first front-end framework for faster and easier web development.</p>
     <p>
-      <a href="{{ site.download }}" class="btn btn-outline btn-lg" onclick="_gaq.push(['_trackEvent', 'Jumbotron actions', 'Download', 'Download 3.0.0 RC2']);">Download latest BS3</a>
+      <a href="{{ site.download }}" class="btn btn-outline-inverse btn-lg" onclick="_gaq.push(['_trackEvent', 'Jumbotron actions', 'Download', 'Download 3.0.0']);">Download Bootstrap</a>
     </p>
-    <p><strong>Heads up!</strong> Downloads are pulled directly from the latest committed code on GitHub, and as a result our docs may at times be out of sync.</p>
   </div>
 </main>

less/alerts.less

@@ -9,9 +9,7 @@
 .alert {
   padding: @alert-padding;
   margin-bottom: @line-height-computed;
-  color: @alert-text;
-  background-color: @alert-bg;
-  border: 1px solid @alert-border;
+  border: 1px solid transparent;
   border-radius: @alert-border-radius;
 
   // Headings for larger alerts
@@ -20,14 +18,9 @@
     // Specified for the h4 to prevent conflicts of changing @headingsColor
     color: inherit;
   }
-  // Match the hr to the border of the alert
-  hr {
-    border-top-color: darken(@alert-border, 5%);
-  }
   // Provide class for links that match alerts
   .alert-link {
     font-weight: @alert-link-font-weight;
-    color: darken(@alert-text, 10%);
   }
 
   // Improve alignment and spacing of inner content
@@ -63,9 +56,12 @@
 .alert-success {
   .alert-variant(@alert-success-bg; @alert-success-border; @alert-success-text);
 }
-.alert-danger {
-  .alert-variant(@alert-danger-bg; @alert-danger-border; @alert-danger-text);
-}
 .alert-info {
   .alert-variant(@alert-info-bg; @alert-info-border; @alert-info-text);
 }
+.alert-warning {
+  .alert-variant(@alert-warning-bg; @alert-warning-border; @alert-warning-text);
+}
+.alert-danger {
+  .alert-variant(@alert-danger-bg; @alert-danger-border; @alert-danger-text);
+}

less/carousel.less

@@ -98,12 +98,17 @@
 
   // Toggles
   .icon-prev,
-  .icon-next {
+  .icon-next,
+  .glyphicon-chevron-left,
+  .glyphicon-chevron-right {
     position: absolute;
     top: 50%;
     left: 50%;
     z-index: 5;
     display: inline-block;
+  }
+  .icon-prev,
+  .icon-next {
     width:  20px;
     height: 20px;
     margin-top: -10px;

less/dropdowns.less

@@ -177,3 +177,17 @@
     margin-bottom: 1px;
   }
 }
+
+
+// Component alignment
+//
+// Reiterate per navbar.less and the modified component alignment there.
+
+@media (min-width: @grid-float-breakpoint) {
+  .navbar-right {
+    .dropdown-menu {
+      .pull-right > .dropdown-menu();
+    }
+  }
+}
+

less/forms.less

@@ -257,7 +257,7 @@ input[type="checkbox"],
 
 .form-control-static {
   margin-bottom: 0; // Remove default margin from `p`
-  padding-top: @padding-base-vertical;
+  padding-top: (@padding-base-vertical + 1);
 }
 
 

less/glyphicons.less

@@ -20,7 +20,7 @@
 // Catchall baseclass
 .glyphicon {
   position: relative;
-  top: 2px;
+  top: 1px;
   display: inline-block;
   font-family: 'Glyphicons Halflings';
   font-style: normal;

less/grid.less

@@ -8,7 +8,7 @@
   .container-fixed();
 }
 
-// Mobile-first defaults
+// mobile first defaults
 .row {
   .make-row();
 }

less/jumbotron.less

@@ -4,12 +4,12 @@
 
 
 .jumbotron {
-  padding: 30px;
-  margin-bottom: 30px;
+  padding: @jumbotron-padding;
+  margin-bottom: @jumbotron-padding;
   font-size: (@font-size-base * 1.5);
   font-weight: 200;
   line-height: (@line-height-base * 1.5);
-  color: @jumbotron-lead-color;
+  color: @jumbotron-color;
   background-color: @jumbotron-bg;
 
   h1 {
@@ -25,12 +25,12 @@
   }
 
   @media screen and (min-width: @screen-tablet) {
-    padding-top: 50px;
-    padding-bottom: 50px;
+    padding-top:    (@jumbotron-padding * 1.6);
+    padding-bottom: (@jumbotron-padding * 1.6);
 
     .container & {
-      padding-left: 60px;
-      padding-right: 60px;
+      padding-left:  (@jumbotron-padding * 2);
+      padding-right: (@jumbotron-padding * 2);
     }
 
     h1 {

less/labels.less

@@ -4,7 +4,7 @@
 
 .label {
   display: inline;
-  padding: .25em .6em;
+  padding: .2em .6em .3em;
   font-size: 75%;
   font-weight: bold;
   line-height: 1;

less/mixins.less

@@ -340,7 +340,7 @@
 
 // Panels
 // -------------------------
-.panel-variant(@border; @heading-text-color; @heading-bg-color; @heading-border) {
+.panel-variant(@border; @heading-text-color; @heading-bg-color; @heading-border;) {
   border-color: @border;
   & > .panel-heading {
     color: @heading-text-color;

less/modals.less

@@ -10,6 +10,14 @@
 // Kill the scroll on the body
 .modal-open {
   overflow: hidden;
+
+
+  // Account for hiding of scrollbar
+  body&,
+  .navbar-fixed-top,
+  .navbar-fixed-bottom {
+    margin-right: 15px
+  }
 }
 
 // Container that the modal scrolls within

less/navbar.less

@@ -10,6 +10,7 @@
 
 .navbar {
   position: relative;
+  z-index: @zindex-navbar;
   min-height: @navbar-height; // Ensure a navbar always shows (e.g., without a .navbar-brand in collapsed mode)
   margin-bottom: @navbar-margin-bottom;
   border: 1px solid transparent;
@@ -77,9 +78,16 @@
       overflow-y: visible;
     }
 
+    // Account for first and last children spacing
+    .navbar-nav.navbar-left:first-child {
+      margin-left: -@navbar-padding-horizontal;
+    }
     .navbar-nav.navbar-right:last-child {
       margin-right: -@navbar-padding-horizontal;
     }
+    .navbar-text:last-child {
+      margin-right: 0;
+    }
   }
 }
 
@@ -120,7 +128,6 @@
   position: fixed;
   right: 0;
   left: 0;
-  z-index: @zindex-navbar-fixed;
   border-width: 0 0 1px;
 
   // Undo the rounded corners
@@ -129,6 +136,7 @@
   }
 }
 .navbar-fixed-top {
+  z-index: @zindex-navbar-fixed;
   top: 0;
 }
 .navbar-fixed-bottom {
@@ -252,12 +260,7 @@
 
 @media (min-width: @grid-float-breakpoint) {
   .navbar-left  { .pull-left(); }
-  .navbar-right {
-    .pull-right();
-    .dropdown-menu {
-      .pull-right > .dropdown-menu();
-    }
-  }
+  .navbar-right { .pull-right(); }
 }
 
 

less/panels.less

@@ -7,7 +7,7 @@
 .panel {
   margin-bottom: @line-height-computed;
   background-color: @panel-bg;
-  border: 1px solid @panel-border;
+  border: 1px solid transparent;
   border-radius: @panel-border-radius;
   .box-shadow(0 1px 1px rgba(0,0,0,.05));
 }
@@ -25,9 +25,6 @@
 // any kind of custom content between the two.
 
 .panel {
-  > .table {
-    margin-bottom: 0;
-  }
   > .list-group {
     margin-bottom: 0;
 
@@ -71,8 +68,7 @@
 // Optional heading
 .panel-heading {
   padding: 10px 15px;
-  background-color: @panel-heading-bg;
-  border-bottom: 1px solid @panel-border;
+  border-bottom: 1px solid transparent;
   .border-top-radius(@panel-border-radius - 1);
 }
 
@@ -90,7 +86,7 @@
 .panel-footer {
   padding: 10px 15px;
   background-color: @panel-footer-bg;
-  border-top: 1px solid @panel-border;
+  border-top: 1px solid @panel-inner-border;
   .border-bottom-radius(@panel-border-radius - 1);
 }
 
@@ -114,13 +110,13 @@
   .panel-heading {
     border-bottom: 0;
     + .panel-collapse .panel-body {
-      border-top: 1px solid @panel-border;
+      border-top: 1px solid @panel-inner-border;
     }
   }
   .panel-footer {
     border-top: 0;
     + .panel-collapse .panel-body {
-      border-bottom: 1px solid @panel-border;
+      border-bottom: 1px solid @panel-inner-border;
     }
   }
 
@@ -132,6 +128,9 @@
 
 
 // Contextual variations
+.panel-default {
+  .panel-variant(@panel-default-border; @panel-default-text; @panel-default-heading-bg; @panel-default-border);
+}
 .panel-primary {
   .panel-variant(@panel-primary-border; @panel-primary-text; @panel-primary-heading-bg; @panel-primary-border);
 }

less/responsive-utilities.less

@@ -36,48 +36,84 @@
 // Visibility utilities
 
 .visible-xs {
-  .responsive-visibility();
-  @media (min-width: @screen-sm) and (max-width: @screen-sm-max) {
-    .responsive-invisibility();
+  .responsive-invisibility();
+  @media (max-width: @screen-xs-max) {
+    .responsive-visibility();
   }
-  @media (min-width: @screen-md) and (max-width: @screen-md-max) {
-    .responsive-invisibility();
+  &.visible-sm {
+    @media (min-width: @screen-sm) and (max-width: @screen-sm-max) {
+      .responsive-visibility();
+    }
   }
-  @media (min-width: @screen-lg) {
-    .responsive-invisibility();
+  &.visible-md {
+    @media (min-width: @screen-md) and (max-width: @screen-md-max) {
+      .responsive-visibility();
+    }    
+  }
+  &.visible-lg {
+    @media (min-width: @screen-lg) {
+      .responsive-visibility();
+    }    
   }
 }
 .visible-sm {
   .responsive-invisibility();
+  &.visible-xs {
+    @media (max-width: @screen-xs-max) {
+      .responsive-visibility();
+    }    
+  }
   @media (min-width: @screen-sm) and (max-width: @screen-sm-max) {
     .responsive-visibility();
   }
-  @media (min-width: @screen-md) and (max-width: @screen-md-max) {
-    .responsive-invisibility();
+  &.visible-md {
+    @media (min-width: @screen-md) and (max-width: @screen-md-max) {
+      .responsive-visibility();
+    }    
   }
-  @media (min-width: @screen-lg) {
-    .responsive-invisibility();
+  &.visible-lg {
+    @media (min-width: @screen-lg) {
+      .responsive-visibility();
+    }    
   }
 }
 .visible-md {
   .responsive-invisibility();
-  @media (min-width: @screen-sm) and (max-width: @screen-sm-max) {
-    .responsive-invisibility();
+  &.visible-xs {
+    @media (max-width: @screen-xs-max) {
+      .responsive-visibility();
+    }    
+  }
+  &.visible-sm {
+    @media (min-width: @screen-sm) and (max-width: @screen-sm-max) {
+      .responsive-visibility();
+    }
   }
   @media (min-width: @screen-md) and (max-width: @screen-md-max) {
     .responsive-visibility();
   }
-  @media (min-width: @screen-lg) {
-    .responsive-invisibility();
+  &.visible-lg {
+    @media (min-width: @screen-lg) {
+      .responsive-visibility();
+    }    
   }
 }
 .visible-lg {
   .responsive-invisibility();
-  @media (min-width: @screen-sm) and (max-width: @screen-sm-max) {
-    .responsive-invisibility();
+  &.visible-xs {
+    @media (max-width: @screen-xs-max) {
+      .responsive-visibility();
+    }    
   }
-  @media (min-width: @screen-md) and (max-width: @screen-md-max) {
-    .responsive-invisibility();
+  &.visible-sm {
+    @media (min-width: @screen-sm) and (max-width: @screen-sm-max) {
+      .responsive-visibility();
+    }
+  }
+  &.visible-md {
+    @media (min-width: @screen-md) and (max-width: @screen-md-max) {
+      .responsive-visibility();
+    }    
   }
   @media (min-width: @screen-lg) {
     .responsive-visibility();
@@ -85,48 +121,84 @@
 }
 
 .hidden-xs {
-  .responsive-invisibility();
-  @media (min-width: @screen-sm) and (max-width: @screen-sm-max) {
-    .responsive-visibility();
+  .responsive-visibility();
+  @media (max-width: @screen-xs-max) {
+    .responsive-invisibility();
   }
-  @media (min-width: @screen-md) and (max-width: @screen-md-max) {
-    .responsive-visibility();
+  &.hidden-sm {
+    @media (min-width: @screen-sm) and (max-width: @screen-sm-max) {
+      .responsive-invisibility();
+    }    
   }
-  @media (min-width: @screen-lg) {
-    .responsive-visibility();
+  &.hidden-md {
+    @media (min-width: @screen-md) and (max-width: @screen-md-max) {
+      .responsive-invisibility();
+    }    
+  }
+  &.hidden-lg {
+    @media (min-width: @screen-lg) {
+      .responsive-invisibility();
+    }    
   }
 }
 .hidden-sm {
   .responsive-visibility();
+  &.hidden-xs {
+    @media (max-width: @screen-xs-max) {
+      .responsive-invisibility();
+    }
+  }
   @media (min-width: @screen-sm) and (max-width: @screen-sm-max) {
     .responsive-invisibility();
   }
-  @media (min-width: @screen-md) and (max-width: @screen-md-max) {
-    .responsive-visibility();
+  &.hidden-md {
+    @media (min-width: @screen-md) and (max-width: @screen-md-max) {
+      .responsive-invisibility();
+    }    
   }
-  @media (min-width: @screen-lg) {
-    .responsive-visibility();
+  &.hidden-lg {
+    @media (min-width: @screen-lg) {
+      .responsive-invisibility();
+    }    
   }
 }
 .hidden-md {
   .responsive-visibility();
-  @media (min-width: @screen-sm) and (max-width: @screen-sm-max) {
-    .responsive-visibility();
+  &.hidden-xs {
+    @media (max-width: @screen-xs-max) {
+      .responsive-invisibility();
+    }    
+  }
+  &.hidden-sm {
+    @media (min-width: @screen-sm) and (max-width: @screen-sm-max) {
+      .responsive-invisibility();
+    }    
   }
   @media (min-width: @screen-md) and (max-width: @screen-md-max) {
     .responsive-invisibility();
   }
-  @media (min-width: @screen-lg) {
-    .responsive-visibility();
+  &.hidden-lg {
+    @media (min-width: @screen-lg) {
+      .responsive-invisibility();
+    }    
   }
 }
 .hidden-lg {
   .responsive-visibility();
-  @media (min-width: @screen-sm) and (max-width: @screen-sm-max) {
-    .responsive-visibility();
-  }
-  @media (min-width: @screen-md) and (max-width: @screen-md-max) {
-    .responsive-visibility();
+  &.hidden-xs {
+    @media (max-width: @screen-xs-max) {
+      .responsive-invisibility();
+    }    
+  }
+  &.hidden-sm {
+    @media (min-width: @screen-sm) and (max-width: @screen-sm-max) {
+      .responsive-invisibility();
+    }    
+  }
+  &.hidden-md {
+    @media (min-width: @screen-md) and (max-width: @screen-md-max) {
+      .responsive-invisibility();
+    }    
   }
   @media (min-width: @screen-lg) {
     .responsive-invisibility();

less/type.less

@@ -72,8 +72,8 @@ h6 {
   margin-bottom: (@line-height-computed / 2);
 }
 
-h1, .h1 { font-size: ceil(@font-size-base * 2.70); } // ~38px
-h2, .h2 { font-size: ceil(@font-size-base * 2.25); } // ~32px
+h1, .h1 { font-size: floor(@font-size-base * 2.60); } // ~36px
+h2, .h2 { font-size: floor(@font-size-base * 2.15); } // ~30px
 h3, .h3 { font-size: ceil(@font-size-base * 1.70); } // ~24px
 h4, .h4 { font-size: ceil(@font-size-base * 1.25); } // ~18px
 h5, .h5 { font-size:  @font-size-base; }