Merge branch 'master' into jonschlinkert/master

dist/js/npm.js

-// This file is generated. You can require() it in a CommonJS environment.
+// This file is autogenerated via the `commonjs` Grunt task. You can require() this file in a CommonJS environment.
 require('../../js/transition.js')
 require('../../js/alert.js')
 require('../../js/button.js')

docs/_data/translations.yml

@@ -3,6 +3,11 @@
   description: Bootstrap 中文文档
   url: http://v3.bootcss.com/
 
+- name: Danish
+  code: da
+  description: Bootstrap på Dansk
+  url: http://getbootstrap.dk/
+
 - name: French
   code: fr
   description: Bootstrap en Français

docs/_includes/components/progress-bars.html

@@ -168,8 +168,9 @@
   <p>Add <code>.active</code> to <code>.progress-bar-striped</code> to animate the stripes right to left. Not available in IE9 and below.</p>
   <div class="bs-example">
     <div class="progress">
-      <div class="progress-bar progress-bar-striped active" role="progressbar" aria-valuenow="45" aria-valuemin="0" aria-valuemax="100" style="width: 45%"><span class="sr-only">45% Complete</span></div>
+      <div class="progress-bar progress-bar-striped" role="progressbar" aria-valuenow="45" aria-valuemin="0" aria-valuemax="100" style="width: 45%"><span class="sr-only">45% Complete</span></div>
     </div>
+    <button type="button" class="btn btn-default bs-docs-activate-animated-progressbar" data-toggle="button" aria-pressed="false" autocomplete="off">Toggle animation</button>
   </div>
 {% highlight html %}
 <div class="progress">

docs/_jade/customizer-variables.jade

@@ -8,8 +8,10 @@ each section in sections
       if subsection.heading
         h3(id=subsection.id)= subsection.heading
       div.row
