Merge branch 'master' into docs_derp

Conflicts:
	_config.yml

.csscomb.json

@@ -33,6 +33,7 @@
       "-webkit-box-sizing",
       "-moz-box-sizing",
       "box-sizing",
+      "-webkit-appearance",
       "padding",
       "padding-top",
       "padding-right",
@@ -46,8 +47,10 @@
       "overflow",
       "overflow-x",
       "overflow-y",
+      "-webkit-overflow-scrolling",
       "-ms-overflow-x",
       "-ms-overflow-y",
+      "-ms-overflow-style",
       "clip",
       "clear",
       "font",
@@ -124,18 +127,20 @@
       "-webkit-user-select",
       "-moz-user-select",
       "-ms-user-select",
+      "-o-user-select",
       "user-select",
       "nav-index",
       "nav-up",
       "nav-right",
       "nav-down",
       "nav-left",
-      "filter:progid:DXImageTransform.Microsoft.AlphaImageLoader",
       "background",
       "background-color",
+      "background-image",
       "-ms-filter:\\'progid:DXImageTransform.Microsoft.gradient",
       "filter:progid:DXImageTransform.Microsoft.gradient",
-      "background-image",
+      "filter:progid:DXImageTransform.Microsoft.AlphaImageLoader",
+      "filter",
       "background-repeat",
       "background-attachment",
       "background-position",

.editorconfig

@@ -9,3 +9,7 @@ end_of_line = lf
 charset = utf-8
 trim_trailing_whitespace = true
 insert_final_newline = true
+
+[*.py]
+indent_style = space
+indent_size = 4

CONTRIBUTING.md

@@ -106,7 +106,7 @@ included in the project:
    # Clone your fork of the repo into the current directory
    git clone https://github.com/<your-username>/bootstrap.git
    # Navigate to the newly cloned directory
