Merge branch 'master' into docs_derp

Conflicts: docs/assets/css/docs.css
2024-09-24 20:17:19 +00:00 · 2014-01-09 20:33:55 -08:00 · 2014-01-09 20:33:55 -08:00 · ea20f44815
commit ea20f44815
parent 04161a8c75 7f153974e1
65 changed files with 2742 additions and 1919 deletions
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@ -92,11 +92,11 @@ implementing features, refactoring code, porting to a different language),
 otherwise you risk spending a lot of time working on something that the
 project's developers might not want to merge into the project.

-Please adhere to the [coding conventions](#code-conventions) used throughout a
+Please adhere to the [coding guidelines](#code-guidelines) used throughout the
 project (indentation, accurate comments, etc.) and any other requirements
 (such as test coverage).

-Adhering to the following this process is the best way to get your work
+Adhering to the following process is the best way to get your work
 included in the project:

 1. [Fork](http://help.github.com/fork-a-repo/) the project, clone your fork,
@ -147,27 +147,27 @@ included in the project:
    with a clear title and description against the `master` branch.

 **IMPORTANT**: By submitting a patch, you agree to allow the project owners to
-license your work under the the terms of the [MIT License](LICENSE.md).
+license your work under the terms of the [MIT License](LICENSE.md).


 ## Code guidelines

 ### HTML

- Two spaces for indentation, never tabs
- Double quotes only, never single quotes
- Always use proper indentation
- Use tags and elements appropriate for an HTML5 doctype (e.g., self-closing tags)
+- Two spaces for indentation, never tabs.
+- Double quotes only, never single quotes.
+- Always use proper indentation.
+- Use tags and elements appropriate for an HTML5 doctype (e.g., self-closing tags).
 - Use CDNs and HTTPS for third-party JS when possible. We don't use protocol-relative URLs in this case because they break when viewing the page locally via `file://`.

 ### CSS

- CSS changes must be done in `.less` files first, never just in the compiled `.css` files
- Adhere to the [CSS property order](http://markdotto.com/2011/11/29/css-property-order/)
- Multiple-line approach (one property and value per line)
- Always a space after a property's colon (e.g., `display: block;` and not `display:block;`)
- End all lines with a semi-colon
- For multiple, comma-separated selectors, place each selector on its own line
+- CSS changes must be done in `.less` files first, never just in the compiled `.css` files.
+- Adhere to the [CSS property order](http://markdotto.com/2011/11/29/css-property-order/).
+- Multiple-line approach (one property and value per line).
+- Always a space after a property's colon (e.g., `display: block;` and not `display:block;`).
+- End all lines with a semi-colon.
+- For multiple, comma-separated selectors, place each selector on its own line.
 - Attribute selectors, like `input[type="text"]` should always wrap the attribute's value in double quotes, for consistency and safety (see this [blog post on unquoted attribute values](http://mathiasbynens.be/notes/unquoted-attribute-values) that can lead to XSS attacks).
 - Attribute selectors should only be used where absolutely necessary (e.g., form controls) and should be avoided on custom components for performance and explicitness.
 - Series of classes for a component should include a base class (e.g., `.component`) and use the base class as a prefix for modifier and sub-components (e.g., `.component-lg`).
--- a/Gruntfile.js
+++ b/Gruntfile.js
@ -10,8 +10,11 @@ module.exports = function (grunt) {
    return string.replace(/[-\\^$*+?.()|[\]{}]/g, '\\$&')
  }

+  var BsLessdocParser = require('./docs/grunt/bs-lessdoc-parser.js')
  var fs = require('fs')
-  var btoa = require('btoa')
+  var generateGlyphiconsData = require('./docs/grunt/bs-glyphicons-data-generator.js')
+  var generateRawFilesJs = require('./docs/grunt/bs-raw-files-generator.js')
+  var path = require('path')

  // Project configuration.
  grunt.initConfig({
@ -20,7 +23,7 @@ module.exports = function (grunt) {
    pkg: grunt.file.readJSON('package.json'),
    banner: '/*!\n' +
              ' * Bootstrap v<%= pkg.version %> (<%= pkg.homepage %>)\n' +
-              ' * Copyright <%= grunt.template.today("yyyy") %> <%= pkg.author %>\n' +
+              ' * Copyright 2011-<%= grunt.template.today("yyyy") %> <%= pkg.author %>\n' +
              ' * Licensed under <%= _.pluck(pkg.licenses, "type") %> (<%= _.pluck(pkg.licenses, "url") %>)\n' +
              ' */\n',
    jqueryCheck: 'if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery") }\n\n',
@ -45,6 +48,9 @@ module.exports = function (grunt) {
      },
      assets: {
        src: ['docs/assets/js/application.js', 'docs/assets/js/customizer.js']
+      },
+      docsGrunt: {
+        src: ['docs/grunt/*.js']
      }
    },

@ -63,6 +69,9 @@ module.exports = function (grunt) {
      },
      assets: {
        src: ['docs/assets/js/application.js', 'docs/assets/js/customizer.js']
+      },
+      docsGrunt: {
+        src: ['docs/grunt/*.js']
      }
    },

@ -114,7 +123,7 @@ module.exports = function (grunt) {
        options: {
          banner: '/*!\n' +
          ' * Bootstrap Docs (<%= pkg.homepage %>)\n' +
-          ' * Copyright <%= grunt.template.today("yyyy") %> <%= pkg.author %>\n' +
+          ' * Copyright 2011-<%= grunt.template.today("yyyy") %> <%= pkg.author %>\n' +
          ' * Licensed under the Creative Commons Attribution 3.0 Unported License. For\n' +
          ' * details, see http://creativecommons.org/licenses/by/3.0/.\n' +
          ' */\n',
@ -127,7 +136,7 @@ module.exports = function (grunt) {
          'docs/assets/js/filesaver.js',
          'docs/assets/js/customizer.js'
        ],
-        dest: 'docs/assets/js/customize.js'
+        dest: 'docs/assets/js/customize.min.js'
      }
    },

@ -208,7 +217,7 @@ module.exports = function (grunt) {
        cwd: './dist',
        src: [
          '{css,js}/*.min.*',
-          '{css}/*.map',
+          'css/*.map',
          'fonts/*'
        ],
        dest: 'docs/dist'
@ -235,6 +244,23 @@ module.exports = function (grunt) {
      docs: {}
    },

+    jade: {
+      compile: {
+        options: {
+          pretty: true,
+          data: function () {
+            var filePath = path.join(__dirname, 'less/variables.less');
+            var fileContent = fs.readFileSync(filePath, {encoding: 'utf8'});
+            var parser = new BsLessdocParser(fileContent);
+            return {sections: parser.parseFile()};
+          }
+        },
+        files: {
+          'docs/_includes/customizer-variables.html': 'docs/customizer-variables.jade'
+        }
+      }
+    },
+
    validation: {
      options: {
        charset: 'utf-8',
@ -300,7 +326,7 @@ module.exports = function (grunt) {
  var testSubtasks = [];
  // Skip core tests if running a different subset of the test suite
  if (!process.env.TWBS_TEST || process.env.TWBS_TEST === 'core') {
-    testSubtasks = testSubtasks.concat(['dist-css', 'jshint', 'jscs', 'qunit']);
+    testSubtasks = testSubtasks.concat(['dist-css', 'csslint', 'jshint', 'jscs', 'qunit', 'build-customizer-vars-form']);
  }
  // Skip HTML validation if running a different subset of the test suite
  if (!process.env.TWBS_TEST || process.env.TWBS_TEST === 'validate-html') {
@ -335,46 +361,10 @@ module.exports = function (grunt) {
  // This can be overzealous, so its changes should always be manually reviewed!
  grunt.registerTask('change-version-number', ['sed']);

-  grunt.registerTask('build-glyphicons-data', function () {
-    // Pass encoding, utf8, so `readFileSync` will return a string instead of a
-    // buffer
-    var glyphiconsFile = fs.readFileSync('less/glyphicons.less', 'utf8')
-    var glpyhiconsLines = glyphiconsFile.split('\n')
-
-    // Use any line that starts with ".glyphicon-" and capture the class name
-    var iconClassName = /^\.(glyphicon-[^\s]+)/
-    var glyphiconsData = '# This file is generated via Grunt task. **Do not edit directly.** \n' +
-                         '# See the \'build-glyphicons-data\' task in Gruntfile.js.\n\n';
-    for (var i = 0, len = glpyhiconsLines.length; i < len; i++) {
-      var match = glpyhiconsLines[i].match(iconClassName)
-
-      if (match != null) {
-        glyphiconsData += '- ' + match[1] + '\n'
-      }
-    }
-
-    // Create the `_data` directory if it doesn't already exist
-    if (!fs.existsSync('docs/_data')) fs.mkdirSync('docs/_data')
-
-    fs.writeFileSync('docs/_data/glyphicons.yml', glyphiconsData)
-  });
+  grunt.registerTask('build-glyphicons-data', generateGlyphiconsData);

  // task for building customizer
-  grunt.registerTask('build-customizer', 'Add scripts/less files to customizer.', function () {
-    function getFiles(type) {
-      var files = {}
-      fs.readdirSync(type)
-        .filter(function (path) {
-          return type == 'fonts' ? true : new RegExp('\\.' + type + '$').test(path)
-        })
-        .forEach(function (path) {
-          var fullPath = type + '/' + path
-          return files[path] = (type == 'fonts' ? btoa(fs.readFileSync(fullPath)) : fs.readFileSync(fullPath, 'utf8'))
-        })
-      return 'var __' + type + ' = ' + JSON.stringify(files) + '\n'
-    }
-
-    var files = getFiles('js') + getFiles('less') + getFiles('fonts')
-    fs.writeFileSync('docs/assets/js/raw-files.js', files)
-  });
+  grunt.registerTask('build-customizer', ['build-customizer-vars-form', 'build-raw-files']);
+  grunt.registerTask('build-customizer-vars-form', ['jade']);
+  grunt.registerTask('build-raw-files', 'Add scripts/less files to customizer.', generateRawFilesJs);
 };
--- a/2
+++ b/2
@ -1,6 +1,6 @@
 The MIT License (MIT)

-Copyright (c) 2014 Twitter, Inc
+Copyright (c) 2011-2014 Twitter, Inc

 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
--- a/README.md
+++ b/README.md
@ -54,7 +54,7 @@ We provide compiled CSS and JS (`bootstrap.*`), as well as compiled and minified

 ## Bugs and feature requests

-Have a bug or a feature request? Please first read the [issue guidelines](https://github.com/twbs/bootstrap/blob/master/CONTRIBUTING.md#using-the-issue-tracker) and search for existing and closed issues.  If your problem or idea is not addressed yet, [please open a new issue](https://github.com/twbs/bootstrap/issues/new).
+Have a bug or a feature request? Please first read the [issue guidelines](https://github.com/twbs/bootstrap/blob/master/CONTRIBUTING.md#using-the-issue-tracker) and search for existing and closed issues. If your problem or idea is not addressed yet, [please open a new issue](https://github.com/twbs/bootstrap/issues/new).


 ## Documentation
@ -88,7 +88,7 @@ Bootstrap uses [Grunt](http://gruntjs.com/) with convenient methods for working
 From the command line:

 1. Install `grunt-cli` globally with `npm install -g grunt-cli`.
-2. Navigate to the root `/bootstrap` directory, then run `npm install`. npm will look at [package.json](package.json) and automatically install the necessary local dependencies listed there.
+2. Navigate to the root `/bootstrap` directory, then run `npm install`. npm will look at [package.json](https://github.com/twbs/bootstrap/blob/master/package.json) and automatically install the necessary local dependencies listed there.

 When completed, you'll be able to run the various Grunt commands provided from the command line.

@ -120,7 +120,7 @@ Please read through our [contributing guidelines](https://github.com/twbs/bootst

 More over, if your pull request contains JavaScript patches or features, you must include relevant unit tests. All HTML and CSS should conform to the [Code Guide](http://github.com/mdo/code-guide), maintained by [Mark Otto](http://github.com/mdo).

-Editor preferences are available in the [editor config](.editorconfig) for easy use in common text editors. Read more and download plugins at <http://editorconfig.org>.
+Editor preferences are available in the [editor config](https://github.com/twbs/bootstrap/blob/master/.editorconfig) for easy use in common text editors. Read more and download plugins at <http://editorconfig.org>.



@ -170,4 +170,4 @@ For more information on SemVer, please visit <http://semver.org/>.

 ## Copyright and license

-Copyright 2013 Twitter, Inc under [the MIT license](LICENSE).
+Copyright 2011-2014 Twitter, Inc. under [the MIT license](LICENSE).
--- a/bower.json
+++ b/bower.json
@ -11,13 +11,11 @@
  ],
  "ignore": [
    "**/.*",
-    "*.html",
-    "_*",
+    "_config.yml",
    "CNAME",
    "composer.json",
    "CONTRIBUTING.md",
-    "docs-assets",
-    "examples",
+    "docs",
    "js/tests"
  ],
  "dependencies": {
--- a/dist/css/bootstrap-theme.css
+++ b/dist/css/bootstrap-theme.css
@ -1,6 +1,6 @@
 /*!
 * Bootstrap v3.0.3 (http://getbootstrap.com)
- * Copyright 2014 Twitter, Inc.
+ * Copyright 2011-2014 Twitter, Inc.
 * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
 */

@ -89,6 +89,24 @@
  background-color: #419641;
  border-color: #3e8f3e;
 }
+.btn-info {
+  background-image: -webkit-linear-gradient(top, #5bc0de 0%, #2aabd2 100%);
+  background-image:         linear-gradient(to bottom, #5bc0de 0%, #2aabd2 100%);
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff5bc0de', endColorstr='#ff2aabd2', GradientType=0);
+  filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
+  background-repeat: repeat-x;
+  border-color: #28a4c9;
+}
+.btn-info:hover,
+.btn-info:focus {
+  background-color: #2aabd2;
+  background-position: 0 -15px;
+}
+.btn-info:active,
+.btn-info.active {
+  background-color: #2aabd2;
+  border-color: #28a4c9;
+}
 .btn-warning {
  background-image: -webkit-linear-gradient(top, #f0ad4e 0%, #eb9316 100%);
  background-image:         linear-gradient(to bottom, #f0ad4e 0%, #eb9316 100%);
@ -125,24 +143,6 @@
  background-color: #c12e2a;
  border-color: #b92c28;
 }
-.btn-info {
-  background-image: -webkit-linear-gradient(top, #5bc0de 0%, #2aabd2 100%);
-  background-image:         linear-gradient(to bottom, #5bc0de 0%, #2aabd2 100%);
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff5bc0de', endColorstr='#ff2aabd2', GradientType=0);
-  filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
-  background-repeat: repeat-x;
-  border-color: #28a4c9;
-}
-.btn-info:hover,
-.btn-info:focus {
-  background-color: #2aabd2;
-  background-position: 0 -15px;
-}
-.btn-info:active,
-.btn-info.active {
-  background-color: #2aabd2;
-  border-color: #28a4c9;
-}
 .thumbnail,
 .img-thumbnail {
  -webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, .075);
--- a/dist/css/bootstrap-theme.css.map
+++ b/dist/css/bootstrap-theme.css.map
--- a/dist/css/bootstrap-theme.min.css
+++ b/dist/css/bootstrap-theme.min.css
--- a/dist/css/bootstrap.css
+++ b/dist/css/bootstrap.css
@ -1,6 +1,6 @@
 /*!
 * Bootstrap v3.0.3 (http://getbootstrap.com)
- * Copyright 2014 Twitter, Inc.
+ * Copyright 2011-2014 Twitter, Inc.
 * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
 */

@ -491,18 +491,6 @@ cite {
 .text-primary:hover {
  color: #3071a9;
 }
-.text-warning {
-  color: #8a6d3b;
-}
-.text-warning:hover {
-  color: #66512c;
-}
-.text-danger {
-  color: #a94442;
-}
-.text-danger:hover {
-  color: #843534;
-}
 .text-success {
  color: #3c763d;
 }
@ -515,6 +503,18 @@ cite {
 .text-info:hover {
  color: #245269;
 }
+.text-warning {
+  color: #8a6d3b;
+}
+.text-warning:hover {
+  color: #66512c;
+}
+.text-danger {
+  color: #a94442;
+}
+.text-danger:hover {
+  color: #843534;
+}
 .bg-primary {
  color: #fff;
  background-color: #428bca;
@ -522,18 +522,6 @@ cite {
 a.bg-primary:hover {
  background-color: #3071a9;
 }
-.bg-warning {
-  background-color: #fcf8e3;
-}
-a.bg-warning:hover {
-  background-color: #f7ecb5;
-}
-.bg-danger {
-  background-color: #f2dede;
-}
-a.bg-danger:hover {
-  background-color: #e4b9b9;
-}
 .bg-success {
  background-color: #dff0d8;
 }
@ -546,6 +534,18 @@ a.bg-success:hover {
 a.bg-info:hover {
  background-color: #afd9ee;
 }
+.bg-warning {
+  background-color: #fcf8e3;
+}
+a.bg-warning:hover {
+  background-color: #f7ecb5;
+}
+.bg-danger {
+  background-color: #f2dede;
+}
+a.bg-danger:hover {
+  background-color: #e4b9b9;
+}
 .page-header {
  padding-bottom: 9px;
  margin: 40px 0 20px;
@ -1508,6 +1508,26 @@ table th[class*="col-"] {
 .table-hover > tbody > tr.success:hover > th {
  background-color: #d0e9c6;
 }
+.table > thead > tr > td.info,
+.table > tbody > tr > td.info,
+.table > tfoot > tr > td.info,
+.table > thead > tr > th.info,
+.table > tbody > tr > th.info,
+.table > tfoot > tr > th.info,
+.table > thead > tr.info > td,
+.table > tbody > tr.info > td,
+.table > tfoot > tr.info > td,
+.table > thead > tr.info > th,
+.table > tbody > tr.info > th,
+.table > tfoot > tr.info > th {
+  background-color: #d9edf7;
+}
+.table-hover > tbody > tr > td.info:hover,
+.table-hover > tbody > tr > th.info:hover,
+.table-hover > tbody > tr.info:hover > td,
+.table-hover > tbody > tr.info:hover > th {
+  background-color: #c4e3f3;
+}
 .table > thead > tr > td.warning,
 .table > tbody > tr > td.warning,
 .table > tfoot > tr > td.warning,
@ -1548,26 +1568,6 @@ table th[class*="col-"] {
 .table-hover > tbody > tr.danger:hover > th {
  background-color: #ebcccc;
 }
-.table > thead > tr > td.info,
-.table > tbody > tr > td.info,
-.table > tfoot > tr > td.info,
-.table > thead > tr > th.info,
-.table > tbody > tr > th.info,
-.table > tfoot > tr > th.info,
-.table > thead > tr.info > td,
-.table > tbody > tr.info > td,
-.table > tfoot > tr.info > td,
-.table > thead > tr.info > th,
-.table > tbody > tr.info > th,
-.table > tfoot > tr.info > th {
-  background-color: #d9edf7;
-}
-.table-hover > tbody > tr > td.info:hover,
-.table-hover > tbody > tr > th.info:hover,
-.table-hover > tbody > tr.info:hover > td,
-.table-hover > tbody > tr.info:hover > th {
-  background-color: #c4e3f3;
-}
@media (max-width: 767px) {
  .table-responsive {
    width: 100%;
@ -1651,6 +1651,10 @@ input[type="checkbox"] {
 input[type="file"] {
  display: block;
 }
+input[type="range"] {
+  display: block;
+  width: 100%;
+}
 select[multiple],
 select[size] {
  height: auto;
@ -1826,6 +1830,32 @@ textarea.input-lg {
  line-height: 34px;
  text-align: center;
 }
+.has-success .help-block,
+.has-success .control-label,
+.has-success .radio,
+.has-success .checkbox,
+.has-success .radio-inline,
+.has-success .checkbox-inline {
+  color: #3c763d;
+}
+.has-success .form-control {
+  border-color: #3c763d;
+  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075);
+          box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075);
+}
+.has-success .form-control:focus {
+  border-color: #2b542c;
+  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075), 0 0 6px #67b168;
+          box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075), 0 0 6px #67b168;
+}
+.has-success .input-group-addon {
+  color: #3c763d;
+  background-color: #dff0d8;
+  border-color: #3c763d;
+}
+.has-success .form-control-feedback {
+  color: #3c763d;
+}
 .has-warning .help-block,
 .has-warning .control-label,
 .has-warning .radio,
@ -1878,32 +1908,6 @@ textarea.input-lg {
 .has-error .form-control-feedback {
  color: #a94442;
 }
-.has-success .help-block,
-.has-success .control-label,
-.has-success .radio,
-.has-success .checkbox,
-.has-success .radio-inline,
-.has-success .checkbox-inline {
-  color: #3c763d;
-}
-.has-success .form-control {
-  border-color: #3c763d;
-  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075);
-          box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075);
-}
-.has-success .form-control:focus {
-  border-color: #2b542c;
-  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075), 0 0 6px #67b168;
-          box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075), 0 0 6px #67b168;
-}
-.has-success .input-group-addon {
-  color: #3c763d;
-  background-color: #dff0d8;
-  border-color: #3c763d;
-}
-.has-success .form-control-feedback {
-  color: #3c763d;
-}
 .form-control-static {
  margin-bottom: 0;
 }
@ -2144,6 +2148,47 @@ fieldset[disabled] .btn-success.active {
  color: #5cb85c;
  background-color: #fff;
 }
+.btn-info {
+  color: #fff;
+  background-color: #5bc0de;
+  border-color: #46b8da;
+}
+.btn-info:hover,
+.btn-info:focus,
+.btn-info:active,
+.btn-info.active,
+.open .dropdown-toggle.btn-info {
+  color: #fff;
+  background-color: #39b3d7;
+  border-color: #269abc;
+}
+.btn-info:active,
+.btn-info.active,
+.open .dropdown-toggle.btn-info {
+  background-image: none;
+}
+.btn-info.disabled,
+.btn-info[disabled],
+fieldset[disabled] .btn-info,
+.btn-info.disabled:hover,
+.btn-info[disabled]:hover,
+fieldset[disabled] .btn-info:hover,
+.btn-info.disabled:focus,
+.btn-info[disabled]:focus,
+fieldset[disabled] .btn-info:focus,
+.btn-info.disabled:active,
+.btn-info[disabled]:active,
+fieldset[disabled] .btn-info:active,
+.btn-info.disabled.active,
+.btn-info[disabled].active,
+fieldset[disabled] .btn-info.active {
+  background-color: #5bc0de;
+  border-color: #46b8da;
+}
+.btn-info .badge {
+  color: #5bc0de;
+  background-color: #fff;
+}
 .btn-warning {
  color: #fff;
  background-color: #f0ad4e;
@ -2226,47 +2271,6 @@ fieldset[disabled] .btn-danger.active {
  color: #d9534f;
  background-color: #fff;
 }
-.btn-info {
-  color: #fff;
-  background-color: #5bc0de;
-  border-color: #46b8da;
-}
-.btn-info:hover,
-.btn-info:focus,
-.btn-info:active,
-.btn-info.active,
-.open .dropdown-toggle.btn-info {
-  color: #fff;
-  background-color: #39b3d7;
-  border-color: #269abc;
-}
-.btn-info:active,
-.btn-info.active,
-.open .dropdown-toggle.btn-info {
-  background-image: none;
-}
-.btn-info.disabled,
-.btn-info[disabled],
-fieldset[disabled] .btn-info,
-.btn-info.disabled:hover,
-.btn-info[disabled]:hover,
-fieldset[disabled] .btn-info:hover,
-.btn-info.disabled:focus,
-.btn-info[disabled]:focus,
-fieldset[disabled] .btn-info:focus,
-.btn-info.disabled:active,
-.btn-info[disabled]:active,
-fieldset[disabled] .btn-info:active,
-.btn-info.disabled.active,
-.btn-info[disabled].active,
-fieldset[disabled] .btn-info.active {
-  background-color: #5bc0de;
-  border-color: #46b8da;
-}
-.btn-info .badge {
-  color: #5bc0de;
-  background-color: #fff;
-}
 .btn-link {
  font-weight: normal;
  color: #428bca;
@ -2357,7 +2361,7 @@ input[type="button"].btn-block {
  font-family: 'Glyphicons Halflings';

  src: url('../fonts/glyphicons-halflings-regular.eot');
-  src: url('../fonts/glyphicons-halflings-regular.eot?#iefix') format('embedded-opentype'), url('../fonts/glyphicons-halflings-regular.woff') format('woff'), url('../fonts/glyphicons-halflings-regular.ttf') format('truetype'), url('../fonts/glyphicons-halflings-regular.svg#glyphicons-halflingsregular') format('svg');
+  src: url('../fonts/glyphicons-halflings-regular.eot?#iefix') format('embedded-opentype'), url('../fonts/glyphicons-halflings-regular.woff') format('woff'), url('../fonts/glyphicons-halflings-regular.ttf') format('truetype'), url('../fonts/glyphicons-halflings-regular.svg#glyphicons_halflingsregular') format('svg');
 }
 .glyphicon {
  position: relative;
@ -4669,6 +4673,28 @@ a.list-group-item-success.active:focus {
  background-color: #3c763d;
  border-color: #3c763d;
 }
+.list-group-item-info {
+  color: #31708f;
+  background-color: #d9edf7;
+}
+a.list-group-item-info {
+  color: #31708f;
+}
+a.list-group-item-info .list-group-item-heading {
+  color: inherit;
+}
+a.list-group-item-info:hover,
+a.list-group-item-info:focus {
+  color: #31708f;
+  background-color: #c4e3f3;
+}
+a.list-group-item-info.active,
+a.list-group-item-info.active:hover,
+a.list-group-item-info.active:focus {
+  color: #fff;
+  background-color: #31708f;
+  border-color: #31708f;
+}
 .list-group-item-warning {
  color: #8a6d3b;
  background-color: #fcf8e3;
@ -4713,28 +4739,6 @@ a.list-group-item-danger.active:focus {
  background-color: #a94442;
  border-color: #a94442;
 }
-.list-group-item-info {
-  color: #31708f;
-  background-color: #d9edf7;
-}
-a.list-group-item-info {
-  color: #31708f;
-}
-a.list-group-item-info .list-group-item-heading {
-  color: inherit;
-}
-a.list-group-item-info:hover,
-a.list-group-item-info:focus {
-  color: #31708f;
-  background-color: #c4e3f3;
-}
-a.list-group-item-info.active,
-a.list-group-item-info.active:hover,
-a.list-group-item-info.active:focus {
-  color: #fff;
-  background-color: #31708f;
-  border-color: #31708f;
-}
 .list-group-item-heading {
  margin-top: 0;
  margin-bottom: 5px;
@ -4939,6 +4943,20 @@ a.list-group-item-info.active:focus {
 .panel-success > .panel-footer + .panel-collapse .panel-body {
  border-bottom-color: #d6e9c6;
 }
+.panel-info {
+  border-color: #bce8f1;
+}
+.panel-info > .panel-heading {
+  color: #31708f;
+  background-color: #d9edf7;
+  border-color: #bce8f1;
+}
+.panel-info > .panel-heading + .panel-collapse .panel-body {
+  border-top-color: #bce8f1;
+}
+.panel-info > .panel-footer + .panel-collapse .panel-body {
+  border-bottom-color: #bce8f1;
+}
 .panel-warning {
  border-color: #faebcc;
 }
@ -4967,20 +4985,6 @@ a.list-group-item-info.active:focus {
 .panel-danger > .panel-footer + .panel-collapse .panel-body {
  border-bottom-color: #ebccd1;
 }
-.panel-info {
-  border-color: #bce8f1;
-}
-.panel-info > .panel-heading {
-  color: #31708f;
-  background-color: #d9edf7;
-  border-color: #bce8f1;
-}
-.panel-info > .panel-heading + .panel-collapse .panel-body {
-  border-top-color: #bce8f1;
-}
-.panel-info > .panel-footer + .panel-collapse .panel-body {
-  border-bottom-color: #bce8f1;
-}
 .well {
  min-height: 20px;
  padding: 19px;
--- a/dist/css/bootstrap.css.map
+++ b/dist/css/bootstrap.css.map
--- a/dist/css/bootstrap.min.css
+++ b/dist/css/bootstrap.min.css
--- a/dist/js/bootstrap.js
+++ b/dist/js/bootstrap.js
@ -1,6 +1,6 @@
 /*!
 * Bootstrap v3.0.3 (http://getbootstrap.com)
- * Copyright 2014 Twitter, Inc.
+ * Copyright 2011-2014 Twitter, Inc.
 * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
 */

@ -10,12 +10,13 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery"
 * Bootstrap: transition.js v3.0.3
 * http://getbootstrap.com/javascript/#transitions
 * ========================================================================
- * Copyright 2013 Twitter, Inc.
+ * Copyright 2011-2014 Twitter, Inc.
 * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
 * ======================================================================== */


-+function ($) { 'use strict';
+function ($) {
+  'use strict';

  // CSS TRANSITION SUPPORT (Shoutout: http://www.modernizr.com/)
  // ============================================================
@ -58,12 +59,13 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery"
 * Bootstrap: alert.js v3.0.3
 * http://getbootstrap.com/javascript/#alerts
 * ========================================================================
- * Copyright 2013 Twitter, Inc.
+ * Copyright 2011-2014 Twitter, Inc.
 * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
 * ======================================================================== */


-+function ($) { 'use strict';
+function ($) {
+  'use strict';

  // ALERT CLASS DEFINITION
  // ======================
@ -146,12 +148,13 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery"
 * Bootstrap: button.js v3.0.3
 * http://getbootstrap.com/javascript/#buttons
 * ========================================================================
- * Copyright 2013 Twitter, Inc.
+ * Copyright 2011-2014 Twitter, Inc.
 * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
 * ======================================================================== */


-+function ($) { 'use strict';
+function ($) {
+  'use strict';

  // BUTTON PUBLIC CLASS DEFINITION
  // ==============================
@ -253,12 +256,13 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery"
 * Bootstrap: carousel.js v3.0.3
 * http://getbootstrap.com/javascript/#carousel
 * ========================================================================
- * Copyright 2013 Twitter, Inc.
+ * Copyright 2011-2014 Twitter, Inc.
 * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
 * ======================================================================== */


-+function ($) { 'use strict';
+function ($) {
+  'use strict';

  // CAROUSEL CLASS DEFINITION
  // =========================
@ -458,12 +462,13 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery"
 * Bootstrap: collapse.js v3.0.3
 * http://getbootstrap.com/javascript/#collapse
 * ========================================================================
- * Copyright 2013 Twitter, Inc.
+ * Copyright 2011-2014 Twitter, Inc.
 * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
 * ======================================================================== */


-+function ($) { 'use strict';
+function ($) {
+  'use strict';

  // COLLAPSE PUBLIC CLASS DEFINITION
  // ================================
@ -627,12 +632,13 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery"
 * Bootstrap: dropdown.js v3.0.3
 * http://getbootstrap.com/javascript/#dropdowns
 * ========================================================================
- * Copyright 2013 Twitter, Inc.
+ * Copyright 2011-2014 Twitter, Inc.
 * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
 * ======================================================================== */


-+function ($) { 'use strict';
+function ($) {
+  'use strict';

  // DROPDOWN CLASS DEFINITION
  // =========================
@ -774,12 +780,13 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery"
 * Bootstrap: modal.js v3.0.3
 * http://getbootstrap.com/javascript/#modals
 * ========================================================================
- * Copyright 2013 Twitter, Inc.
+ * Copyright 2011-2014 Twitter, Inc.
 * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
 * ======================================================================== */


-+function ($) { 'use strict';
+function ($) {
+  'use strict';

  // MODAL CLASS DEFINITION
  // ======================
@ -1018,12 +1025,13 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery"
 * http://getbootstrap.com/javascript/#tooltip
 * Inspired by the original jQuery.tipsy by Jason Frame
 * ========================================================================
- * Copyright 2013 Twitter, Inc.
+ * Copyright 2011-2014 Twitter, Inc.
 * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
 * ======================================================================== */


-+function ($) { 'use strict';
+function ($) {
+  'use strict';

  // TOOLTIP PUBLIC CLASS DEFINITION
  // ===============================
@ -1226,7 +1234,7 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery"

    // $.fn.offset doesn't round pixel values
    // so we use setOffset directly with our own function B-0
-    jQuery.offset.setOffset($tip[0], $.extend({
+    $.offset.setOffset($tip[0], $.extend({
      using: function (props) {
        $tip.css({
          top: Math.round(props.top),
@ -1416,12 +1424,13 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery"
 * Bootstrap: popover.js v3.0.3
 * http://getbootstrap.com/javascript/#popovers
 * ========================================================================
- * Copyright 2013 Twitter, Inc.
+ * Copyright 2011-2014 Twitter, Inc.
 * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
 * ======================================================================== */


-+function ($) { 'use strict';
+function ($) {
+  'use strict';

  // POPOVER PUBLIC CLASS DEFINITION
  // ===============================
@ -1526,12 +1535,13 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery"
 * Bootstrap: scrollspy.js v3.0.3
 * http://getbootstrap.com/javascript/#scrollspy
 * ========================================================================
- * Copyright 2013 Twitter, Inc.
+ * Copyright 2011-2014 Twitter, Inc.
 * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
 * ======================================================================== */


-+function ($) { 'use strict';
+function ($) {
+  'use strict';

  // SCROLLSPY CLASS DEFINITION
  // ==========================
@ -1679,12 +1689,13 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery"
 * Bootstrap: tab.js v3.0.3
 * http://getbootstrap.com/javascript/#tabs
 * ========================================================================
- * Copyright 2013 Twitter, Inc.
+ * Copyright 2011-2014 Twitter, Inc.
 * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
 * ======================================================================== */


-+function ($) { 'use strict';
+function ($) {
+  'use strict';

  // TAB CLASS DEFINITION
  // ====================
@ -1804,12 +1815,13 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery"
 * Bootstrap: affix.js v3.0.3
 * http://getbootstrap.com/javascript/#affix
 * ========================================================================
- * Copyright 2014 Twitter, Inc.
+ * Copyright 2011-2014 Twitter, Inc.
 * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
 * ======================================================================== */


-+function ($) { 'use strict';
+function ($) {
+  'use strict';

  // AFFIX CLASS DEFINITION
  // ======================
--- a/dist/js/bootstrap.min.js
+++ b/dist/js/bootstrap.min.js
--- a/docs/_includes/customizer-variables.html
+++ b/docs/_includes/customizer-variables.html
--- a/docs/_includes/footer.html
+++ b/docs/_includes/footer.html
@ -36,7 +36,7 @@

 {% if page.slug == "customize" %}
 <script src="{{ site.baseurl }}assets/js/raw-files.js"></script>
-<script src="{{ site.baseurl }}assets/js/customize.js"></script>
+<script src="{{ site.baseurl }}assets/js/customize.min.js"></script>
 {% endif %}

 {% comment %}
--- a/docs/assets/css/docs.css
+++ b/docs/assets/css/docs.css
@ -1,5 +1,6 @@
+/*csslint ids: false, overqualified-elements: false*/
 /*!
- * Copyright 2013 Twitter, Inc.
+ * Copyright 2011-2014 Twitter, Inc.
 *
 * Licensed under the Creative Commons Attribution 3.0 Unported License. For
 * details, see http://creativecommons.org/licenses/by/3.0/.
@ -1255,6 +1256,13 @@ h1[id] {
  font-weight: normal;
 }

+.bs-customizer-input {
+  float: left;
+  width: 33.333333%;
+  padding-left: 15px;
+  padding-right: 15px;
+}
+
 /* Downloads */
 .bs-customize-download .btn-outline {
  padding: 20px;
@ -1379,6 +1387,7 @@ h1[id] {

 /* Pseudo :focus state for showing how it looks in the docs */
 #focusedInput {
+  border-color: rgb(204,204,204); /* Restate unfocused value to make CSSLint happy that there's a pre-CSS3 fallback*/
  border-color: rgba(82,168,236,.8);
  outline: 0;
  outline: thin dotted \9; /* IE6-9 */
--- a/docs/assets/js/application.js
+++ b/docs/assets/js/application.js
@ -3,7 +3,7 @@
 // ++++++++++++++++++++++++++++++++++++++++++

 /*!
- * Copyright 2013 Twitter, Inc.
+ * Copyright 2011-2014 Twitter, Inc.
 *
 * Licensed under the Creative Commons Attribution 3.0 Unported License. For
 * details, see http://creativecommons.org/licenses/by/3.0/.
--- a/docs/assets/js/customize.min.js
+++ b/docs/assets/js/customize.min.js
--- a/docs/assets/js/customizer.js
+++ b/docs/assets/js/customizer.js
@ -1,5 +1,5 @@
 /*!
- * Copyright 2013 Twitter, Inc.
+ * Copyright 2011-2014 Twitter, Inc.
 *
 * Licensed under the Creative Commons Attribution 3.0 Unported License. For
 * details, see http://creativecommons.org/licenses/by/3.0/.
@ -10,7 +10,7 @@
 window.onload = function () { // wait for load in a dumb way because B-0
  var cw = '/*!\n' +
           ' * Bootstrap v3.0.3 (http://getbootstrap.com)\n' +
-           ' * Copyright 2013 Twitter, Inc.\n' +
+           ' * Copyright 2011-2014 Twitter, Inc.\n' +
           ' * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)\n' +
           ' */\n\n';

@ -173,20 +173,55 @@ window.onload = function () { // wait for load in a dumb way because B-0
    }
  }

-  // Returns an Array of @import'd filenames from 'bootstrap.less' in the order
+  // Returns an Array of @import'd filenames in the order
  // in which they appear in the file.
-  function bootstrapLessFilenames() {
+  function includedLessFilenames(lessFilename) {
    var IMPORT_REGEX = /^@import \"(.*?)\";$/
-    var bootstrapLessLines = __less['bootstrap.less'].split('\n')
+    var lessLines = __less[lessFilename].split('\n')

-    for (var i = 0, imports = []; i < bootstrapLessLines.length; i++) {
-      var match = IMPORT_REGEX.exec(bootstrapLessLines[i])
+    for (var i = 0, imports = []; i < lessLines.length; i++) {
+      var match = IMPORT_REGEX.exec(lessLines[i])
      if (match) imports.push(match[1])
    }

    return imports
  }

+  function generateLESS(lessFilename, lessFileIncludes, vars) {
+    var lessSource = __less[lessFilename]
+
+    $.each(includedLessFilenames(lessFilename), function(index, filename) {
+      var fileInclude = lessFileIncludes[filename]
+
+      // Files not explicitly unchecked are compiled into the final stylesheet.
+      // Core stylesheets like 'normalize.less' are not included in the form
+      // since disabling them would wreck everything, and so their 'fileInclude'
+      // will be 'undefined'.
+      if (fileInclude || (fileInclude == null))    lessSource += __less[filename]
+
+      // Custom variables are added after Bootstrap variables so the custom
+      // ones take precedence.
+      if (('variables.less' === filename) && vars) lessSource += generateCustomCSS(vars)
+    })
+
+    lessSource = lessSource.replace(/@import[^\n]*/gi, '') //strip any imports
+    return lessSource
+  }
+
+  function compileLESS(lessSource, baseFilename, intoResult) {
+    var parser = new less.Parser({
+        paths: ['variables.less', 'mixins.less'],
+        optimization: 0,
+        filename: baseFilename + '.css'
+    }).parse(lessSource, function (err, tree) {
+      if (err) {
+        return showError('<strong>Ruh roh!</strong> Could not parse less files.', err)
+      }
+      intoResult[baseFilename + '.css']     = cw + tree.toCSS()
+      intoResult[baseFilename + '.min.css'] = cw + tree.toCSS({ compress: true })
+    })
+  }
+
  function generateCSS() {
    var oneChecked = false
    var lessFileIncludes = {}
@ -202,43 +237,18 @@ window.onload = function () { // wait for load in a dumb way because B-0

    var result = {}
    var vars = {}
-    var css = ''

    $('#less-variables-section input')
        .each(function () {
          $(this).val() && (vars[$(this).prev().text()] = $(this).val())
        })

-    $.each(bootstrapLessFilenames(), function(index, filename) {
-      var fileInclude = lessFileIncludes[filename]
-
-      // Files not explicitly unchecked are compiled into the final stylesheet.
-      // Core stylesheets like 'normalize.less' are not included in the form
-      // since disabling them would wreck everything, and so their 'fileInclude'
-      // will be 'undefined'.
-      if (fileInclude || (fileInclude == null)) css += __less[filename]
-
-      // Custom variables are added after Bootstrap variables so the custom
-      // ones take precedence.
-      if (('variables.less' === filename) && vars) css += generateCustomCSS(vars)
-    })
-
-    css = css.replace(/@import[^\n]*/gi, '') //strip any imports
+    var bsLessSource    = generateLESS('bootstrap.less', lessFileIncludes, vars)
+    var themeLessSource = generateLESS('theme.less',     lessFileIncludes, vars)

    try {
-      var parser = new less.Parser({
-          paths: ['variables.less', 'mixins.less'],
-          optimization: 0,
-          filename: 'bootstrap.css'
-      }).parse(css, function (err, tree) {
-        if (err) {
-          return showError('<strong>Ruh roh!</strong> Could not parse less files.', err)
-        }
-        result = {
-          'bootstrap.css'     : cw + tree.toCSS(),
-          'bootstrap.min.css' : cw + tree.toCSS({ compress: true })
-        }
-      })
+      compileLESS(bsLessSource, 'bootstrap', result)
+      compileLESS(themeLessSource, 'bootstrap-theme', result)
    } catch (err) {
      return showError('<strong>Ruh roh!</strong> Could not parse less files.', err)
    }
--- a/docs/assets/js/ie8-responsive-file-warning.js
+++ b/docs/assets/js/ie8-responsive-file-warning.js
@ -2,7 +2,7 @@
 // IT'S JUST JUNK FOR OUR DOCS!
 // ++++++++++++++++++++++++++++++++++++++++++
 /*!
- * Copyright 2013 Twitter, Inc.
+ * Copyright 2011-2014 Twitter, Inc.
 *
 * Licensed under the Creative Commons Attribution 3.0 Unported License. For
 * details, see http://creativecommons.org/licenses/by/3.0/.
--- a/docs/assets/js/raw-files.js
+++ b/docs/assets/js/raw-files.js
--- a/docs/components.html
+++ b/docs/components.html
@ -2616,17 +2616,17 @@ body { padding-bottom: 70px; }
        <div class="col-sm-6">
          <ul class="list-group">
            <li class="list-group-item list-group-item-success">Dapibus ac facilisis in</li>
+            <li class="list-group-item list-group-item-info">Cras sit amet nibh libero</li>
            <li class="list-group-item list-group-item-warning">Porta ac consectetur ac</li>
            <li class="list-group-item list-group-item-danger">Vestibulum at eros</li>
-            <li class="list-group-item list-group-item-info">Cras sit amet nibh libero</li>
          </ul>
        </div>
        <div class="col-sm-6">
          <div class="list-group">
            <a href="#" class="list-group-item list-group-item-success">Dapibus ac facilisis in</a>
+            <a href="#" class="list-group-item list-group-item-info">Cras sit amet nibh libero</a>
            <a href="#" class="list-group-item list-group-item-warning">Porta ac consectetur ac</a>
            <a href="#" class="list-group-item list-group-item-danger">Vestibulum at eros</a>
-            <a href="#" class="list-group-item list-group-item-info">Cras sit amet nibh libero</a>
          </div>
        </div>
      </div>
@ -2634,15 +2634,15 @@ body { padding-bottom: 70px; }
 {% highlight html %}
 <ul class="list-group">
  <li class="list-group-item list-group-item-success">Dapibus ac facilisis in</li>
+  <li class="list-group-item list-group-item-info">Cras sit amet nibh libero</li>
  <li class="list-group-item list-group-item-warning">Porta ac consectetur ac</li>
  <li class="list-group-item list-group-item-danger">Vestibulum at eros</li>
-  <li class="list-group-item list-group-item-info">Cras sit amet nibh libero</li>
 </ul>
 <div class="list-group">
  <a href="#" class="list-group-item list-group-item-success">Dapibus ac facilisis in</a>
+  <a href="#" class="list-group-item list-group-item-info">Cras sit amet nibh libero</a>
  <a href="#" class="list-group-item list-group-item-warning">Porta ac consectetur ac</a>
  <a href="#" class="list-group-item list-group-item-danger">Vestibulum at eros</a>
-  <a href="#" class="list-group-item list-group-item-info">Cras sit amet nibh libero</a>
 </div>
 {% endhighlight %}

--- a/docs/css.html
+++ b/docs/css.html
@ -1312,6 +1312,12 @@ For example, <code>&lt;section&gt;</code> should be wrapped as inline.
            </td>
            <td>Indicates a successful or positive action</td>
          </tr>
+          <tr>
+            <td>
+              <code>.info</code>
+            </td>
+            <td>Indicates a neutral informative change or action</td>
+          </tr>
          <tr>
            <td>
              <code>.warning</code>
@ -1324,12 +1330,6 @@ For example, <code>&lt;section&gt;</code> should be wrapped as inline.
            </td>
            <td>Indicates a dangerous or potentially negative action</td>
          </tr>
-          <tr>
-            <td>
-              <code>.info</code>
-            </td>
-            <td>Indicates a neutral informative change or action</td>
-          </tr>
        </tbody>
      </table>
    </div>
@ -1368,7 +1368,7 @@ For example, <code>&lt;section&gt;</code> should be wrapped as inline.
            <td>Column content</td>
            <td>Column content</td>
          </tr>
-          <tr class="warning">
+          <tr class="info">
            <td>5</td>
            <td>Column content</td>
            <td>Column content</td>
@ -1380,7 +1380,7 @@ For example, <code>&lt;section&gt;</code> should be wrapped as inline.
            <td>Column content</td>
            <td>Column content</td>
          </tr>
-          <tr class="danger">
+          <tr class="warning">
            <td>7</td>
            <td>Column content</td>
            <td>Column content</td>
@ -1392,7 +1392,7 @@ For example, <code>&lt;section&gt;</code> should be wrapped as inline.
            <td>Column content</td>
            <td>Column content</td>
          </tr>
-          <tr class="info">
+          <tr class="danger">
            <td>9</td>
            <td>Column content</td>
            <td>Column content</td>
@ -2854,17 +2854,17 @@ For example, <code>&lt;section&gt;</code> should be wrapped as inline.
      <div class="color-swatches">
        <div class="color-swatch brand-primary"></div>
        <div class="color-swatch brand-success"></div>
+        <div class="color-swatch brand-info"></div>
        <div class="color-swatch brand-warning"></div>
        <div class="color-swatch brand-danger"></div>
-        <div class="color-swatch brand-info"></div>
      </div>
    </div>
 {% highlight css %}
@brand-primary: #428bca;
@brand-success: #5cb85c;
+@brand-info:    #5bc0de;
@brand-warning: #f0ad4e;
@brand-danger:  #d9534f;
-@brand-info:    #5bc0de;
 {% endhighlight %}

    <p>Use any of these color variables as they are or reassign them to more meaningful variables for your project.</p>
@ -2989,7 +2989,7 @@ a {
 {% endhighlight %}

    <h3 id="less-mixins-rounded-corners">Rounded corners</h3>
-    <p>Today all modern browsers support the non-prefixed <code>border-radius</code> property. As such, there is no <code>.border-radius()</code> mixin, but Preboot does include shortcuts for quickly rounding two corners on a particular side of an object.</p>
+    <p>Today all modern browsers support the non-prefixed <code>border-radius</code> property. As such, there is no <code>.border-radius()</code> mixin, but Bootstrap does include shortcuts for quickly rounding two corners on a particular side of an object.</p>
 {% highlight css %}
 .border-top-radius(@radius) {
  border-top-right-radius: @radius;
@ -3284,7 +3284,7 @@ a {
 {% endhighlight %}

    <h3 id="less-mixins-retina-images">Retina images</h3>
-    <p>Specify two image paths and the @1x image dimensions, and Preboot will provide an @2x media query. <strong>If you have many images to serve, consider writing your retina image CSS manually in a single media query.</strong></p>
+    <p>Specify two image paths and the @1x image dimensions, and Bootstrap will provide an @2x media query. <strong>If you have many images to serve, consider writing your retina image CSS manually in a single media query.</strong></p>
 {% highlight css %}
 .img-retina(@file-1x; @file-2x; @width-1x; @height-1x) {
  background-image: url("@{file-1x}");
--- a/docs/customize.html
+++ b/docs/customize.html
--- a/docs/customizer-variables.jade
+++ b/docs/customizer-variables.jade
@ -0,0 +1,21 @@
+// NOTE: DO NOT EDIT THE FOLLOWING SECTION DIRECTLY! It is autogenerated via the `build-customizer-vars-form` Grunt task using the customizer-variables.jade template.
+each section in sections
+  if section.customizable
+    h2(id=section.id)= section.heading
+    if section.docstring
+      p!= section.docstring.html
+    each subsection in section.subsections
+      if subsection.heading
+        h3(id=subsection.id)= subsection.heading
+      div.row
+        each variable in subsection.variables
+          div.bs-customizer-input
+            label(for="input-" + variable.name)= variable.name
+            input.form-control(
+              id="input-" + variable.name
+              type="text"
+              value=variable.defaultValue
+              data-var=variable.name)
+            if variable.docstring
+              p.help-block!= variable.docstring.html
+// NOTE: DO NOT EDIT THE PRECEDING SECTION DIRECTLY! It is autogenerated via the `build-customizer-vars-form` Grunt task using the customizer-variables.jade template.
--- a/docs/dist/css/bootstrap-theme.css.map
+++ b/docs/dist/css/bootstrap-theme.css.map
--- a/docs/dist/css/bootstrap-theme.min.css
+++ b/docs/dist/css/bootstrap-theme.min.css
--- a/docs/dist/css/bootstrap.css.map
+++ b/docs/dist/css/bootstrap.css.map
--- a/docs/dist/css/bootstrap.min.css
+++ b/docs/dist/css/bootstrap.min.css
--- a/docs/dist/js/bootstrap.min.js
+++ b/docs/dist/js/bootstrap.min.js
--- a/docs/examples/blog/index.html
+++ b/docs/examples/blog/index.html
@ -53,7 +53,7 @@

          <div class="blog-post">
            <h2 class="blog-post-title">Sample blog post</h2>
-            <p class="blog-post-meta">December 1, 2013 by <a href="#">Mark</a></p>
+            <p class="blog-post-meta">January 1, 2014 by <a href="#">Mark</a></p>

            <p>This blog post shows a few different types of content that's supported and styled with Bootstrap. Basic typography, images, and code are all supported.</p>
            <hr>
@ -86,7 +86,7 @@

          <div class="blog-post">
            <h2 class="blog-post-title">Another blog post</h2>
-            <p class="blog-post-meta">November 23, 2013 by <a href="#">Jacob</a></p>
+            <p class="blog-post-meta">December 23, 2013 by <a href="#">Jacob</a></p>

            <p>Cum sociis natoque penatibus et magnis <a href="#">dis parturient montes</a>, nascetur ridiculus mus. Aenean eu leo quam. Pellentesque ornare sem lacinia quam venenatis vestibulum. Sed posuere consectetur est at lobortis. Cras mattis consectetur purus sit amet fermentum.</p>
            <blockquote>
@ -98,7 +98,7 @@

          <div class="blog-post">
            <h2 class="blog-post-title">New feature</h2>
-            <p class="blog-post-meta">November 14, 2013 by <a href="#">Chris</a></p>
+            <p class="blog-post-meta">December 14, 2013 by <a href="#">Chris</a></p>

            <p>Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Aenean lacinia bibendum nulla sed consectetur. Etiam porta sem malesuada magna mollis euismod. Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum massa justo sit amet risus.</p>
            <ul>
@ -125,6 +125,7 @@
          <div class="sidebar-module">
            <h4>Archives</h4>
            <ol class="list-unstyled">
+              <li><a href="#">January 2014</a></li>
              <li><a href="#">December 2013</a></li>
              <li><a href="#">November 2013</a></li>
              <li><a href="#">October 2013</a></li>
@ -136,7 +137,6 @@
              <li><a href="#">April 2013</a></li>
              <li><a href="#">March 2013</a></li>
              <li><a href="#">February 2013</a></li>
-              <li><a href="#">January 2013</a></li>
            </ol>
          </div>
          <div class="sidebar-module">
--- a/docs/examples/carousel/index.html
+++ b/docs/examples/carousel/index.html
@ -190,7 +190,7 @@
      <!-- FOOTER -->
      <footer>
        <p class="pull-right"><a href="#">Back to top</a></p>
-        <p>&copy; 2013 Company, Inc. &middot; <a href="#">Privacy</a> &middot; <a href="#">Terms</a></p>
+        <p>&copy; 2014 Company, Inc. &middot; <a href="#">Privacy</a> &middot; <a href="#">Terms</a></p>
      </footer>

    </div><!-- /.container -->
--- a/docs/examples/jumbotron-narrow/index.html
+++ b/docs/examples/jumbotron-narrow/index.html
@ -69,7 +69,7 @@
      </div>

      <div class="footer">
-        <p>&copy; Company 2013</p>
+        <p>&copy; Company 2014</p>
      </div>

    </div> <!-- /container -->
--- a/docs/examples/jumbotron/index.html
+++ b/docs/examples/jumbotron/index.html
@ -85,7 +85,7 @@
      <hr>

      <footer>
-        <p>&copy; Company 2013</p>
+        <p>&copy; Company 2014</p>
      </footer>
    </div> <!-- /container -->

--- a/docs/examples/justified-nav/index.html
+++ b/docs/examples/justified-nav/index.html
@ -71,7 +71,7 @@

      <!-- Site footer -->
      <div class="footer">
-        <p>&copy; Company 2013</p>
+        <p>&copy; Company 2014</p>
      </div>

    </div> <!-- /container -->
--- a/docs/examples/offcanvas/index.html
+++ b/docs/examples/offcanvas/index.html
@ -113,7 +113,7 @@
      <hr>

      <footer>
-        <p>&copy; Company 2013</p>
+        <p>&copy; Company 2014</p>
      </footer>

    </div><!--/.container-->
--- a/docs/getting-started.html
+++ b/docs/getting-started.html
@ -446,6 +446,10 @@ bootstrap/
            <td><code>.input-large</code></td>
            <td><code>.input-lg</code></td>
          </tr>
+          <tr>
+            <td><code>.input-block-level</code></td>
+            <td><code>.form-control</code></td>
+          </tr>
          <tr>
            <td><code>.control-group</code></td>
            <td><code>.form-group</code></td>
@ -673,6 +677,11 @@ bootstrap/
            <td><code>.control-group.info</code></td>
            <td class="text-muted">N/A</td>
          </tr>
+          <tr>
+            <td>Block level from input</td>
+            <td><code>.input-block-level</code></td>
+            <td>No direct equivalent, but <a href="../css/#forms-controls">forms controls</a> are similar.</td>
+          </tr>
          <tr>
            <td>Fluid container</td>
            <td><code>.container-fluid</code></td>
--- a/docs/grunt/bs-glyphicons-data-generator.js
+++ b/docs/grunt/bs-glyphicons-data-generator.js
@ -0,0 +1,27 @@
+/* jshint node: true */
+
+var fs = require('fs')
+
+module.exports = function generateGlyphiconsData() {
+  // Pass encoding, utf8, so `readFileSync` will return a string instead of a
+  // buffer
+  var glyphiconsFile = fs.readFileSync('less/glyphicons.less', 'utf8')
+  var glpyhiconsLines = glyphiconsFile.split('\n')
+
+  // Use any line that starts with ".glyphicon-" and capture the class name
+  var iconClassName = /^\.(glyphicon-[^\s]+)/
+  var glyphiconsData = '# This file is generated via Grunt task. **Do not edit directly.** \n' +
+                       '# See the \'build-glyphicons-data\' task in Gruntfile.js.\n\n';
+  for (var i = 0, len = glpyhiconsLines.length; i < len; i++) {
+    var match = glpyhiconsLines[i].match(iconClassName)
+
+    if (match != null) {
+      glyphiconsData += '- ' + match[1] + '\n'
+    }
+  }
+
+  // Create the `_data` directory if it doesn't already exist
+  if (!fs.existsSync('docs/_data')) fs.mkdirSync('docs/_data')
+
+  fs.writeFileSync('docs/_data/glyphicons.yml', glyphiconsData)
+}
--- a/docs/grunt/bs-lessdoc-parser.js
+++ b/docs/grunt/bs-lessdoc-parser.js
@ -0,0 +1,228 @@
+/* jshint node: true */
+
+var markdown = require('markdown').markdown;
+
+function markdown2html(markdownString) {
+  // the slice removes the <p>...</p> wrapper output by Markdown processor
+  return markdown.toHTML(markdownString.trim()).slice(3, -4);
+}
+
+
+/*
+Mini-language:
+  //== This is a normal heading, which starts a section. Sections group variables together.
+  //## Optional description for the heading
+
+  //** Optional description for the following variable. You **can** use Markdown in descriptions to discuss `<html>` stuff.
+  @foo: #ffff;
+
+  //-- This is a heading for a section whose variables shouldn't be customizable
+
+  All other lines are ignored completely.
+*/
+
+
+var CUSTOMIZABLE_HEADING = /^[/]{2}={2}(.*)$/;
+var UNCUSTOMIZABLE_HEADING = /^[/]{2}-{2}(.*)$/;
+var SUBSECTION_HEADING = /^[/]{2}={3}(.*)$/;
+var SECTION_DOCSTRING = /^[/]{2}#{2}(.*)$/;
+var VAR_ASSIGNMENT = /^(@[a-zA-Z0-9_-]+):[ ]*([^ ;][^;]+);[ ]*$/;
+var VAR_DOCSTRING = /^[/]{2}[*]{2}(.*)$/;
+
+function Section(heading, customizable) {
+  this.heading = heading.trim();
+  this.id = this.heading.replace(/\s+/g, '-').toLowerCase();
+  this.customizable = customizable;
+  this.docstring = null;
+  this.subsections = [];
+}
+
+Section.prototype.addSubSection = function (subsection) {
+  this.subsections.push(subsection);
+}
+
+function SubSection(heading) {
+  this.heading = heading.trim();
+  this.id = this.heading.replace(/\s+/g, '-').toLowerCase();
+  this.variables = [];
+}
+
+SubSection.prototype.addVar = function (variable) {
+  this.variables.push(variable);
+};
+
+function VarDocstring(markdownString) {
+  this.html = markdown2html(markdownString);
+}
+
+function SectionDocstring(markdownString) {
+  this.html = markdown2html(markdownString);
+}
+
+function Variable(name, defaultValue) {
+  this.name = name;
+  this.defaultValue = defaultValue;
+  this.docstring = null;
+}
+
+function Tokenizer(fileContent) {
+  this._lines = fileContent.split('\n');
+  this._next = undefined;
+}
+
+Tokenizer.prototype.unshift = function (token) {
+  if (this._next !== undefined) {
+    throw new Error('Attempted to unshift twice!');
+  }
+  this._next = token;
+};
+
+Tokenizer.prototype._shift = function () {
+  // returning null signals EOF
+  // returning undefined means the line was ignored
+  if (this._next !== undefined) {
+    var result = this._next;
+    this._next = undefined;
+    return result;
+  }
+  if (this._lines.length <= 0) {
+    return null;
+  }
+  var line = this._lines.shift();
+  var match = null;
+  match = SUBSECTION_HEADING.exec(line);
+  if (match !== null) {
+    return new SubSection(match[1]);
+  }
+  match = CUSTOMIZABLE_HEADING.exec(line);
+  if (match !== null) {
+    return new Section(match[1], true);
+  }
+  match = UNCUSTOMIZABLE_HEADING.exec(line);
+  if (match !== null) {
+    return new Section(match[1], false);
+  }
+  match = SECTION_DOCSTRING.exec(line);
+  if (match !== null) {
+    return new SectionDocstring(match[1]);
+  }
+  match = VAR_DOCSTRING.exec(line);
+  if (match !== null) {
+    return new VarDocstring(match[1]);
+  }
+  var commentStart = line.lastIndexOf('//');
+  var varLine = (commentStart === -1) ? line : line.slice(0, commentStart);
+  match = VAR_ASSIGNMENT.exec(varLine);
+  if (match !== null) {
+    return new Variable(match[1], match[2]);
+  }
+  return undefined;
+};
+
+Tokenizer.prototype.shift = function () {
+  while (true) {
+    var result = this._shift();
+    if (result === undefined) {
+      continue;
+    }
+    return result;
+  }
+};
+
+function Parser(fileContent) {
+  this._tokenizer = new Tokenizer(fileContent);
+}
+
+Parser.prototype.parseFile = function () {
+  var sections = [];
+  while (true) {
+    var section = this.parseSection();
+    if (section === null) {
+      if (this._tokenizer.shift() !== null) {
+        throw new Error('Unexpected unparsed section of file remains!');
+      }
+      return sections;
+    }
+    sections.push(section);
+  }
+};
+
+Parser.prototype.parseSection = function () {
+  var section = this._tokenizer.shift();
+  if (section === null) {
+    return null;
+  }
+  if (!(section instanceof Section)) {
+    throw new Error('Expected section heading; got: ' + JSON.stringify(section));
+  }
+  var docstring = this._tokenizer.shift();
+  if (docstring instanceof SectionDocstring) {
+    section.docstring = docstring;
+  }
+  else {
+    this._tokenizer.unshift(docstring);
+  }
+  this.parseSubSections(section);
+
+  return section;
+};
+
+Parser.prototype.parseSubSections = function (section) {
+  while (true) {
+    var subsection = this.parseSubSection();
+    if (subsection === null) {
+      if (section.subsections.length === 0) {
+        // Presume an implicit initial subsection
+        subsection = new SubSection('');
+        this.parseVars(subsection);
+      }
+      else {
+        break;
+      }
+    }
+    section.addSubSection(subsection);
+  }
+
+  if (section.subsections.length === 1 && !(section.subsections[0].heading) && section.subsections[0].variables.length === 0) {
+    // Ignore lone empty implicit subsection
+    section.subsections = [];
+  }
+};
+
+Parser.prototype.parseSubSection = function () {
+  var subsection = this._tokenizer.shift();
+  if (subsection instanceof SubSection) {
+    this.parseVars(subsection);
+    return subsection;
+  }
+  this._tokenizer.unshift(subsection);
+  return null;
+};
+
+Parser.prototype.parseVars = function (subsection) {
+  while (true) {
+    var variable = this.parseVar();
+    if (variable === null) {
+      return;
+    }
+    subsection.addVar(variable);
+  }
+};
+
+Parser.prototype.parseVar = function () {
+  var docstring = this._tokenizer.shift();
+  if (!(docstring instanceof VarDocstring)) {
+    this._tokenizer.unshift(docstring);
+    docstring = null;
+  }
+  var variable = this._tokenizer.shift();
+  if (variable instanceof Variable) {
+    variable.docstring = docstring;
+    return variable;
+  }
+  this._tokenizer.unshift(variable);
+  return null;
+};
+
+
+module.exports = Parser;
--- a/docs/grunt/bs-raw-files-generator.js
+++ b/docs/grunt/bs-raw-files-generator.js
@ -0,0 +1,22 @@
+/* jshint node: true */
+
+var btoa = require('btoa') // jshint ignore:line
+var fs = require('fs')
+
+function getFiles(type) {
+  var files = {}
+  fs.readdirSync(type)
+    .filter(function (path) {
+      return type == 'fonts' ? true : new RegExp('\\.' + type + '$').test(path)
+    })
+    .forEach(function (path) {
+      var fullPath = type + '/' + path
+      return files[path] = (type == 'fonts' ? btoa(fs.readFileSync(fullPath)) : fs.readFileSync(fullPath, 'utf8'))
+    })
+  return 'var __' + type + ' = ' + JSON.stringify(files) + '\n'
+}
+
+module.exports = function generateRawFilesJs() {
+  var files = getFiles('js') + getFiles('less') + getFiles('fonts')
+  fs.writeFileSync('docs/assets/js/raw-files.js', files)
+}
--- a/js/.jscs.json
+++ b/js/.jscs.json
@ -3,7 +3,7 @@
  "requireLeftStickedOperators": [","],
  "disallowLeftStickedOperators": ["?", "+", "-", "/", "*", "=", "==", "===", "!=", "!==", ">", ">=", "<", "<="],
  "disallowRightStickedOperators": ["?", "/", "*", ":", "=", "==", "===", "!=", "!==", ">", ">=", "<", "<="],
-  "disallowSpaceAfterPrefixUnaryOperators": ["++", "--", "+", "-", "~", "!"],
+  "disallowSpaceAfterPrefixUnaryOperators": ["++", "--", "+", "-", "~"],
  "disallowSpaceBeforePostfixUnaryOperators": ["++", "--"],
  "requireLineFeedAtFileEnd": true,
  "requireRightStickedOperators": ["!"],
--- a/js/affix.js
+++ b/js/affix.js
@ -2,12 +2,13 @@
 * Bootstrap: affix.js v3.0.3
 * http://getbootstrap.com/javascript/#affix
 * ========================================================================
- * Copyright 2014 Twitter, Inc.
+ * Copyright 2011-2014 Twitter, Inc.
 * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
 * ======================================================================== */


-+function ($) { 'use strict';
+function ($) {
+  'use strict';

  // AFFIX CLASS DEFINITION
  // ======================
--- a/js/alert.js
+++ b/js/alert.js
@ -2,12 +2,13 @@
 * Bootstrap: alert.js v3.0.3
 * http://getbootstrap.com/javascript/#alerts
 * ========================================================================
- * Copyright 2014 Twitter, Inc.
+ * Copyright 2011-2014 Twitter, Inc.
 * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
 * ======================================================================== */


-+function ($) { 'use strict';
+function ($) {
+  'use strict';

  // ALERT CLASS DEFINITION
  // ======================
--- a/js/button.js
+++ b/js/button.js
@ -2,12 +2,13 @@
 * Bootstrap: button.js v3.0.3
 * http://getbootstrap.com/javascript/#buttons
 * ========================================================================
- * Copyright 2014 Twitter, Inc.
+ * Copyright 2011-2014 Twitter, Inc.
 * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
 * ======================================================================== */


-+function ($) { 'use strict';
+function ($) {
+  'use strict';

  // BUTTON PUBLIC CLASS DEFINITION
  // ==============================
--- a/js/carousel.js
+++ b/js/carousel.js
@ -2,12 +2,13 @@
 * Bootstrap: carousel.js v3.0.3
 * http://getbootstrap.com/javascript/#carousel
 * ========================================================================
- * Copyright 2014 Twitter, Inc.
+ * Copyright 2011-2014 Twitter, Inc.
 * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
 * ======================================================================== */


-+function ($) { 'use strict';
+function ($) {
+  'use strict';

  // CAROUSEL CLASS DEFINITION
  // =========================
--- a/js/collapse.js
+++ b/js/collapse.js
@ -2,12 +2,13 @@
 * Bootstrap: collapse.js v3.0.3
 * http://getbootstrap.com/javascript/#collapse
 * ========================================================================
- * Copyright 2014 Twitter, Inc.
+ * Copyright 2011-2014 Twitter, Inc.
 * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
 * ======================================================================== */


-+function ($) { 'use strict';
+function ($) {
+  'use strict';

  // COLLAPSE PUBLIC CLASS DEFINITION
  // ================================
--- a/js/dropdown.js
+++ b/js/dropdown.js
@ -2,12 +2,13 @@
 * Bootstrap: dropdown.js v3.0.3
 * http://getbootstrap.com/javascript/#dropdowns
 * ========================================================================
- * Copyright 2014 Twitter, Inc.
+ * Copyright 2011-2014 Twitter, Inc.
 * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
 * ======================================================================== */


-+function ($) { 'use strict';
+function ($) {
+  'use strict';

  // DROPDOWN CLASS DEFINITION
  // =========================
--- a/js/modal.js
+++ b/js/modal.js
@ -2,12 +2,13 @@
 * Bootstrap: modal.js v3.0.3
 * http://getbootstrap.com/javascript/#modals
 * ========================================================================
- * Copyright 2014 Twitter, Inc.
+ * Copyright 2011-2014 Twitter, Inc.
 * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
 * ======================================================================== */


-+function ($) { 'use strict';
+function ($) {
+  'use strict';

  // MODAL CLASS DEFINITION
  // ======================
--- a/js/popover.js
+++ b/js/popover.js
@ -2,12 +2,13 @@
 * Bootstrap: popover.js v3.0.3
 * http://getbootstrap.com/javascript/#popovers
 * ========================================================================
- * Copyright 2014 Twitter, Inc.
+ * Copyright 2011-2014 Twitter, Inc.
 * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
 * ======================================================================== */


-+function ($) { 'use strict';
+function ($) {
+  'use strict';

  // POPOVER PUBLIC CLASS DEFINITION
  // ===============================
--- a/js/scrollspy.js
+++ b/js/scrollspy.js
@ -2,12 +2,13 @@
 * Bootstrap: scrollspy.js v3.0.3
 * http://getbootstrap.com/javascript/#scrollspy
 * ========================================================================
- * Copyright 2014 Twitter, Inc.
+ * Copyright 2011-2014 Twitter, Inc.
 * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
 * ======================================================================== */


-+function ($) { 'use strict';
+function ($) {
+  'use strict';

  // SCROLLSPY CLASS DEFINITION
  // ==========================
--- a/js/tab.js
+++ b/js/tab.js
@ -2,12 +2,13 @@
 * Bootstrap: tab.js v3.0.3
 * http://getbootstrap.com/javascript/#tabs
 * ========================================================================
- * Copyright 2014 Twitter, Inc.
+ * Copyright 2011-2014 Twitter, Inc.
 * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
 * ======================================================================== */


-+function ($) { 'use strict';
+function ($) {
+  'use strict';

  // TAB CLASS DEFINITION
  // ====================
--- a/js/tooltip.js
+++ b/js/tooltip.js
@ -3,12 +3,13 @@
 * http://getbootstrap.com/javascript/#tooltip
 * Inspired by the original jQuery.tipsy by Jason Frame
 * ========================================================================
- * Copyright 2014 Twitter, Inc.
+ * Copyright 2011-2014 Twitter, Inc.
 * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
 * ======================================================================== */


-+function ($) { 'use strict';
+function ($) {
+  'use strict';

  // TOOLTIP PUBLIC CLASS DEFINITION
  // ===============================
--- a/js/transition.js
+++ b/js/transition.js
@ -2,12 +2,13 @@
 * Bootstrap: transition.js v3.0.3
 * http://getbootstrap.com/javascript/#transitions
 * ========================================================================
- * Copyright 2014 Twitter, Inc.
+ * Copyright 2011-2014 Twitter, Inc.
 * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
 * ======================================================================== */


-+function ($) { 'use strict';
+function ($) {
+  'use strict';

  // CSS TRANSITION SUPPORT (Shoutout: http://www.modernizr.com/)
  // ============================================================
--- a/less/.csslintrc
+++ b/less/.csslintrc
@ -11,6 +11,7 @@
  "outline-none": false,
  "qualified-headings": false,
  "regex-selectors": false,
+  "shorthand": false,
  "text-indent": false,
  "unique-headings": false,
  "universal-selector": false,
--- a/less/buttons.less
+++ b/less/buttons.less
@ -60,6 +60,10 @@
 .btn-success {
  .button-variant(@btn-success-color; @btn-success-bg; @btn-success-border);
 }
+// Info appears as blue-green
+.btn-info {
+  .button-variant(@btn-info-color; @btn-info-bg; @btn-info-border);
+}
 // Warning appears as orange
 .btn-warning {
  .button-variant(@btn-warning-color; @btn-warning-bg; @btn-warning-border);
@ -68,10 +72,6 @@
 .btn-danger {
  .button-variant(@btn-danger-color; @btn-danger-bg; @btn-danger-border);
 }
-// Info appears as blue-green
-.btn-info {
-  .button-variant(@btn-info-color; @btn-info-bg; @btn-info-border);
-}


 // Link buttons
--- a/less/forms.less
+++ b/less/forms.less
@ -52,6 +52,12 @@ input[type="file"] {
  display: block;
 }

+// Make range inputs behave like textual form controls
+input[type="range"] {
+  display: block;
+  width: 100%;
+}
+
 // Make multiple select elements height not fixed
 select[multiple],
 select[size] {
@ -276,15 +282,15 @@ input[type="checkbox"],
 }

 // Feedback states
+.has-success {
+  .form-control-validation(@state-success-text; @state-success-text; @state-success-bg);
+}
 .has-warning {
  .form-control-validation(@state-warning-text; @state-warning-text; @state-warning-bg);
 }
 .has-error {
  .form-control-validation(@state-danger-text; @state-danger-text; @state-danger-bg);
 }
-.has-success {
-  .form-control-validation(@state-success-text; @state-success-text; @state-success-bg);
-}


 // Static form control text
--- a/less/glyphicons.less
+++ b/less/glyphicons.less
@ -14,7 +14,7 @@
  src: ~"url('@{icon-font-path}@{icon-font-name}.eot?#iefix') format('embedded-opentype')",
       ~"url('@{icon-font-path}@{icon-font-name}.woff') format('woff')",
       ~"url('@{icon-font-path}@{icon-font-name}.ttf') format('truetype')",
-       ~"url('@{icon-font-path}@{icon-font-name}.svg#glyphicons-halflingsregular') format('svg')";
+       ~"url('@{icon-font-path}@{icon-font-name}.svg#@{icon-font-svg-id}') format('svg')";
 }

 // Catchall baseclass
--- a/less/list-group.less
+++ b/less/list-group.less
@ -91,9 +91,9 @@ a.list-group-item {
 // Organizationally, this must come after the `:hover` states.

 .list-group-item-variant(success; @state-success-bg; @state-success-text);
+.list-group-item-variant(info; @state-info-bg; @state-info-text);
 .list-group-item-variant(warning; @state-warning-bg; @state-warning-text);
 .list-group-item-variant(danger; @state-danger-bg; @state-danger-text);
-.list-group-item-variant(info; @state-info-bg; @state-info-text);


 // Custom content options
--- a/less/mixins.less
+++ b/less/mixins.less
@ -851,7 +851,7 @@
    border-color: @border-color;
    background-color: @background-color;
  }
-  // Optional feedack icon
+  // Optional feedback icon
  .form-control-feedback {
    color: @text-color;
  }
--- a/less/panels.less
+++ b/less/panels.less
@ -59,7 +59,7 @@
  > .table,
  > .table-responsive > .table {
    margin-bottom: 0;
-    
+
    > tbody:last-child,
    > tfoot:last-child {
      > tr:last-child {
@ -185,12 +185,12 @@
 .panel-success {
  .panel-variant(@panel-success-border; @panel-success-text; @panel-success-heading-bg; @panel-success-border);
 }
+.panel-info {
+  .panel-variant(@panel-info-border; @panel-info-text; @panel-info-heading-bg; @panel-info-border);
+}
 .panel-warning {
  .panel-variant(@panel-warning-border; @panel-warning-text; @panel-warning-heading-bg; @panel-warning-border);
 }
 .panel-danger {
  .panel-variant(@panel-danger-border; @panel-danger-text; @panel-danger-heading-bg; @panel-danger-border);
 }
-.panel-info {
-  .panel-variant(@panel-info-border; @panel-info-text; @panel-info-heading-bg; @panel-info-border);
-}
--- a/less/tables.less
+++ b/less/tables.less
@ -157,9 +157,9 @@ table {
 // Generate the contextual variants
 .table-row-variant(active; @table-bg-active);
 .table-row-variant(success; @state-success-bg);
+.table-row-variant(info; @state-info-bg);
 .table-row-variant(warning; @state-warning-bg);
 .table-row-variant(danger; @state-danger-bg);
-.table-row-variant(info; @state-info-bg);


 // Responsive tables
--- a/less/theme.less
+++ b/less/theme.less
@ -63,9 +63,9 @@
 .btn-default { .btn-styles(@btn-default-bg); text-shadow: 0 1px 0 #fff; border-color: #ccc; }
 .btn-primary { .btn-styles(@btn-primary-bg); }
 .btn-success { .btn-styles(@btn-success-bg); }
+.btn-info    { .btn-styles(@btn-info-bg); }
 .btn-warning { .btn-styles(@btn-warning-bg); }
 .btn-danger  { .btn-styles(@btn-danger-bg); }
-.btn-info    { .btn-styles(@btn-info-bg); }



--- a/less/type.less
+++ b/less/type.less
@ -97,18 +97,6 @@ cite    { font-style: normal; }
    color: darken(@brand-primary, 10%);
  }
 }
-.text-warning {
-  color: @state-warning-text;
-  &:hover {
-    color: darken(@state-warning-text, 10%);
-  }
-}
-.text-danger {
-  color: @state-danger-text;
-  &:hover {
-    color: darken(@state-danger-text, 10%);
-  }
-}
 .text-success {
  color: @state-success-text;
  &:hover {
@ -121,6 +109,18 @@ cite    { font-style: normal; }
    color: darken(@state-info-text, 10%);
  }
 }
+.text-warning {
+  color: @state-warning-text;
+  &:hover {
+    color: darken(@state-warning-text, 10%);
+  }
+}
+.text-danger {
+  color: @state-danger-text;
+  &:hover {
+    color: darken(@state-danger-text, 10%);
+  }
+}

 // Contextual backgrounds
 // For now we'll leave these alongside the text classes until v4 when we can
@ -134,18 +134,6 @@ cite    { font-style: normal; }
    background-color: darken(@brand-primary, 10%);
  }
 }
-.bg-warning {
-  background-color: @state-warning-bg;
-  a&:hover {
-    background-color: darken(@state-warning-bg, 10%);
-  }
-}
-.bg-danger {
-  background-color: @state-danger-bg;
-  a&:hover {
-    background-color: darken(@state-danger-bg, 10%);
-  }
-}
 .bg-success {
  background-color: @state-success-bg;
  a&:hover {
@ -158,6 +146,18 @@ cite    { font-style: normal; }
    background-color: darken(@state-info-bg, 10%);
  }
 }
+.bg-warning {
+  background-color: @state-warning-bg;
+  a&:hover {
+    background-color: darken(@state-warning-bg, 10%);
+  }
+}
+.bg-danger {
+  background-color: @state-danger-bg;
+  a&:hover {
+    background-color: darken(@state-danger-bg, 10%);
+  }
+}


 // Page header
--- a/less/variables.less
+++ b/less/variables.less
@ -3,11 +3,9 @@
 // --------------------------------------------------


-// Global values
-// --------------------------------------------------
-
-// Grays
-// -------------------------
+//== Colors
+//
+//## Gray and brand colors for use across Bootstrap.

@gray-darker:            lighten(#000, 13.5%); // #222
@gray-dark:              lighten(#000, 20%);   // #333
@ -15,32 +13,35 @@
@gray-light:             lighten(#000, 60%);   // #999
@gray-lighter:           lighten(#000, 93.5%); // #eee

-// Brand colors
-// -------------------------
-
@brand-primary:         #428bca;
@brand-success:         #5cb85c;
+@brand-info:            #5bc0de;
@brand-warning:         #f0ad4e;
@brand-danger:          #d9534f;
-@brand-info:            #5bc0de;

-// Scaffolding
-// -------------------------

+//== Scaffolding
+//
+// ## Settings for some of the most global styles.
+
+//** Background color for `<body>`.
@body-bg:               #fff;
+//** Global text color on `<body>`.
@text-color:            @gray-dark;

-// Links
-// -------------------------
-
+//** Global textual link color.
@link-color:            @brand-primary;
+//** Link hover color set via `darken()` function.
@link-hover-color:      darken(@link-color, 15%);

-// Typography
-// -------------------------
+
+//== Typography
+//
+//## Font, line-height, and color for body text, headings, and more.

@font-family-sans-serif:  "Helvetica Neue", Helvetica, Arial, sans-serif;
@font-family-serif:       Georgia, "Times New Roman", Times, serif;
+//** Default monospace fonts for `<code>`, `<kbd>`, and `<pre>`.
@font-family-monospace:   Menlo, Monaco, Consolas, "Courier New", monospace;
@font-family-base:        @font-family-sans-serif;

@ -55,67 +56,84 @@
@font-size-h5:            @font-size-base;
@font-size-h6:            ceil((@font-size-base * 0.85)); // ~12px

+//** Unit-less `line-height` for use in components like buttons.
@line-height-base:        1.428571429; // 20/14
+//** Computed "line-height" (`font-size` &times; `line-height`) for use with `margin`, `padding`, etc.
@line-height-computed:    floor((@font-size-base * @line-height-base)); // ~20px

+//** By default, this inherits from the `<body>`.
@headings-font-family:    inherit;
@headings-font-weight:    500;
@headings-line-height:    1.1;
@headings-color:          inherit;


-// Iconography
-// -------------------------
+//-- Iconography
+//
+//## Specify custom locations of the include Glyphicons icon font. Useful for those including Bootstrap via Bower.

@icon-font-path:          "../fonts/";
@icon-font-name:          "glyphicons-halflings-regular";
+@icon-font-svg-id:				"glyphicons_halflingsregular";
+
+//== Components
+//
+//## Define common padding and border radius sizes and more. Values based on 14px text and 1.428 line-height (~20px to start).
+
+@padding-base-vertical:     6px;
+@padding-base-horizontal:   12px;
+
+@padding-large-vertical:    10px;
+@padding-large-horizontal:  16px;
+
+@padding-small-vertical:    5px;
+@padding-small-horizontal:  10px;
+
+@padding-xs-vertical:       1px;
+@padding-xs-horizontal:     5px;
+
+@line-height-large:         1.33;
+@line-height-small:         1.5;
+
+@border-radius-base:        4px;
+@border-radius-large:       6px;
+@border-radius-small:       3px;
+
+//** Global color for active items (e.g., navs or dropdowns).
+@component-active-color:    #fff;
+//** Global background color for active items (e.g., navs or dropdowns).
+@component-active-bg:       @brand-primary;
+
+//** Width of the `border` for generating carets that indicator dropdowns.
+@caret-width-base:          4px;
+//** Carets increase slightly in size for larger components.
+@caret-width-large:         5px;


-// Components
-// -------------------------
-// Based on 14px font-size and 1.428 line-height (~20px to start)
+//== Tables
+//
+//## Customizes the `.table` component with basic values, each used across all table variations.

-@padding-base-vertical:          6px;
-@padding-base-horizontal:        12px;
+//** Padding for `<th>`s and `<td>`s.
+@table-cell-padding:            8px;
+//** Padding for cells in `.table-condensed`.
+@table-condensed-cell-padding:  5px;

-@padding-large-vertical:         10px;
-@padding-large-horizontal:       16px;
+//** Default background color used for all tables.
+@table-bg:                      transparent;
+//** Background color used for `.table-striped`.
+@table-bg-accent:               #f9f9f9;
+//** Background color used for `.table-hover`.
+@table-bg-hover:                #f5f5f5;
+@table-bg-active:               @table-bg-hover;

-@padding-small-vertical:         5px;
-@padding-small-horizontal:       10px;
-
-@padding-xs-vertical:            1px;
-@padding-xs-horizontal:          5px;
-
-@line-height-large:              1.33;
-@line-height-small:              1.5;
-
-@border-radius-base:             4px;
-@border-radius-large:            6px;
-@border-radius-small:            3px;
-
-@component-active-color:         #fff;
-@component-active-bg:            @brand-primary;
-
-@caret-width-base:               4px;
-@caret-width-large:              5px;
-
-// Tables
-// -------------------------
-
-@table-cell-padding:                 8px;
-@table-condensed-cell-padding:       5px;
-
-@table-bg:                           transparent; // overall background-color
-@table-bg-accent:                    #f9f9f9; // for striping
-@table-bg-hover:                     #f5f5f5;
-@table-bg-active:                    @table-bg-hover;
-
-@table-border-color:                 #ddd; // table and cell border
+//** Border color for table and cell borders.
+@table-border-color:            #ddd;


-// Buttons
-// -------------------------
+//== Buttons
+//
+//## For each of Bootstrap's buttons, define text, background and border color.

@btn-font-weight:                normal;

@ -131,6 +149,10 @@
@btn-success-bg:                 @brand-success;
@btn-success-border:             darken(@btn-success-bg, 5%);

+@btn-info-color:                 #fff;
+@btn-info-bg:                    @brand-info;
+@btn-info-border:                darken(@btn-info-bg, 5%);
+
@btn-warning-color:              #fff;
@btn-warning-bg:                 @brand-warning;
@btn-warning-border:             darken(@btn-warning-bg, 5%);
@ -139,68 +161,87 @@
@btn-danger-bg:                  @brand-danger;
@btn-danger-border:              darken(@btn-danger-bg, 5%);

-@btn-info-color:                 #fff;
-@btn-info-bg:                    @brand-info;
-@btn-info-border:                darken(@btn-info-bg, 5%);
-
@btn-link-disabled-color:        @gray-light;


-// Forms
-// -------------------------
+//== Forms
+//
+//##

+//** `<input>` background color
@input-bg:                       #fff;
+//** `<input disabled>` background color
@input-bg-disabled:              @gray-lighter;

+//** Text color for `<input>`s
@input-color:                    @gray;
+//** `<input>` border color
@input-border:                   #ccc;
+//** `<input>` border radius
@input-border-radius:            @border-radius-base;
+//** Border color for inputs on focus
@input-border-focus:             #66afe9;

+//** Placeholder text color
@input-color-placeholder:        @gray-light;

+//** Default `.form-control` height
@input-height-base:              (@line-height-computed + (@padding-base-vertical * 2) + 2);
+//** Large `.form-control` height
@input-height-large:             (ceil(@font-size-large * @line-height-large) + (@padding-large-vertical * 2) + 2);
+//** Small `.form-control` height
@input-height-small:             (floor(@font-size-small * @line-height-small) + (@padding-small-vertical * 2) + 2);

@legend-color:                   @gray-dark;
@legend-border-color:            #e5e5e5;

+//** Background color for textual input addons
@input-group-addon-bg:           @gray-lighter;
+//** Border color for textual input addons
@input-group-addon-border-color: @input-border;


-// Dropdowns
-// -------------------------
+//== Dropdowns
+//
+//## Dropdown menu container and contents.

+//** Background for the dropdown menu.
@dropdown-bg:                    #fff;
+//** Dropdown menu `border-color`.
@dropdown-border:                rgba(0,0,0,.15);
+//** Dropdown menu `border-color` **for IE8**.
@dropdown-fallback-border:       #ccc;
+//** Divider color for between dropdown items.
@dropdown-divider-bg:            #e5e5e5;

+//** Dropdown link text color.
@dropdown-link-color:            @gray-dark;
+//** Hover color for dropdown links.
@dropdown-link-hover-color:      darken(@gray-dark, 5%);
+//** Hover background for dropdown links.
@dropdown-link-hover-bg:         #f5f5f5;

+//** Active dropdown menu item text color.
@dropdown-link-active-color:     @component-active-color;
+//** Active dropdown menu item background color.
@dropdown-link-active-bg:        @component-active-bg;

+//** Disabled dropdown menu item background color.
@dropdown-link-disabled-color:   @gray-light;

+//** Text color for headers within dropdown menus.
@dropdown-header-color:          @gray-light;

 // Note: Deprecated @dropdown-caret-color as of v3.1
@dropdown-caret-color:           #000;


-// COMPONENT VARIABLES
-// --------------------------------------------------
-
-
-// Z-index master list
-// -------------------------
-// Used for a bird's eye view of components dependent on the z-axis
-// Try to avoid customizing these :)
+//-- Z-index master list
+//
+// Warning: Avoid customizing these values. They're used for a bird's eye view
+// of components dependent on the z-axis and are designed to all work together.
+//
+// Note: These variables are not generated into the Customizer.

@zindex-navbar:            1000;
@zindex-dropdown:          1000;
@ -210,8 +251,10 @@
@zindex-modal-background:  1040;
@zindex-modal:             1050;

-// Media queries breakpoints
-// --------------------------------------------------
+
+//== Media queries breakpoints
+//
+//## Define the breakpoints at which your layout will change, adapting to different screen sizes.

 // Extra small screen / phone
 // Note: Deprecated @screen-xs and @screen-phone as of v3.0.1
@ -243,24 +286,24 @@
@screen-md-max:              (@screen-lg-min - 1);


-// Grid system
-// --------------------------------------------------
+//== Grid system
+//
+//## Define your custom responsive grid.

-// Number of columns in the grid system
+//** Number of columns in the grid.
@grid-columns:              12;
-// Padding, to be divided by two and applied to the left and right of all columns
+//** Padding between columns. Gets divided in half for the left and right.
@grid-gutter-width:         30px;
-
 // Navbar collapse
-
-// Point at which the navbar becomes uncollapsed
+//** Point at which the navbar becomes uncollapsed.
@grid-float-breakpoint:     @screen-sm-min;
-// Point at which the navbar begins collapsing
+//** Point at which the navbar begins collapsing.
@grid-float-breakpoint-max: (@grid-float-breakpoint - 1);


-// Navbar
-// -------------------------
+//== Navbar
+//
+//##

 // Basics of a navbar
@navbar-height:                    50px;
@ -294,7 +337,6 @@


 // Inverted navbar
-//
 // Reset inverted navbar basics
@navbar-inverse-color:                      @gray-light;
@navbar-inverse-bg:                         #222;
@ -320,9 +362,11 @@
@navbar-inverse-toggle-border-color:        #333;


-// Navs
-// -------------------------
+//== Navs
+//
+//##

+//=== Shared nav styles
@nav-link-padding:                          10px 15px;
@nav-link-hover-bg:                         @gray-lighter;

@ -331,7 +375,7 @@

@nav-open-link-hover-color:                 #fff;

-// Tabs
+//== Tabs
@nav-tabs-border-color:                     #ddd;

@nav-tabs-link-hover-border-color:          @gray-lighter;
@ -343,14 +387,15 @@
@nav-tabs-justified-link-border-color:            #ddd;
@nav-tabs-justified-active-link-border-color:     @body-bg;

-// Pills
+//== Pills
@nav-pills-border-radius:                   @border-radius-base;
@nav-pills-active-link-hover-bg:            @component-active-bg;
@nav-pills-active-link-hover-color:         @component-active-color;


-// Pagination
-// -------------------------
+//== Pagination
+//
+//##

@pagination-color:                     @link-color;
@pagination-bg:                        #fff;
@ -369,8 +414,9 @@
@pagination-disabled-border:           #ddd;


-// Pager
-// -------------------------
+//== Pager
+//
+//##

@pager-bg:                             @pagination-bg;
@pager-border:                         @pagination-border;
@ -384,8 +430,9 @@
@pager-disabled-color:                 @pagination-disabled-color;


-// Jumbotron
-// -------------------------
+//== Jumbotron
+//
+//##

@jumbotron-padding:              30px;
@jumbotron-color:                inherit;
@ -394,8 +441,9 @@
@jumbotron-font-size:            ceil((@font-size-base * 1.5));


-// Form states and alerts
-// -------------------------
+//== Form states and alerts
+//
+//## Define colors for form feedback states and, by default, alerts.

@state-success-text:             #3c763d;
@state-success-bg:               #dff0d8;
@ -414,70 +462,112 @@
@state-danger-border:            darken(spin(@state-danger-bg, -10), 5%);


-// Tooltips
-// -------------------------
+//== Tooltips
+//
+//##
+
+//** Tooltip max width
@tooltip-max-width:           200px;
+//** Tooltip text color
@tooltip-color:               #fff;
+//** Tooltip background color
@tooltip-bg:                  #000;
@tooltip-opacity:             .9;

+//** Tooltip arrow width
@tooltip-arrow-width:         5px;
+//** Tooltip arrow color
@tooltip-arrow-color:         @tooltip-bg;


-// Popovers
-// -------------------------
+//== Popovers
+//
+//##
+
+//** Popover body background color
@popover-bg:                          #fff;
+//** Popover maximum width
@popover-max-width:                   276px;
+//** Popover border color
@popover-border-color:                rgba(0,0,0,.2);
+//** Popover fallback border color
@popover-fallback-border-color:       #ccc;

+//** Popover title background color
@popover-title-bg:                    darken(@popover-bg, 3%);

+//** Popover arrow width
@popover-arrow-width:                 10px;
+//** Popover arrow color
@popover-arrow-color:                 #fff;

+//** Popover outer arrow width
@popover-arrow-outer-width:           (@popover-arrow-width + 1);
+//** Popover outer arrow color
@popover-arrow-outer-color:           rgba(0,0,0,.25);
+//** Popover outer arrow fallback color
@popover-arrow-outer-fallback-color:  #999;


-// Labels
-// -------------------------
+//== Labels
+//
+//##

+//** Default label background color
@label-default-bg:            @gray-light;
+//** Primary label background color
@label-primary-bg:            @brand-primary;
+//** Success label background color
@label-success-bg:            @brand-success;
+//** Info label background color
@label-info-bg:               @brand-info;
+//** Warning label background color
@label-warning-bg:            @brand-warning;
+//** Danger label background color
@label-danger-bg:             @brand-danger;

+//** Default label text color
@label-color:                 #fff;
+//** Default text color of a linked label
@label-link-hover-color:      #fff;


-// Modals
-// -------------------------
+//== Modals
+//
+//##
+
+//** Padding applied to the modal body
@modal-inner-padding:         20px;

+//** Padding applied to the modal title
@modal-title-padding:         15px;
+//** Modal title line-height
@modal-title-line-height:     @line-height-base;

+//** Background color of modal content area
@modal-content-bg:                             #fff;
+//** Modal content border color
@modal-content-border-color:                   rgba(0,0,0,.2);
+//** Modal content border color <strong>for IE8</strong>
@modal-content-fallback-border-color:          #999;

+//** Modal backdrop background color
@modal-backdrop-bg:           #000;
+//** Modal backdrop opacity
@modal-backdrop-opacity:      .5;
+//** Modal header border color
@modal-header-border-color:   #e5e5e5;
+//** Modal footer border color
@modal-footer-border-color:   @modal-header-border-color;

@modal-lg:                    900px;
@modal-sm:                    300px;


-// Alerts
-// -------------------------
+//== Alerts
+//
+//## Define alert colors, border radius, and padding.
+
@alert-padding:               15px;
@alert-border-radius:         @border-radius-base;
@alert-link-font-weight:      bold;
@ -499,39 +589,61 @@
@alert-danger-border:         @state-danger-border;


-// Progress bars
-// -------------------------
+//== Progress bars
+//
+//##
+
+//** Background color of the whole progress component
@progress-bg:                 #f5f5f5;
+//** Progress bar text color
@progress-bar-color:          #fff;

+//** Default progress bar color
@progress-bar-bg:             @brand-primary;
+//** Success progress bar color
@progress-bar-success-bg:     @brand-success;
+//** Warning progress bar color
@progress-bar-warning-bg:     @brand-warning;
+//** Danger progress bar color
@progress-bar-danger-bg:      @brand-danger;
+//** Info progress bar color
@progress-bar-info-bg:        @brand-info;


-// List group
-// -------------------------
+//== List group
+//
+//##
+
+//** Background color on `.list-group-item`
@list-group-bg:                 #fff;
+//** `.list-group-item` border color
@list-group-border:             #ddd;
+//** List group border radius
@list-group-border-radius:      @border-radius-base;

+//** Background color of single list elements on hover
@list-group-hover-bg:           #f5f5f5;
+//** Text color of active list elements
@list-group-active-color:       @component-active-color;
+//** Background color of active list elements
@list-group-active-bg:          @component-active-bg;
+//** Border color of active list elements
@list-group-active-border:      @list-group-active-bg;
@list-group-active-text-color:  lighten(@list-group-active-bg, 40%);

@list-group-link-color:         #555;
@list-group-link-heading-color: #333;

-// Panels
-// -------------------------
+
+//== Panels
+//
+//##
+
@panel-bg:                    #fff;
@panel-body-padding:          15px;
@panel-border-radius:         @border-radius-base;

+//** Border color for elements within panels
@panel-inner-border:          #ddd;
@panel-footer-bg:             #f5f5f5;

@ -547,6 +659,10 @@
@panel-success-border:        @state-success-border;
@panel-success-heading-bg:    @state-success-bg;

+@panel-info-text:             @state-info-text;
+@panel-info-border:           @state-info-border;
+@panel-info-heading-bg:       @state-info-bg;
+
@panel-warning-text:          @state-warning-text;
@panel-warning-border:        @state-warning-border;
@panel-warning-heading-bg:    @state-warning-bg;
@ -555,35 +671,46 @@
@panel-danger-border:         @state-danger-border;
@panel-danger-heading-bg:     @state-danger-bg;

-@panel-info-text:             @state-info-text;
-@panel-info-border:           @state-info-border;
-@panel-info-heading-bg:       @state-info-bg;

+//== Thumbnails
+//
+//##

-// Thumbnails
-// -------------------------
+//** Padding around the thumbnail image
@thumbnail-padding:           4px;
+//** Thumbnail background color
@thumbnail-bg:                @body-bg;
+//** Thumbnail border color
@thumbnail-border:            #ddd;
+//** Thumbnail border radius
@thumbnail-border-radius:     @border-radius-base;

+//** Custom text color for thumbnail captions
@thumbnail-caption-color:     @text-color;
+//** Padding around the thumbnail caption
@thumbnail-caption-padding:   9px;


-// Wells
-// -------------------------
+//== Wells
+//
+//##
+
@well-bg:                     #f5f5f5;
@well-border:                 darken(@well-bg, 7%);


-// Badges
-// -------------------------
+//== Badges
+//
+//##
+
@badge-color:                 #fff;
+//** Linked badge text color on hover
@badge-link-hover-color:      #fff;
@badge-bg:                    @gray-light;

+//** Badge text color in active nav link
@badge-active-color:          @link-color;
+//** Badge background color in active nav link
@badge-active-bg:             #fff;

@badge-font-weight:           bold;
@ -591,18 +718,25 @@
@badge-border-radius:         10px;


-// Breadcrumbs
-// -------------------------
+//== Breadcrumbs
+//
+//##
+
@breadcrumb-padding-vertical:   8px;
@breadcrumb-padding-horizontal: 15px;
+//** Breadcrumb background color
@breadcrumb-bg:                 #f5f5f5;
+//** Breadcrumb text color
@breadcrumb-color:              #ccc;
+//** Text color of current page in the breadcrumb
@breadcrumb-active-color:       @gray-light;
+//** Textual separator for between breadcrumb elements
@breadcrumb-separator:          "/";


-// Carousel
-// ------------------------
+//== Carousel
+//
+//##

@carousel-text-shadow:                        0 1px 2px rgba(0,0,0,.6);

@ -617,15 +751,19 @@
@carousel-caption-color:                      #fff;


-// Close
-// ------------------------
+//== Close
+//
+//##
+
@close-font-weight:           bold;
@close-color:                 #000;
@close-text-shadow:           0 1px 0 #fff;


-// Code
-// ------------------------
+//== Code
+//
+//##
+
@code-color:                  #c7254e;
@code-bg:                     #f9f2f4;

@ -637,36 +775,51 @@
@pre-border-color:            #ccc;
@pre-scrollable-max-height:   340px;

-// Type
-// ------------------------
+
+//== Type
+//
+//##
+
+//** Text muted color
@text-muted:                  @gray-light;
+//** Abbreviations and acronyms border color
@abbr-border-color:           @gray-light;
+//** Headings small color
@headings-small-color:        @gray-light;
+//** Blockquote small color
@blockquote-small-color:      @gray-light;
+//** Blockquote border color
@blockquote-border-color:     @gray-lighter;
+//** Page header border color
@page-header-border-color:    @gray-lighter;

-// Miscellaneous
-// -------------------------

-// Hr border color
+//== Miscellaneous
+//
+//##
+
+//** Horizontal line color.
@hr-border:                   @gray-lighter;

-// Horizontal forms & lists
+//** Horizontal offset for forms and lists.
@component-offset-horizontal: 180px;


-// Container sizes
-// --------------------------------------------------
+//== Container sizes
+//
+//## Define the maximum width of `.container` for different screen sizes.

 // Small screen / tablet
@container-tablet:             ((720px + @grid-gutter-width));
+//** For `@screen-sm-min` and up.
@container-sm:                 @container-tablet;

 // Medium screen / desktop
@container-desktop:            ((940px + @grid-gutter-width));
+//** For `@screen-md-min` and up.
@container-md:                 @container-desktop;

 // Large screen / wide desktop
@container-large-desktop:      ((1140px + @grid-gutter-width));
+//** For `@screen-lg-min` and up.
@container-lg:                 @container-large-desktop;
--- a/package.json
+++ b/package.json
@ -33,8 +33,9 @@
    "grunt-contrib-connect": "~0.6.0",
    "grunt-contrib-copy": "~0.5.0",
    "grunt-contrib-csslint": "~0.2.0",
+    "grunt-contrib-jade": "~0.9.1",
    "grunt-contrib-jshint": "~0.8.0",
-    "grunt-contrib-less": "~0.8.3",
+    "grunt-contrib-less": "~0.9.0",
    "grunt-contrib-qunit": "~0.3.0",
    "grunt-contrib-uglify": "~0.2.7",
    "grunt-contrib-watch": "~0.5.3",
@ -44,7 +45,8 @@
    "grunt-jscs-checker": "~0.3.0",
    "grunt-saucelabs": "~4.1.2",
    "grunt-sed": "~0.1.1",
-    "load-grunt-tasks": "~0.2.1"
+    "load-grunt-tasks": "~0.2.1",
+    "markdown": "~0.5.0"
  },
  "jspm": {
    "main": "js/bootstrap",