Merge branch 'master' into boulox-responsive-embed

Conflicts:
	dist/css/bootstrap.css.map
	dist/css/bootstrap.min.css
	docs/assets/js/customize.min.js
	docs/assets/js/docs.min.js
	docs/css.html
	docs/dist/css/bootstrap.css.map
	docs/dist/css/bootstrap.min.css

docs/assets/js/application.js

@@ -3,8 +3,8 @@
 // ++++++++++++++++++++++++++++++++++++++++++
 
 /*!
+ * JavaScript for Bootstrap's docs (http://getbootstrap.com)
  * 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/.
  */
@@ -18,14 +18,13 @@
     //
     // See Getting Started docs for more information
     if (navigator.userAgent.match(/IEMobile\/10\.0/)) {
-      var msViewportStyle = document.createElement('style');
+      var msViewportStyle = document.createElement('style')
       msViewportStyle.appendChild(
         document.createTextNode(
           '@-ms-viewport{width:auto!important}'
         )
-      );
-      document.querySelector('head').
-        appendChild(msViewportStyle);
+      )
+      document.querySelector('head').appendChild(msViewportStyle)
     }
 
 
@@ -35,8 +34,8 @@
     var navHeight = $('.navbar').outerHeight(true) + 10
 
     $body.scrollspy({
-      target: '.bs-sidebar',
-      offset: navHeight
+      target: '.bs-docs-sidebar',
+      // offset: navHeight
     })
 
     $window.on('load', function () {
@@ -49,7 +48,7 @@
 
     // back to top
     setTimeout(function () {
-      var $sideBar = $('.bs-sidebar')
+      var $sideBar = $('.bs-docs-sidebar')
 
       $sideBar.affix({
         offset: {
@@ -61,7 +60,7 @@
             return (this.top = offsetTop - navOuterHeight - sideBarMargin)
           },
           bottom: function () {
-            return (this.bottom = $('.bs-footer').outerHeight(true))
+            return (this.bottom = $('.bs-docs-footer').outerHeight(true))
           }
         }
       })
@@ -86,8 +85,7 @@
     })
 
     // popover demo
-    $('[data-toggle=popover]')
-      .popover()
+    $('[data-toggle=popover]').popover()
 
     // button state demo
     $('#loading-example-btn')

docs/assets/js/customizer.js

@@ -1,35 +1,34 @@
 /*!
+ * Bootstrap Customizer (http://getbootstrap.com/customize/)
  * 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/.
  */
 
-/* jshint multistr:true */
-
 window.onload = function () { // wait for load in a dumb way because B-0
   var cw = '/*!\n' +
-           ' * Bootstrap v3.0.3 (http://getbootstrap.com)\n' +
+           ' * Bootstrap v3.1.1 (http://getbootstrap.com)\n' +
            ' * Copyright 2011-2014 Twitter, Inc.\n' +
            ' * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)\n' +
-           ' */\n\n';
+           ' */\n\n'
 
   function showError(msg, err) {
-    $('<div id="bsCustomizerAlert" class="bs-customizer-alert">\
-        <div class="container">\
-          <a href="#bsCustomizerAlert" data-dismiss="alert" class="close pull-right">&times;</a>\
-          <p class="bs-customizer-alert-text"><span class="glyphicon glyphicon-warning-sign"></span>' + msg + '</p>' +
-          (err.extract ? '<pre class="bs-customizer-alert-extract">' + err.extract.join('\n') + '</pre>' : '') + '\
-        </div>\
-      </div>').appendTo('body').alert()
+    $('<div id="bsCustomizerAlert" class="bs-customizer-alert">' +
+        '<div class="container">' +
+          '<a href="#bsCustomizerAlert" data-dismiss="alert" class="close pull-right">&times;</a>' +
+          '<p class="bs-customizer-alert-text"><span class="glyphicon glyphicon-warning-sign"></span>' + msg + '</p>' +
+          (err.extract ? '<pre class="bs-customizer-alert-extract">' + err.extract.join('\n') + '</pre>' : '') +
+        '</div>' +
+      '</div>').appendTo('body').alert()
     throw err
   }
 
   function showCallout(msg, showUpTop) {
-    var callout = $('<div class="bs-callout bs-callout-danger">\
-       <h4>Attention!</h4>\
-      <p>' + msg + '</p>\
-    </div>')
+    var callout = $('<div class="bs-callout bs-callout-danger">' +
+       '<h4>Attention!</h4>' +
+      '<p>' + msg + '</p>' +
+    '</div>')
 
     if (showUpTop) {
       callout.appendTo('.bs-docs-container')
@@ -39,9 +38,9 @@ window.onload = function () { // wait for load in a dumb way because B-0
   }
 
   function getQueryParam(key) {
-    key = key.replace(/[*+?^$.\[\]{}()|\\\/]/g, '\\$&'); // escape RegEx meta chars
-    var match = location.search.match(new RegExp('[?&]' + key + '=([^&]+)(&|$)'));
-    return match && decodeURIComponent(match[1].replace(/\+/g, ' '));
+    key = key.replace(/[*+?^$.\[\]{}()|\\\/]/g, '\\$&') // escape RegEx meta chars
+    var match = location.search.match(new RegExp('[?&]' + key + '=([^&]+)(&|$)'))
+    return match && decodeURIComponent(match[1].replace(/\+/g, ' '))
   }
 
   function createGist(configJson) {
@@ -73,9 +72,9 @@ window.onload = function () { // wait for load in a dumb way because B-0
     var vars = {}
 
     $('#less-variables-section input')
-        .each(function () {
-          $(this).val() && (vars[$(this).prev().text()] = $(this).val())
-        })
+      .each(function () {
+        $(this).val() && (vars[$(this).prev().text()] = $(this).val())
+      })
 
     var data = {
       vars: vars,
@@ -210,9 +209,9 @@ window.onload = function () { // wait for load in a dumb way because B-0
 
   function compileLESS(lessSource, baseFilename, intoResult) {
     var parser = new less.Parser({
-        paths: ['variables.less', 'mixins.less'],
-        optimization: 0,
-        filename: baseFilename + '.css'
+      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)
@@ -239,9 +238,9 @@ window.onload = function () { // wait for load in a dumb way because B-0
     var vars = {}
 
     $('#less-variables-section input')
-        .each(function () {
-          $(this).val() && (vars[$(this).prev().text()] = $(this).val())
-        })
+      .each(function () {
+        $(this).val() && (vars[$(this).prev().text()] = $(this).val())
+      })
 
     var bsLessSource    = generateLESS('bootstrap.less', lessFileIncludes, vars)
     var themeLessSource = generateLESS('theme.less',     lessFileIncludes, vars)
@@ -332,15 +331,15 @@ window.onload = function () { // wait for load in a dumb way because B-0
 
   // browser support alerts
   if (!window.URL && navigator.userAgent.toLowerCase().indexOf('safari') != -1) {
-    showCallout('Looks like you\'re using safari, which sadly doesn\'t have the best support\
-                 for HTML5 blobs. Because of this your file will be downloaded with the name <code>"untitled"</code>.\
-                 However, if you check your downloads folder, just rename this <code>"untitled"</code> file\
-                 to <code>"bootstrap.zip"</code> and you should be good to go!')
+    showCallout('Looks like you\'re using safari, which sadly doesn\'t have the best support' +
+                 'for HTML5 blobs. Because of this your file will be downloaded with the name <code>"untitled"</code>.' +
+                 'However, if you check your downloads folder, just rename this <code>"untitled"</code> file' +
+                 'to <code>"bootstrap.zip"</code> and you should be good to go!')
   } else if (!window.URL && !window.webkitURL) {
-    $('.bs-docs-section, .bs-sidebar').css('display', 'none')
+    $('.bs-docs-section, .bs-docs-sidebar').css('display', 'none')
 
-    showCallout('Looks like your current browser doesn\'t support the Bootstrap Customizer. Please take a second\
-                 to <a href="https://www.google.com/intl/en/chrome/browser/"> upgrade to a more modern browser</a>.', true)
+    showCallout('Looks like your current browser doesn\'t support the Bootstrap Customizer. Please take a second' +
+                 'to <a href="https://www.google.com/intl/en/chrome/browser/">upgrade to a more modern browser</a>.', true)
   }
 
   parseUrl()

docs/assets/js/vendor/filesaver.js

@@ -1,6 +1,6 @@
 /* FileSaver.js
  * A saveAs() FileSaver implementation.
- * 2013-12-27
+ * 2014-01-24
  *
  * By Eli Grey, http://eligrey.com
  * License: X11/MIT
@@ -14,9 +14,15 @@
 /*! @source http://purl.eligrey.com/github/FileSaver.js/blob/master/FileSaver.js */
 
 var saveAs = saveAs
-  || (typeof navigator !== "undefined" && navigator.msSaveOrOpenBlob && navigator.msSaveOrOpenBlob.bind(navigator))
+  // IE 10+ (native saveAs)
+  || (navigator.msSaveOrOpenBlob && navigator.msSaveOrOpenBlob.bind(navigator))
+  // Everyone else
   || (function(view) {
 	"use strict";
+	// IE <10 is explicitly unsupported
+	if (/MSIE [1-9]\./.test(navigator.userAgent)) {
+		return;
+	}
 	var
 		  doc = view.document
 		  // only get URL when necessary in case BlobBuilder.js hasn't overridden it yet

docs/assets/js/vendor/holder.js

@@ -1,6 +1,6 @@
 /*!
 
-Holder - 2.3 - client side image placeholders
+Holder - 2.3.1 - client side image placeholders
 (c) 2012-2014 Ivan Malopinsky / http://imsky.co
 
 Provided under the MIT License.
@@ -9,7 +9,6 @@ Commercial use requires attribution.
 */
 var Holder = Holder || {};
 (function (app, win) {
-
 var system_config = {
 	use_svg: false,
 	use_canvas: false,
@@ -151,11 +150,15 @@ function text_size(width, height, template) {
 }
 
 var svg_el = (function(){
+	//Prevent IE <9 from initializing SVG renderer
+	if(!window.XMLSerializer) return;
 	var serializer = new XMLSerializer();
 	var svg_ns = "http://www.w3.org/2000/svg"
 	var svg = document.createElementNS(svg_ns, "svg");
-	svg.setAttribute("xmlns", "http://www.w3.org/2000/svg")
-	svg.setAttribute("xmlns:xlink", "http://www.w3.org/1999/xlink");
+	//IE throws an exception if this is set and Chrome requires it to be set
+	if(svg.webkitMatchesSelector){
+		svg.setAttribute("xmlns", "http://www.w3.org/2000/svg")
+	}
 	var bg_el = document.createElementNS(svg_ns, "rect")
 	var text_el = document.createElementNS(svg_ns, "text")
 	var textnode_el = document.createTextNode(null)
@@ -163,7 +166,7 @@ var svg_el = (function(){
 	text_el.appendChild(textnode_el)
 	svg.appendChild(bg_el)
 	svg.appendChild(text_el)
-		
+
 	return function(props){
 		svg.setAttribute("width",props.width);
 		svg.setAttribute("height", props.height);

docs/assets/js/vendor/uglify.min.js

@@ -1,4 +1,4 @@
-/** @license uglifyweb Copyright (c) 2011, The Dojo Foundation All Rights Reserved.
+/*! @license uglifyweb Copyright (c) 2011, The Dojo Foundation All Rights Reserved.
  * The parts that are unique to this repo (not much, just some wrapper code) are
  * released under the new BSD and MIT licenses.
  *