-        each variable in subsection.variables
-          div.bs-customizer-input
+        each variable, index in subsection.variables
+          if index > 0 && index % 3 === 0
+            div.clearfix
+          div.col-xs-4
             label(for="input-" + variable.name)= variable.name
             input.form-control(
               id="input-" + variable.name

docs/assets/css/src/docs.css

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

docs/assets/js/docs.min.js

@@ -23,4 +23,4 @@ License:  http://opensource.org/licenses/MIT
  * Licensed under the Creative Commons Attribution 3.0 Unported License. For
  * details, see http://creativecommons.org/licenses/by/3.0/.
  */
-!function(a){"use strict";a(function(){var b=a(window),c=a(document.body);c.scrollspy({target:".bs-docs-sidebar"}),b.on("load",function(){c.scrollspy("refresh")}),a(".bs-docs-container [href=#]").click(function(a){a.preventDefault()}),setTimeout(function(){var b=a(".bs-docs-sidebar");b.affix({offset:{top:function(){var c=b.offset().top,d=parseInt(b.children(0).css("margin-top"),10),e=a(".bs-docs-nav").height();return this.top=c-e-d},bottom:function(){return this.bottom=a(".bs-docs-footer").outerHeight(!0)}}})},100),setTimeout(function(){a(".bs-top").affix()},100),function(){var b=a("#bs-theme-stylesheet"),c=a(".bs-docs-theme-toggle"),d=function(){b.attr("href",b.attr("data-href")),c.text("Disable theme preview"),localStorage.setItem("previewTheme",!0)};localStorage.getItem("previewTheme")&&d(),c.click(function(){var a=b.attr("href");a&&0!==a.indexOf("data")?(b.attr("href",""),c.text("Preview theme"),localStorage.removeItem("previewTheme")):d()})}(),a(".tooltip-demo").tooltip({selector:'[data-toggle="tooltip"]',container:"body"}),a(".popover-demo").popover({selector:'[data-toggle="popover"]',container:"body"}),a(".tooltip-test").tooltip(),a(".popover-test").popover(),a(".bs-docs-popover").popover(),a("#loading-example-btn").click(function(){var b=a(this);b.button("loading"),setTimeout(function(){b.button("reset")},3e3)}),ZeroClipboard.config({moviePath:"/assets/flash/ZeroClipboard.swf",hoverClass:"btn-clipboard-hover"}),a(".highlight").each(function(){var b='<div class="zero-clipboard"><span class="btn-clipboard">Copy</span></div>';a(this).before(b)});var d=new ZeroClipboard(a(".btn-clipboard")),e=a("#global-zeroclipboard-html-bridge");d.on("load",function(){e.data("placement","top").attr("title","Copy to clipboard").tooltip()}),d.on("dataRequested",function(b){var c=a(this).parent().nextAll(".highlight").first();b.setText(c.text())}),d.on("complete",function(){e.attr("title","Copied!").tooltip("fixTitle").tooltip("show").attr("title","Copy to clipboard").tooltip("fixTitle")}),d.on("noflash wrongflash",function(){e.attr("title","Flash required").tooltip("fixTitle").tooltip("show")})})}(jQuery);
+!function(a){"use strict";a(function(){var b=a(window),c=a(document.body);c.scrollspy({target:".bs-docs-sidebar"}),b.on("load",function(){c.scrollspy("refresh")}),a(".bs-docs-container [href=#]").click(function(a){a.preventDefault()}),setTimeout(function(){var b=a(".bs-docs-sidebar");b.affix({offset:{top:function(){var c=b.offset().top,d=parseInt(b.children(0).css("margin-top"),10),e=a(".bs-docs-nav").height();return this.top=c-e-d},bottom:function(){return this.bottom=a(".bs-docs-footer").outerHeight(!0)}}})},100),setTimeout(function(){a(".bs-top").affix()},100),function(){var b=a("#bs-theme-stylesheet"),c=a(".bs-docs-theme-toggle"),d=function(){b.attr("href",b.attr("data-href")),c.text("Disable theme preview"),localStorage.setItem("previewTheme",!0)};localStorage.getItem("previewTheme")&&d(),c.click(function(){var a=b.attr("href");a&&0!==a.indexOf("data")?(b.attr("href",""),c.text("Preview theme"),localStorage.removeItem("previewTheme")):d()})}(),a(".tooltip-demo").tooltip({selector:'[data-toggle="tooltip"]',container:"body"}),a(".popover-demo").popover({selector:'[data-toggle="popover"]',container:"body"}),a(".tooltip-test").tooltip(),a(".popover-test").popover(),a(".bs-docs-popover").popover(),a("#loading-example-btn").on("click",function(){var b=a(this);b.button("loading"),setTimeout(function(){b.button("reset")},3e3)}),a(".bs-docs-activate-animated-progressbar").on("click",function(){a(this).siblings(".progress").find(".progress-bar-striped").toggleClass("active")}),ZeroClipboard.config({moviePath:"/assets/flash/ZeroClipboard.swf",hoverClass:"btn-clipboard-hover"}),a(".highlight").each(function(){var b='<div class="zero-clipboard"><span class="btn-clipboard">Copy</span></div>';a(this).before(b)});var d=new ZeroClipboard(a(".btn-clipboard")),e=a("#global-zeroclipboard-html-bridge");d.on("load",function(){e.data("placement","top").attr("title","Copy to clipboard").tooltip()}),d.on("dataRequested",function(b){var c=a(this).parent().nextAll(".highlight").first();b.setText(c.text())}),d.on("complete",function(){e.attr("title","Copied!").tooltip("fixTitle").tooltip("show").attr("title","Copy to clipboard").tooltip("fixTitle")}),d.on("noflash wrongflash",function(){e.attr("title","Flash required").tooltip("fixTitle").tooltip("show")})})}(jQuery);
\ No newline at end of file

docs/assets/js/src/application.js

@@ -101,7 +101,7 @@
     $('.bs-docs-popover').popover()
 
     // Button state demo
-    $('#loading-example-btn').click(function () {
+    $('#loading-example-btn').on('click', function () {
       var btn = $(this)
       btn.button('loading')
       setTimeout(function () {
@@ -109,6 +109,10 @@
       }, 3000)
     })
 
+    // Activate animated progress bar
+    $('.bs-docs-activate-animated-progressbar').on('click', function () {
+      $(this).siblings('.progress').find('.progress-bar-striped').toggleClass('active')
+    })
 
     // Config ZeroClipboard
     ZeroClipboard.config({

docs/dist/js/npm.js

-// This file is generated. You can require() it in a CommonJS environment.
+// This file is autogenerated via the `commonjs` Grunt task. You can require() this file in a CommonJS environment.
 require('../../js/transition.js')
 require('../../js/alert.js')
 require('../../js/button.js')

docs/examples/blog/blog.css

@@ -120,7 +120,6 @@ h6, .h6 {
 }
 
 
-
 /* Pagination */
 .pager {
   margin-bottom: 60px;

docs/examples/carousel/carousel.css

@@ -8,7 +8,6 @@ body {
 }
 
 
-
 /* CUSTOMIZE THE NAVBAR
 -------------------------------------------------- */
 
@@ -62,7 +61,6 @@ body {
 }
 
 
-
 /* MARKETING CONTENT
 -------------------------------------------------- */
 
@@ -95,7 +93,6 @@ body {
 }
 
 
-
 /* RESPONSIVE CSS
 -------------------------------------------------- */
 

docs/examples/carousel/index.html

@@ -121,7 +121,6 @@
     </div><!-- /.carousel -->
 
 
-
     <!-- Marketing messaging and featurettes
     ================================================== -->
     <!-- Wrap the rest of the page in another container to center all the content. -->

docs/examples/offcanvas/index.html

@@ -120,7 +120,6 @@
     </div><!--/.container-->
 
 
-
     <!-- Bootstrap core JavaScript
     ================================================== -->
     <!-- Placed at the end of the document so the pages load faster -->

docs/examples/theme/index.html

@@ -75,7 +75,6 @@
       </div>
 
 
-
       <div class="page-header">
         <h1>Buttons</h1>
       </div>
@@ -117,7 +116,6 @@
       </p>
 
 
-
       <div class="page-header">
         <h1>Tables</h1>
       </div>
@@ -259,14 +257,12 @@
       </div>
 
 
-
       <div class="page-header">
         <h1>Thumbnails</h1>
       </div>
       <img data-src="holder.js/200x200" class="img-thumbnail" alt="A generic square placeholder image with a white border around it, making it resemble a photograph taken with an old instant camera">
 
 
-
       <div class="page-header">
         <h1>Labels</h1>
       </div>
@@ -328,7 +324,6 @@
       </p>
 
 
-
       <div class="page-header">
         <h1>Badges</h1>
       </div>
@@ -357,7 +352,6 @@
       </div>
 
 
-
       <div class="page-header">
         <h1>Navs</h1>
       </div>
@@ -373,7 +367,6 @@
       </ul>
 
 
-
       <div class="page-header">
         <h1>Navbars</h1>
       </div>
@@ -445,7 +438,6 @@
       </nav>
 
 
-
       <div class="page-header">
         <h1>Alerts</h1>
       </div>
@@ -463,7 +455,6 @@
       </div>
 
 
-
       <div class="page-header">
         <h1>Progress bars</h1>
       </div>
@@ -492,7 +483,6 @@
       </div>
 
 
-
       <div class="page-header">
         <h1>List groups</h1>
       </div>
@@ -536,7 +526,6 @@
       </div>
 
 
-
       <div class="page-header">
         <h1>Panels</h1>
       </div>
@@ -598,7 +587,6 @@
       </div>
 
 
-
       <div class="page-header">
         <h1>Wells</h1>
       </div>
@@ -607,7 +595,6 @@
       </div>
 
 
-
       <div class="page-header">
         <h1>Carousel</h1>
       </div>

grunt/bs-commonjs-generator.js

@@ -2,13 +2,13 @@
 var fs = require('fs');
 var path = require('path');
 
-var COMMONJS_BANNER = '// This file is generated. You can require() it in a CommonJS environment.\n';
+var COMMONJS_BANNER = '// This file is autogenerated via the `commonjs` Grunt task. You can require() this file in a CommonJS environment.\n';
 
 module.exports = function generateCommonJSModule(grunt, srcFiles, destFilepath) {
   var destDir = path.dirname(destFilepath);
 
   function srcPathToDestRequire(srcFilepath) {
-    var requirePath = path.relative(destDir, srcFilepath);
+    var requirePath = path.relative(destDir, srcFilepath).replace(/\\/g, '/');
     return 'require(\'' + requirePath + '\')';
   }
 

grunt/bs-lessdoc-parser.js

@@ -35,9 +35,9 @@ Mini-language:
 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}(.*)$/;
+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();

grunt/sauce_browsers.yml

@@ -57,7 +57,7 @@
   {
     browserName: "iphone",
     platform: "OS X 10.9",
-    version: "7.1"
+    version: "8.0"
   },
 
   # iOS Chrome not currently supported by Sauce Labs

js/tests/unit/tooltip.js

@@ -803,16 +803,16 @@ $(function () {
 
     var $tooltip = $('<a href="#" rel="tooltip" title="Another tooltip"/>')
       .appendTo('#qunit-fixture')
-      .bootstrapTooltip({ delay: 15 })
+      .bootstrapTooltip({ delay: 150 })
 
     setTimeout(function () {
-      ok(!$('.tooltip').is('.fade.in'), '10ms: tooltip is not faded in')
-    }, 10)
+      ok(!$('.tooltip').is('.fade.in'), '100ms: tooltip is not faded in')
+    }, 100)
 
     setTimeout(function () {
-      ok($('.tooltip').is('.fade.in'), '20ms: tooltip is faded in')
+      ok($('.tooltip').is('.fade.in'), '200ms: tooltip is faded in')
       start()
-    }, 20)
+    }, 200)
 
     $tooltip.trigger('mouseenter')
   })
@@ -822,17 +822,17 @@ $(function () {
 
     var $tooltip = $('<a href="#" rel="tooltip" title="Another tooltip"/>')
       .appendTo('#qunit-fixture')
-      .bootstrapTooltip({ delay: 15 })
+      .bootstrapTooltip({ delay: 150 })
 
     setTimeout(function () {
-      ok(!$('.tooltip').is('.fade.in'), '10ms: tooltip not faded in')
+      ok(!$('.tooltip').is('.fade.in'), '100ms: tooltip not faded in')
       $tooltip.trigger('mouseout')
-    }, 10)
+    }, 100)
 
     setTimeout(function () {
-      ok(!$('.tooltip').is('.fade.in'), '20ms: tooltip not faded in')
+      ok(!$('.tooltip').is('.fade.in'), '200ms: tooltip not faded in')
       start()
-    }, 20)
+    }, 200)
 
     $tooltip.trigger('mouseenter')
   })