-   cd html5-boilerplate
+   cd bootstrap
    # Assign the original repo to a remote called "upstream"
    git remote add upstream https://github.com/twbs/bootstrap.git
    ```

Gruntfile.js

@@ -18,8 +18,8 @@ module.exports = function (grunt) {
     banner: '/*!\n' +
               ' * Bootstrap v<%= pkg.version %> (<%= pkg.homepage %>)\n' +
               ' * Copyright <%= grunt.template.today("yyyy") %> <%= pkg.author %>\n' +
-              ' * Licensed under MIT (<%= _.pluck(pkg.licenses, "url").join(", ") %>)\n' +
-              ' */\n\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',
 
     // Task configuration.
@@ -64,12 +64,16 @@ module.exports = function (grunt) {
       options: {
         csslintrc: '.csslintrc'
       },
-      src: ['dist/css/bootstrap.css', 'dist/css/bootstrap-theme.css']
+      src: [
+        'dist/css/bootstrap.css',
+        'dist/css/bootstrap-theme.css',
+        'docs-assets/css/docs.css'
+      ]
     },
 
     concat: {
       options: {
-        banner: '<%= banner %><%= jqueryCheck %>',
+        banner: '<%= banner %>\n<%= jqueryCheck %>',
         stripBanners: false
       },
       bootstrap: {
@@ -92,15 +96,24 @@ module.exports = function (grunt) {
     },
 
     uglify: {
-      options: {
-        banner: '<%= banner %>',
-        report: 'min'
-      },
       bootstrap: {
+        options: {
+          banner: '<%= banner %>\n',
+          report: 'min'
+        },
         src: ['<%= concat.bootstrap.dest %>'],
         dest: 'dist/js/<%= pkg.name %>.min.js'
       },
       customize: {
+        options: {
+          banner: '/*!\n' +
+          ' * Bootstrap Docs (<%= pkg.homepage %>)\n' +
+          ' * Copyright <%= 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',
+          report: 'min'
+        },
         src: [
           'docs-assets/js/less.js',
           'docs-assets/js/jszip.js',
@@ -316,9 +329,8 @@ module.exports = function (grunt) {
 
     // Use any line that starts with ".glyphicon-" and capture the class name
     var iconClassName = /^\.(glyphicon-[^\s]+)/
-    var glyphiconsData = '# Generated on ' + (new Date()) + '\n' +
-                         '# **Don\'t edit this directly!**\n' +
-                         '# Look at the \'build-glyphicons-data\' task in Gruntfile.js\n\n';
+    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)
 

README.md

@@ -1,4 +1,4 @@
-# [Bootstrap](http://getbootstrap.com) [![Build Status](https://secure.travis-ci.org/twbs/bootstrap.png)](http://travis-ci.org/twbs/bootstrap) [![devDependency Status](https://david-dm.org/twbs/bootstrap/dev-status.png)](https://david-dm.org/twbs/bootstrap#info=devDependencies)
+# [Bootstrap](http://getbootstrap.com) [![Build Status](https://secure.travis-ci.org/twbs/bootstrap.png)](http://travis-ci.org/twbs/bootstrap) [![devDependency Status](https://david-dm.org/twbs/bootstrap/dev-status.png?theme=shields.io)](https://david-dm.org/twbs/bootstrap#info=devDependencies)
 [![Selenium Test Status](https://saucelabs.com/browser-matrix/bootstrap.svg)](https://saucelabs.com/u/bootstrap)
 
 Bootstrap is a sleek, intuitive, and powerful front-end framework for faster and easier web development, created by [Mark Otto](http://twitter.com/mdo) and [Jacob Thornton](http://twitter.com/fat), and maintained by the [core team](https://github.com/twbs?tab=members) with the massive support and involvement of the community.
@@ -21,7 +21,7 @@ To get started, check out <http://getbootstrap.com>!
 
 Three quick start options are available:
 
-- [Download the latest release](https://github.com/twbs/bootstrap/archive/v3.1.0.zip).
+- [Download the latest release](https://github.com/twbs/bootstrap/archive/v3.0.3.zip).
 - Clone the repo: `git clone https://github.com/twbs/bootstrap.git`.
 - Install with [Bower](http://bower.io): `bower install bootstrap`.
 
@@ -97,10 +97,10 @@ When completed, you'll be able to run the various Grunt commands provided from t
 ### Available Grunt commands
 
 #### Build - `grunt`
-Run `grunt` to run tests locally and compile the CSS and JavaScript into `/dist`. **Uses [recess](http://twitter.github.io/recess/) and [UglifyJS](http://lisperator.net/uglifyjs/).**
+Run `grunt` to run tests locally and compile the CSS and JavaScript into `/dist`. **Uses [Less](http://lesscss.org/) and [UglifyJS](http://lisperator.net/uglifyjs/).**
 
 #### Only compile CSS and JavaScript - `grunt dist`
-`grunt dist` creates the `/dist` directory with compiled files. **Uses [recess](http://twitter.github.io/recess/) and [UglifyJS](http://lisperator.net/uglifyjs/).**
+`grunt dist` creates the `/dist` directory with compiled files. **Uses [Less](http://lesscss.org/) and [UglifyJS](http://lisperator.net/uglifyjs/).**
 
 #### Tests - `grunt test`
 Runs [JSHint](http://jshint.com) and [QUnit](http://qunitjs.com/) tests headlessly in [PhantomJS](http://phantomjs.org/) (used for CI).

_config.yml

@@ -7,20 +7,36 @@ permalink:        pretty
 
 # Server
 destination:      ./_gh_pages
-exclude:          [".editorconfig", ".gitignore", "bower.json", "composer.json", "CONTRIBUTING.md", "CNAME", "LICENSE", "Gruntfile.js", "package.json", "node_modules", "README.md", "less"]
 port:             9001
+exclude:
+- ".editorconfig"
+- ".gitignore"
+- "bower.json"
+- "CNAME"
+- "composer.json"
+- "CONTRIBUTING.md"
+- "DOCS-LICENSE"
+- "Gruntfile.js"
+- "less"
+- "LICENSE"
+- "node_modules"
+- "package.json"
+- "README.md"
+- "sauce_browsers.yml"
+- "test-infra"
 
 # Custom vars
-current_version:  3.1.0
+current_version:  3.0.3
 repo:             https://github.com/twbs/bootstrap
 
-download_source:  https://github.com/twbs/bootstrap/archive/v3.1.0.zip
-download_dist:    https://github.com/twbs/bootstrap/releases/download/v3.1.0/bootstrap-3.1.0-dist.zip
-download_sass:    https://github.com/twbs/bootstrap-sass/archive/v3.1.0.0.tar.gz
+download_source:  https://github.com/twbs/bootstrap/archive/v3.0.3.zip
+download_dist:    https://github.com/twbs/bootstrap/releases/download/v3.0.3/bootstrap-3.0.3-dist.zip
+download_sass:    https://github.com/twbs/bootstrap-sass/archive/v3.0.3.0.tar.gz
 
 blog:             http://blog.getbootstrap.com
 expo:             http://expo.getbootstrap.com
+sass_repo:        https://github.com/twbs/bootstrap-sass
 
-cdn_css:          //netdna.bootstrapcdn.com/bootstrap/3.1.0/css/bootstrap.min.css
-cdn_theme_css:    //netdna.bootstrapcdn.com/bootstrap/3.1.0/css/bootstrap-theme.min.css
-cdn_js:           //netdna.bootstrapcdn.com/bootstrap/3.1.0/js/bootstrap.min.js
+cdn_css:          //netdna.bootstrapcdn.com/bootstrap/3.0.3/css/bootstrap.min.css
+cdn_theme_css:    //netdna.bootstrapcdn.com/bootstrap/3.0.3/css/bootstrap-theme.min.css
+cdn_js:           //netdna.bootstrapcdn.com/bootstrap/3.0.3/js/bootstrap.min.js

_data/glyphicons.yml

@@ -1,6 +1,5 @@
-# Generated on Wed Dec 18 2013 20:14:37 GMT-0800 (PST)
-# **Don't edit this directly!**
-# Look at the 'build-glyphicons-data' task in Gruntfile.js
+# This file is generated via Grunt task. **Do not edit directly.** 
+# See the 'build-glyphicons-data' task in Gruntfile.js.
 
 - glyphicon-asterisk
 - glyphicon-plus

_includes/header.html

@@ -24,12 +24,12 @@
 <!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
 <!--[if lt IE 9]>
   <script src="https://oss.maxcdn.com/libs/html5shiv/3.7.0/html5shiv.js"></script>
-  <script src="https://oss.maxcdn.com/libs/respond.js/1.3.0/respond.min.js"></script>
+  <script src="https://oss.maxcdn.com/libs/respond.js/1.4.2/respond.min.js"></script>
 <![endif]-->
 
 <!-- Favicons -->
 <link rel="apple-touch-icon-precomposed" sizes="144x144" href="{{ page.base_url }}docs-assets/ico/apple-touch-icon-144-precomposed.png">
-                               <link rel="shortcut icon" href="{{ page.base_url }}docs-assets/ico/favicon.png">
+                               <link rel="shortcut icon" href="{{ page.base_url }}docs-assets/ico/favicon.ico">
 
 <script>
   var _gaq = _gaq || [];

_includes/nav-about.html

@@ -2,7 +2,7 @@
   <a href="#history">History</a>
 </li>
 <li>
-  <a href="#team">Core team</a>
+  <a href="#team">Team</a>
 </li>
 <li>
   <a href="#community">Community</a>

_includes/nav-css.html

@@ -110,11 +110,21 @@
   </ul>
 </li>
 <li>
-  <a href="#less">Using LESS</a>
+  <a href="#less">Using Less</a>
   <ul class="nav">
     <li><a href="#less-bootstrap">Compiling Bootstrap</a></li>
     <li><a href="#less-variables">Variables</a></li>
     <li><a href="#less-mixins-vendor">Vendor mixins</a></li>
     <li><a href="#less-mixins-utility">Utility mixins</a></li>
   </ul>
 </li>
+<li>
+  <a href="#sass">Using Sass</a>
+  <ul class="nav">
+    <li><a href="#sass-contents">What's included</a></li>
+    <li><a href="#sass-installation-rails">Rails install</a></li>
+    <li><a href="#sass-installation-compass">Compass install</a></li>
+    <li><a href="#sass-installation-sass-only">Sass install</a></li>
+    <li><a href="#sass-usage">Usage</a></li>
+  </ul>
+</li>

_layouts/default.html

@@ -20,6 +20,7 @@ <h1>{{ page.title }}</h1>
     </div>
 
     <div class="container bs-docs-container">
+
       <div class="row">
         <div class="col-md-9" role="main">
           {{ content }}

about.html

@@ -43,9 +43,11 @@ <h1 id="history">History</h1>
 ================================================== -->
 <div class="bs-docs-section">
   <div class="page-header">
-    <h1 id="team">Core team</h1>
+    <h1 id="team">Team</h1>
   </div>
   <p class="lead">Bootstrap is maintained by the founding team and a small group of invaluable core contributors, with the massive support and involvement of our community.</p>
+
+  <h2 id="team-core">Core team</h2>
   <div class="list-group bs-team">
     <div class="list-group-item">
       <iframe class="github-btn" src="http://ghbtns.com/github-btn.html?user=mdo&amp;type=follow"></iframe>
@@ -77,6 +79,39 @@ <h1 id="team">Core team</h1>
     </div>
   </div>
   <p>Get involved with Bootstrap development by <a href="https://github.com/twbs/bootstrap/issues/new">opening an issue</a> or submitting a pull request. Read our <a href="https://github.com/twbs/bootstrap/blob/master/CONTRIBUTING.md">contributing guidelines</a> for information on how we develop.</p>
+
+  <h2 id="team-sass">Sass team</h2>
+  <div class="list-group bs-team">
+    <div class="list-group-item">
+      <iframe class="github-btn" src="http://ghbtns.com/github-btn.html?user=thomas-mcdonald&amp;type=follow"></iframe>
+      <a class="team-member" href="https://github.com/thomas-mcdonald">
+        <img src="http://www.gravatar.com/avatar/24cd55ab1a62ffb113ab8c02f64c9301" alt="@thomas-mcdonald">
+        <strong>Thomas McDonald</strong> <small>@thomas-mcdonald</small>
+      </a>
+    </div>
+    <div class="list-group-item">
+      <iframe class="github-btn" src="http://ghbtns.com/github-btn.html?user=glebm&amp;type=follow"></iframe>
+      <a class="team-member" href="https://github.com/glebm">
+        <img src="http://www.gravatar.com/avatar/729f685b8e8d7e9feed18c177c82e59b" alt="@glebm">
+        <strong>Gleb Mazovetskiy</strong> <small>@glebm</small>
+      </a>
+    </div>
+    <div class="list-group-item">
+      <iframe class="github-btn" src="http://ghbtns.com/github-btn.html?user=trisweb&amp;type=follow"></iframe>
+      <a class="team-member" href="https://github.com/trisweb">
+        <img src="http://www.gravatar.com/avatar/eb97c4cc97698ed0b22918225d178761" alt="@trisweb">
+        <strong>Tristan Harward</strong> <small>@trisweb</small>
+      </a>
+    </div>
+    <div class="list-group-item">
+      <iframe class="github-btn" src="http://ghbtns.com/github-btn.html?user=sporkd&amp;type=follow"></iframe>
+      <a class="team-member" href="https://github.com/sporkd">
+        <img src="http://www.gravatar.com/avatar/492d8f2ba0e7807519cf4208e8f6d516" alt="@sporkd">
+        <strong>Peter Gumeson</strong> <small>@sporkd</small>
+      </a>
+    </div>
+  </div>
+  <p>The <a href="{{ site.sass_repo }}">official Sass port of Bootstrap</a> was created and is maintained by this team. It became part of Bootstrap's organization with v3.1.</p>
 </div>
 
 

bower.json

@@ -1,24 +1,24 @@
 {
   "name": "bootstrap",
-  "version": "3.1.0",
+  "version": "3.0.3",
   "main": [
-    "./dist/js/bootstrap.js",
     "./dist/css/bootstrap.css",
+    "./dist/js/bootstrap.js",
     "./dist/fonts/glyphicons-halflings-regular.eot",
     "./dist/fonts/glyphicons-halflings-regular.svg",
     "./dist/fonts/glyphicons-halflings-regular.ttf",
     "./dist/fonts/glyphicons-halflings-regular.woff"
   ],
   "ignore": [
     "**/.*",
+    "*.html",
     "_*",
-    "docs-assets",
-    "examples",
-    "js/tests",
     "CNAME",
-    "CONTRIBUTING.md",
     "composer.json",
-    "*.html"
+    "CONTRIBUTING.md",
+    "docs-assets",
+    "examples",
+    "js/tests"
   ],
   "dependencies": {
     "jquery": ">= 1.9.0"