Merge branch 'master' of github.com:twbs/bootstrap

20100204 · Jan 21, 2014 · e4f33a9 · e4f33a9
2 parents 317aa80 + ebc4f99
commit e4f33a9
Show file tree

Hide file tree

Showing 17 changed files with 224 additions and 69 deletions.
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -1,4 +1,10 @@
 /* jshint node: true */
+/*!
+ * Bootstrap's Gruntfile
+ * http://getbootstrap.com
+ * Copyright 2013-2014 Twitter, Inc.
+ * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
+ */
 
 module.exports = function (grunt) {
   'use strict';
@@ -286,7 +292,8 @@ module.exports = function (grunt) {
           }
         },
         files: {
-          'docs/_includes/customizer-variables.html': 'docs/customizer-variables.jade'
+          'docs/_includes/customizer-variables.html': 'docs/customizer-variables.jade',
+          'docs/_includes/nav-customize.html': 'docs/customizer-nav.jade'
         }
       }
     },
@@ -357,7 +364,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', 'csslint', 'jshint', 'jscs', 'qunit', 'build-customizer-vars-form']);
+    testSubtasks = testSubtasks.concat(['dist-css', 'csslint', 'jshint', 'jscs', 'qunit', 'build-customizer-html']);
   }
   // Skip HTML validation if running a different subset of the test suite
   if (!process.env.TWBS_TEST || process.env.TWBS_TEST === 'validate-html') {
@@ -401,8 +408,8 @@ module.exports = function (grunt) {
   grunt.registerTask('build-glyphicons-data', generateGlyphiconsData);
 
   // task for building customizer
-  grunt.registerTask('build-customizer', ['build-customizer-vars-form', 'build-raw-files']);
-  grunt.registerTask('build-customizer-vars-form', 'jade');
+  grunt.registerTask('build-customizer', ['build-customizer-html', 'build-raw-files']);
+  grunt.registerTask('build-customizer-html', 'jade');
   grunt.registerTask('build-raw-files', 'Add scripts/less files to customizer.', function () {
     var banner = grunt.template.process('<%= banner %>');
     generateRawFilesJs(banner);

diff --git a/docs/_includes/customizer-variables.html b/docs/_includes/customizer-variables.html
@@ -1,5 +1,5 @@
 
-<!-- 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.-->
+<!-- NOTE: DO NOT EDIT THE FOLLOWING SECTION DIRECTLY! It is autogenerated via the `build-customizer-html` Grunt task using the customizer-variables.jade template.-->
 <h2 id="colors">Colors</h2>
 <p>Gray and brand colors for use across Bootstrap.</p>
 <div class="row">
@@ -1683,4 +1683,4 @@ <h2 id="container-sizes">Container sizes</h2>
     <p class="help-block">For <code>@screen-lg-min</code> and up.</p>
   </div>
 </div>
-<!-- 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.-->
+<!-- NOTE: DO NOT EDIT THE PRECEDING SECTION DIRECTLY! It is autogenerated via the `build-customizer-html` Grunt task using the customizer-variables.jade template.-->
diff --git a/docs/_includes/footer.html b/docs/_includes/footer.html
@@ -12,11 +12,11 @@
       <li>&middot;</li>
       <li><a href="{{ site.repo }}">GitHub</a></li>
       <li>&middot;</li>
-      <li><a href="{{ site.baseurl }}getting-started/#examples">Examples</a></li>
+      <li><a href="../getting-started/#examples">Examples</a></li>
       <li>&middot;</li>
-      <li><a href="{{ site.baseurl }}2.3.2/">v2.3.2 docs</a></li>
+      <li><a href="../2.3.2/">v2.3.2 docs</a></li>
       <li>&middot;</li>
-      <li><a href="{{ site.baseurl }}about/">About</a></li>
+      <li><a href="../about/">About</a></li>
       <li>&middot;</li>
       <li><a href="{{ site.expo }}">Expo</a></li>
       <li>&middot;</li>
@@ -33,10 +33,10 @@
 ================================================== -->
 <!-- Placed at the end of the document so the pages load faster -->
 <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.10.2/jquery.min.js"></script>
-<script src="{{ site.baseurl }}dist/js/bootstrap.min.js"></script>
-<script src="{{ site.baseurl }}assets/js/docs.min.js"></script>
+<script src="../dist/js/bootstrap.min.js"></script>
+<script src="../assets/js/docs.min.js"></script>
 {% if page.slug == "customize" %}
-<script src="{{ site.baseurl }}assets/js/customize.min.js"></script>
+<script src="../assets/js/customize.min.js"></script>
 {% endif %}
 
 {% comment %}

diff --git a/docs/_includes/header.html b/docs/_includes/header.html
@@ -14,11 +14,11 @@
 </title>
 
 <!-- Bootstrap core CSS -->
-<link href="{{ site.baseurl }}dist/css/bootstrap.min.css" rel="stylesheet">
+<link href="../dist/css/bootstrap.min.css" rel="stylesheet">
 
 <!-- Documentation extras -->
-<link href="{{ site.baseurl }}assets/css/pack.min.css" rel="stylesheet">
-<!--[if lt IE 9]><script src="{{ site.baseurl }}assets/js/ie8-responsive-file-warning.js"></script><![endif]-->
+<link href="../assets/css/pack.min.css" rel="stylesheet">
+<!--[if lt IE 9]><script src="../assets/js/ie8-responsive-file-warning.js"></script><![endif]-->
 
 <!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
 <!--[if lt IE 9]>
@@ -27,8 +27,8 @@
 <![endif]-->
 
 <!-- Favicons -->
-<link rel="apple-touch-icon-precomposed" sizes="144x144" href="{{ site.baseurl }}assets/ico/apple-touch-icon-144-precomposed.png">
-                               <link rel="shortcut icon" href="{{ site.baseurl }}assets/ico/favicon.ico">
+<link rel="apple-touch-icon-precomposed" sizes="144x144" href="../assets/ico/apple-touch-icon-144-precomposed.png">
+                               <link rel="shortcut icon" href="../assets/ico/favicon.ico">
 
 <script>
   var _gaq = _gaq || [];

diff --git a/docs/_includes/nav-customize.html b/docs/_includes/nav-customize.html
@@ -1,40 +1,46 @@
-<li>
-  <a href="#less">Less components</a>
-</li>
-<li>
-  <a href="#plugins">jQuery plugins</a>
-</li>
-<li>
-  <a href="#less-variables">Less variables</a>
+
+<!-- NOTE: DO NOT EDIT THE FOLLOWING SECTION DIRECTLY! It is autogenerated via the `build-customizer-html` Grunt task using the customizer-nav.jade template.-->
+<li><a href="#less">Less components</a></li>
+<li><a href="#plugins">jQuery plugins</a></li>
+<li><a href="#less-variables">Less variables</a>
   <ul class="nav">
-    <li><a href="#variables-basics">Basics</a></li>
-    <li><a href="#variables-buttons">Buttons</a></li>
-    <li><a href="#variables-form-states">Form states</a></li>
-    <li><a href="#variables-alerts">Alerts</a></li>
-    <li><a href="#variables-navbar">Navbar</a></li>
-    <li><a href="#variables-nav">Nav</a></li>
-    <li><a href="#variables-tables">Tables</a></li>
-    <li><a href="#variables-forms">Forms</a></li>
-    <li><a href="#variables-dropdowns">Dropdowns</a></li>
-    <li><a href="#variables-panels-wells">Panels and wells</a></li>
-    <li><a href="#variables-accordion">Accordion</a></li>
-    <li><a href="#variables-badges">Badges</a></li>
-    <li><a href="#variables-breadcrumbs">Breadcrumbs</a></li>
-    <li><a href="#variables-jumbotron">Jumbotron</a></li>
-    <li><a href="#variables-modals">Modals</a></li>
-    <li><a href="#variables-carousel">Carousel</a></li>
-    <li><a href="#variables-list-group">List group</a></li>
-    <li><a href="#variables-thumbnails">Thumbnails</a></li>
-    <li><a href="#variables-progress">Progress bars</a></li>
-    <li><a href="#variables-pagination">Pagination</a></li>
-    <li><a href="#variables-pager">Pager</a></li>
-    <li><a href="#variables-labels">Labels</a></li>
-    <li><a href="#variables-tooltips-popovers">Tooltips and popovers</a></li>
-    <li><a href="#variables-close">Close button</a></li>
-    <li><a href="#variables-type">Type</a></li>
-    <li><a href="#variables-other">Other</a></li>
+    <li><a href="#colors">Colors</a></li>
+    <li><a href="#scaffolding">Scaffolding</a></li>
+    <li><a href="#typography">Typography</a></li>
+    <li><a href="#components">Components</a></li>
+    <li><a href="#tables">Tables</a></li>
+    <li><a href="#buttons">Buttons</a></li>
+    <li><a href="#forms">Forms</a></li>
+    <li><a href="#dropdowns">Dropdowns</a></li>
+    <li><a href="#media-queries-breakpoints">Media queries breakpoints</a></li>
+    <li><a href="#grid-system">Grid system</a></li>
+    <li><a href="#navbar">Navbar</a></li>
+    <li><a href="#navs">Navs</a></li>
+    <li><a href="#tabs">Tabs</a></li>
+    <li><a href="#pills">Pills</a></li>
+    <li><a href="#pagination">Pagination</a></li>
+    <li><a href="#pager">Pager</a></li>
+    <li><a href="#jumbotron">Jumbotron</a></li>
+    <li><a href="#form-states-and-alerts">Form states and alerts</a></li>
+    <li><a href="#tooltips">Tooltips</a></li>
+    <li><a href="#popovers">Popovers</a></li>
+    <li><a href="#labels">Labels</a></li>
+    <li><a href="#modals">Modals</a></li>
+    <li><a href="#alerts">Alerts</a></li>
+    <li><a href="#progress-bars">Progress bars</a></li>
+    <li><a href="#list-group">List group</a></li>
+    <li><a href="#panels">Panels</a></li>
+    <li><a href="#thumbnails">Thumbnails</a></li>
+    <li><a href="#wells">Wells</a></li>
+    <li><a href="#badges">Badges</a></li>
+    <li><a href="#breadcrumbs">Breadcrumbs</a></li>
+    <li><a href="#carousel">Carousel</a></li>
+    <li><a href="#close">Close</a></li>
+    <li><a href="#code">Code</a></li>
+    <li><a href="#type">Type</a></li>
+    <li><a href="#miscellaneous">Miscellaneous</a></li>
+    <li><a href="#container-sizes">Container sizes</a></li>
   </ul>
 </li>
-<li>
-  <a href="#download">Download</a>
-</li>
+<li><a href="#download">Download</a></li>
+<!-- NOTE: DO NOT EDIT THE PRECEDING SECTION DIRECTLY! It is autogenerated via the `build-customizer-html` Grunt task using the customizer-nav.jade template.-->
diff --git a/docs/_includes/nav-main.html b/docs/_includes/nav-main.html
@@ -7,24 +7,24 @@
         <span class="icon-bar"></span>
         <span class="icon-bar"></span>
       </button>
-      <a href="{{ site.baseurl }}" class="navbar-brand">Bootstrap</a>
+      <a href="../" class="navbar-brand">Bootstrap</a>
     </div>
     <nav class="collapse navbar-collapse bs-navbar-collapse" role="navigation">
       <ul class="nav navbar-nav">
         <li{% if page.slug == "getting-started" %} class="active"{% endif %}>
-          <a href="{{ site.baseurl }}getting-started">Getting started</a>
+          <a href="../getting-started">Getting started</a>
         </li>
         <li{% if page.slug == "css" %} class="active"{% endif %}>
-          <a href="{{ site.baseurl }}css">CSS</a>
+          <a href="../css">CSS</a>
         </li>
         <li{% if page.slug == "components" %} class="active"{% endif %}>
-          <a href="{{ site.baseurl }}components">Components</a>
+          <a href="../components">Components</a>
         </li>
         <li{% if page.slug == "js" %} class="active"{% endif %}>
-          <a href="{{ site.baseurl }}javascript">JavaScript</a>
+          <a href="../javascript">JavaScript</a>
         </li>
         <li{% if page.slug == "customize" %} class="active"{% endif %}>
-          <a href="{{ site.baseurl }}customize">Customize</a>
+          <a href="../customize">Customize</a>
         </li>
       </ul>
       <ul class="nav navbar-nav navbar-right">

diff --git a/docs/components.html b/docs/components.html
@@ -1254,9 +1254,14 @@ <h1 id="navbar" class="page-header">Navbar</h1>
   <h2 id="navbar-default">Default navbar</h2>
   <p>Navbars are responsive meta components that serve as navigation headers for your application or site. They begin collapsed (and are toggleable) in mobile views and become horizontal as the available viewport width increases.</p>
 
-  <div class="bs-callout bs-callout-info">
-    <h4>Customize the collapsing point</h4>
-    <p>Depending on the content in your navbar, you might need to change the point at which your navbar switches between collapsed and horizontal mode. Customize the <code>@grid-float-breakpoint</code> variable or add your own media query.</p>
+  <div class="bs-callout bs-callout-warning" id="callout-navbar-overflow">
+    <h4>Overflowing content</h4>
+    <p>Since Bootstrap doesn't know how much space the content in your navbar needs, you might run into issues with content wrapping into a second row. To resolve this, you can:</p>
+    <ol type="a">
+      <li>Reduce the amount or width of navbar items.</li>
+      <li>Hide certain navbar items at certain screen sizes using <a href="../css/#responsive-utilities">responsive utility classes</a>.</li>
+      <li>Change the point at which your navbar switches between collapsed and horizontal mode. Customize the <code>@grid-float-breakpoint</code> variable or add your own media query.</li>
+    </ol>
   </div>
   <div class="bs-callout bs-callout-danger">
     <h4>Requires JavaScript</h4>

diff --git a/docs/customizer-nav.jade b/docs/customizer-nav.jade
@@ -0,0 +1,15 @@
+// NOTE: DO NOT EDIT THE FOLLOWING SECTION DIRECTLY! It is autogenerated via the `build-customizer-html` Grunt task using the customizer-nav.jade template.
+li
+  a(href='#less') Less components
+li
+  a(href='#plugins') jQuery plugins
+li
+  a(href='#less-variables') Less variables
+  ul.nav
+    each section in sections
+      if section.customizable
+        li
+          a(href='#'+section.id)= section.heading
+li
+  a(href='#download') Download
+// NOTE: DO NOT EDIT THE PRECEDING SECTION DIRECTLY! It is autogenerated via the `build-customizer-html` Grunt task using the customizer-nav.jade template.
diff --git a/docs/customizer-variables.jade b/docs/customizer-variables.jade
@@ -1,4 +1,4 @@
-// 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.
+// NOTE: DO NOT EDIT THE FOLLOWING SECTION DIRECTLY! It is autogenerated via the `build-customizer-html` Grunt task using the customizer-variables.jade template.
 each section in sections
   if section.customizable
     h2(id=section.id)= section.heading
@@ -18,4 +18,4 @@ each section in sections
               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.
+// NOTE: DO NOT EDIT THE PRECEDING SECTION DIRECTLY! It is autogenerated via the `build-customizer-html` Grunt task using the customizer-variables.jade template.
diff --git a/docs/getting-started.html b/docs/getting-started.html
@@ -115,7 +115,7 @@ <h1 id="template" class="page-header">Basic template</h1>
   <p>Copy the HTML below to begin working with a minimal Bootstrap document.</p>
 {% highlight html %}
 <!DOCTYPE html>
-<html>
+<html lang="en">
   <head>
     <meta charset="utf-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">

diff --git a/docs/grunt/bs-glyphicons-data-generator.js b/docs/grunt/bs-glyphicons-data-generator.js
@@ -1,4 +1,10 @@
 /* jshint node: true */
+/*!
+ * Bootstrap Grunt task for Glyphicons data generation
+ * http://getbootstrap.com
+ * Copyright 2014 Twitter, Inc.
+ * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
+ */
 
 var fs = require('fs')
 

diff --git a/docs/grunt/bs-lessdoc-parser.js b/docs/grunt/bs-lessdoc-parser.js
@@ -1,4 +1,10 @@
 /* jshint node: true */
+/*!
+ * Bootstrap Grunt task for parsing Less docstrings
+ * http://getbootstrap.com
+ * Copyright 2014 Twitter, Inc.
+ * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
+ */
 
 var markdown = require('markdown').markdown;
 

diff --git a/docs/grunt/bs-raw-files-generator.js b/docs/grunt/bs-raw-files-generator.js
@@ -1,4 +1,10 @@
 /* jshint node: true */
+/*!
+ * Bootstrap Grunt task for generating raw-files.min.js for the Customizer
+ * http://getbootstrap.com
+ * Copyright 2014 Twitter, Inc.
+ * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
+ */
 
 var btoa = require('btoa') // jshint ignore:line
 var fs = require('fs')

diff --git a/docs/index.html b/docs/index.html
@@ -50,7 +50,7 @@ <h3>Comprehensive docs</h3>
 <div class="bs-featurette">
   <div class="container">
     <h2 class="bs-featurette-title">Built with Bootstrap.</h2>
-    <p class="lead">Millions of amazing sites across the web are being built with Bootstrap. Get started on your own with our growing <a href="{{ site.url }}/getting-started/#examples">collection of examples</a> or by exploring some of our favorites.</p>
+    <p class="lead">Millions of amazing sites across the web are being built with Bootstrap. Get started on your own with our growing <a href="../getting-started/#examples">collection of examples</a> or by exploring some of our favorites.</p>
 
     <hr class="half-rule">
 

diff --git a/docs/javascript.html b/docs/javascript.html
@@ -102,6 +102,10 @@ <h2 id="modals-examples">Examples</h2>
     <h4>Overlapping modals not supported</h4>
     <p>Be sure not to open a modal while another is still visible. Showing more than one modal at a time requires custom code.</p>
   </div>
+  <div class="bs-callout bs-callout-warning" id="callout-modal-markup-placement">
+    <h4>Modal markup placement</h4>
+    <p>Always try to place a modal's HTML code in a top-level position in your document to avoid other components affecting the modal's appearance and/or functionality.</p>
+  </div>
   <div class="bs-callout bs-callout-warning">
     <h4>Mobile device caveats</h4>
     <p>There are some caveats regarding using modals on mobile devices. <a href="../getting-started/#support-fixed-position-keyboards">See our browser support docs</a> for details.</p>
@@ -1366,7 +1370,7 @@ <h2 id="alerts-usage">Usage</h2>
 
   <h3>Markup</h3>
   <p>Just add <code>data-dismiss="alert"</code> to your close button to automatically give an alert close functionality.</p>
-  {% highlight html %}<a class="close" data-dismiss="alert" href="#" aria-hidden="true">&times;</a>{% endhighlight %}
+  {% highlight html %}<button type="button" class="close" data-dismiss="alert" aria-hidden="true">&times;</button>{% endhighlight %}
 
   <h3>Methods</h3>
 

diff --git a/package.json b/package.json
@@ -39,7 +39,7 @@
     "grunt-contrib-jshint": "~0.8.0",
     "grunt-contrib-less": "~0.9.0",
     "grunt-contrib-qunit": "~0.4.0",
-    "grunt-contrib-uglify": "~0.2.7",
+    "grunt-contrib-uglify": "~0.3.0",
     "grunt-contrib-watch": "~0.5.3",
     "grunt-csscomb": "~2.0.1",
     "grunt-html-validation": "~0.1.13",