@@ -842,21 +842,21 @@ $(function () {
 
     var $tooltip = $('<a href="#" rel="tooltip" title="Another tooltip"/>')
       .appendTo('#qunit-fixture')
-      .bootstrapTooltip({ delay: { show: 0, hide: 15 }})
+      .bootstrapTooltip({ delay: { show: 0, hide: 150 }})
 
     setTimeout(function () {
       ok($('.tooltip').is('.fade.in'), '1ms: tooltip faded in')
       $tooltip.trigger('mouseout')
 
       setTimeout(function () {
-        ok($('.tooltip').is('.fade.in'), '10ms: tooltip still faded in')
+        ok($('.tooltip').is('.fade.in'), '100ms: tooltip still faded in')
         $tooltip.trigger('mouseenter')
-      }, 10)
+      }, 100)
 
       setTimeout(function () {
-        ok($('.tooltip').is('.fade.in'), '20ms: tooltip still faded in')
+        ok($('.tooltip').is('.fade.in'), '200ms: tooltip still faded in')
         start()
-      }, 20)
+      }, 200)
     }, 0)
 
     $tooltip.trigger('mouseenter')
@@ -867,17 +867,17 @@ $(function () {
 
     var $tooltip = $('<a href="#" rel="tooltip" title="Another tooltip"/>')
       .appendTo('#qunit-fixture')
-      .bootstrapTooltip({ delay: 15 })
+      .bootstrapTooltip({ delay: 150 })
 
     setTimeout(function () {
-      ok(!$('.tooltip').is('.fade.in'), '10ms: tooltip not faded in')
+      ok(!$('.tooltip').is('.fade.in'), '100ms: tooltip not faded in')
       $tooltip.trigger('mouseout')
-    }, 10)
+    }, 100)
 
     setTimeout(function () {
-      ok(!$('.tooltip').is('.fade.in'), '20ms: tooltip not faded in')
+      ok(!$('.tooltip').is('.fade.in'), '200ms: tooltip not faded in')
       start()
-    }, 20)
+    }, 200)
 
     $tooltip.trigger('mouseenter')
   })
@@ -887,27 +887,27 @@ $(function () {
 
     var $tooltip = $('<a href="#" rel="tooltip" title="Another tooltip"/>')
       .appendTo('#qunit-fixture')
-      .bootstrapTooltip({ delay: { show: 15, hide: 0 }})
+      .bootstrapTooltip({ delay: { show: 150, hide: 0 }})
 
     setTimeout(function () {
-      ok(!$('.tooltip').is('.fade.in'), '10ms: tooltip not faded in')
+      ok(!$('.tooltip').is('.fade.in'), '100ms: tooltip not faded in')
       $tooltip.trigger('mouseout')
-    }, 10)
+    }, 100)
 
     setTimeout(function () {
-      ok(!$('.tooltip').is('.fade.in'), '25ms: tooltip not faded in')
+      ok(!$('.tooltip').is('.fade.in'), '250ms: tooltip not faded in')
       start()
-    }, 25)
+    }, 250)
 
     $tooltip.trigger('mouseenter')
   })
 
-  test('should wait 20ms before hiding the tooltip', function () {
+  test('should wait 200ms before hiding the tooltip', function () {
     stop()
 
     var $tooltip = $('<a href="#" rel="tooltip" title="Another tooltip"/>')
       .appendTo('#qunit-fixture')
-      .bootstrapTooltip({ delay: { show: 0, hide: 15 }})
+      .bootstrapTooltip({ delay: { show: 0, hide: 150 }})
 
     setTimeout(function () {
       ok($tooltip.data('bs.tooltip').$tip.is('.fade.in'), '1ms: tooltip faded in')
@@ -915,13 +915,13 @@ $(function () {
       $tooltip.trigger('mouseout')
 
       setTimeout(function () {
-        ok($tooltip.data('bs.tooltip').$tip.is('.fade.in'), '10ms: tooltip still faded in')
-      }, 10)
+        ok($tooltip.data('bs.tooltip').$tip.is('.fade.in'), '100ms: tooltip still faded in')
+      }, 100)
 
       setTimeout(function () {
-        ok(!$tooltip.data('bs.tooltip').$tip.is('.in'), '20ms: tooltip removed')
+        ok(!$tooltip.data('bs.tooltip').$tip.is('.in'), '200ms: tooltip removed')
         start()
-      }, 20)
+      }, 200)
 
     }, 0)
 

less/button-groups.less

@@ -198,7 +198,6 @@
 }
 
 
-
 // Justified button groups
 // ----------------------
 

less/progress-bars.less

@@ -19,7 +19,6 @@
 }
 
 
-
 // Bar itself
 // -------------------------
 

less/theme.less

@@ -7,7 +7,6 @@
 @import "mixins.less";
 
 
-
 //
 // Buttons
 // --------------------------------------------------
@@ -78,7 +77,6 @@
 .btn-danger  { .btn-styles(@btn-danger-bg); }
 
 
-
 //
 // Images
 // --------------------------------------------------
@@ -89,7 +87,6 @@
 }
 
 
-
 //
 // Dropdowns
 // --------------------------------------------------
@@ -107,7 +104,6 @@
 }
 
 
-
 //
 // Navbar
 // --------------------------------------------------
@@ -156,7 +152,6 @@
 }
 
 
-
 //
 // Alerts
 // --------------------------------------------------
@@ -181,7 +176,6 @@
 .alert-danger     { .alert-styles(@alert-danger-bg); }
 
 
-
 //
 // Progress bars
 // --------------------------------------------------
@@ -227,7 +221,6 @@
 }
 
 
-
 //
 // Panels
 // --------------------------------------------------
@@ -251,7 +244,6 @@
 .panel-danger > .panel-heading    { .panel-heading-styles(@panel-danger-heading-bg); }
 
 
-
 //
 // Wells
 // --------------------------------------------------