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

9 files changed, 69 insertions, 68 deletions

diff --git a/README.md b/README.md
index c3990ff00..9beef51e8 100644
--- a/README.md
+++ b/README.md
@@ -118,7 +118,7 @@ Should you encounter problems with installing dependencies or running Grunt comm
 
 Please read through our [contributing guidelines](https://github.com/twbs/bootstrap/blob/master/CONTRIBUTING.md). Included are directions for opening issues, coding standards, and notes on development.
 
-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).
+Moreover, 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](https://github.com/twbs/bootstrap/blob/master/.editorconfig) for easy use in common text editors. Read more and download plugins at <http://editorconfig.org>.
 
diff --git a/docs/_includes/nav-about.html b/docs/_includes/nav-about.html
index 93121e700..bf6b684e9 100644
--- a/docs/_includes/nav-about.html
+++ b/docs/_includes/nav-about.html
@@ -1,9 +1,9 @@
 <li>
-  <a href="#brand">Brand guidelines</a>
-</li>
-<li>
   <a href="#history">History</a>
 </li>
 <li>
   <a href="#team">Team</a>
 </li>
+<li>
+  <a href="#brand">Brand guidelines</a>
+</li>
diff --git a/docs/about.html b/docs/about.html
index f2ec01b25..1cecb9f28 100644
--- a/docs/about.html
+++ b/docs/about.html
@@ -2,67 +2,10 @@
 layout: default
 title: About
 slug: about
-lead: "Find out how to use the Bootstrap brand, learn about the project's history, and meet the maintaining teams."
+lead: "Learn about the project's history, meet the maintaining teams, and find out how to use the Bootstrap brand."
 ---
 
 
-<!-- Brand
-================================================== -->
-<div class="bs-docs-section">
-  <h1 id="brand" class="page-header">Brand guidelines</h1>
-
-  <p class="lead">Have a need for Bootstrap's brand resources? Great! We have only a few guidelines we follow, and in turn ask you to follow as well. These guidelines were inspired by MailChimp's <a href="http://mailchimp.com/about/brand-assets/" target="_blank">Brand Assets</a>.</p>
-
-  <h2>Mark and logo</h2>
-  <p>Use either the Bootstrap mark (a capital <strong>B</strong>) or the standard logo (just <strong>Bootstrap</strong>). It should always appear in Helvetica Neue Bold. <strong>Do not use the Twitter bird</strong> in association with Bootstrap.</p>
-  <div class="bs-brand-logos">
-    <div class="bs-brand-item">
-      <div class="bs-booticon bs-booticon-lg">B</div>
-    </div>
-    <div class="bs-brand-item inverse">
-      <div class="bs-booticon bs-booticon-lg bs-booticon-inverse">B</div>
-    </div>
-  </div>
-  <div class="bs-brand-logos">
-    <div class="bs-brand-item">
-      <h1>Bootstrap</h1>
-    </div>
-    <div class="bs-brand-item inverse">
-      <h1>Bootstrap</h1>
-    </div>
-  </div>
-
-  <h2>Name</h2>
-  <p>The project and framework should always be referred to as <strong>Bootstrap</strong>. No Twitter before it, no capital <em>s</em>, and no abbreviations save for one, a capital <strong>B</strong>.</p>
-  <div class="bs-brand-logos">
-    <div class="bs-brand-item">
-      <h3>Bootstrap</h3>
-      <span class="glyphicon glyphicon-ok"></span>
-    </div>
-    <div class="bs-brand-item">
-      <h3 class="text-muted">BootStrap</h3>
-      <span class="glyphicon glyphicon-remove"></span>
-    </div>
-    <div class="bs-brand-item">
-      <h3 class="text-muted">Twitter Bootstrap</h3>
-      <span class="glyphicon glyphicon-remove"></span>
-    </div>
-  </div>
-
-  <h2>Colors</h2>
-  <p>Our docs and branding use a handful of primary colors to differentiate what <em>is</em> Bootstrap from what <em>is in</em> Bootstrap. In other words, if it's purple, it's representative of Bootstrap.</p>
-  <div class="bs-brand">
-    <div class="color-swatches">
-      <div class="color-swatch bs-purple"></div>
-      <div class="color-swatch bs-purple-light"></div>
-      <div class="color-swatch bs-purple-lighter"></div>
-      <div class="color-swatch bs-gray"></div>
-    </div>
-  </div>
-
-</div>
-
-
 <!-- History
 ================================================== -->
 <div class="bs-docs-section">
@@ -147,3 +90,60 @@ lead: "Find out how to use the Bootstrap brand, learn about the project's histor
   </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. Read the Sass <a href="https://github.com/twbs/bootstrap-sass/blob/master/CONTRIBUTING.md">contributing guidelines</a> for information on how the Sass port is developed.</p>
 </div>
+
+
+<!-- Brand
+================================================== -->
+<div class="bs-docs-section">
+  <h1 id="brand" class="page-header">Brand guidelines</h1>
+
+  <p class="lead">Have a need for Bootstrap's brand resources? Great! We have only a few guidelines we follow, and in turn ask you to follow as well. These guidelines were inspired by MailChimp's <a href="http://mailchimp.com/about/brand-assets/" target="_blank">Brand Assets</a>.</p>
+
+  <h2>Mark and logo</h2>
+  <p>Use either the Bootstrap mark (a capital <strong>B</strong>) or the standard logo (just <strong>Bootstrap</strong>). It should always appear in Helvetica Neue Bold. <strong>Do not use the Twitter bird</strong> in association with Bootstrap.</p>
+  <div class="bs-brand-logos">
+    <div class="bs-brand-item">
+      <div class="bs-booticon bs-booticon-lg">B</div>
+    </div>
+    <div class="bs-brand-item inverse">
+      <div class="bs-booticon bs-booticon-lg bs-booticon-inverse">B</div>
+    </div>
+  </div>
+  <div class="bs-brand-logos">
+    <div class="bs-brand-item">
+      <h1>Bootstrap</h1>
+    </div>
+    <div class="bs-brand-item inverse">
+      <h1>Bootstrap</h1>
+    </div>
+  </div>
+
+  <h2>Name</h2>
+  <p>The project and framework should always be referred to as <strong>Bootstrap</strong>. No Twitter before it, no capital <em>s</em>, and no abbreviations save for one, a capital <strong>B</strong>.</p>
+  <div class="bs-brand-logos">
+    <div class="bs-brand-item">
+      <h3>Bootstrap</h3>
+      <span class="glyphicon glyphicon-ok"></span>
+    </div>
+    <div class="bs-brand-item">
+      <h3 class="text-muted">BootStrap</h3>
+      <span class="glyphicon glyphicon-remove"></span>
+    </div>
+    <div class="bs-brand-item">
+      <h3 class="text-muted">Twitter Bootstrap</h3>
+      <span class="glyphicon glyphicon-remove"></span>
+    </div>
+  </div>
+
+  <h2>Colors</h2>
+  <p>Our docs and branding use a handful of primary colors to differentiate what <em>is</em> Bootstrap from what <em>is in</em> Bootstrap. In other words, if it's purple, it's representative of Bootstrap.</p>
+  <div class="bs-brand">
+    <div class="color-swatches">
+      <div class="color-swatch bs-purple"></div>
+      <div class="color-swatch bs-purple-light"></div>
+      <div class="color-swatch bs-purple-lighter"></div>
+      <div class="color-swatch bs-gray"></div>
+    </div>
+  </div>
+
+</div>
diff --git a/docs/components.html b/docs/components.html
index 2f562908c..510abcc66 100644
--- a/docs/components.html
+++ b/docs/components.html
@@ -1149,7 +1149,7 @@ lead: "Over a dozen reusable components built to provide iconography, dropdowns,
 
 
   <h2 id="nav-disabled-links">Disabled links</h2>
-  <p>For any nav component (tabs, pills, or list), add <code>.disabled</code> for <strong>gray links and no hover effects</strong>.</p>
+  <p>For any nav component (tabs or pills), add <code>.disabled</code> for <strong>gray links and no hover effects</strong>.</p>
 
   <div class="bs-callout bs-callout-warning">
     <h4>Link functionality not impacted</h4>
@@ -1934,7 +1934,7 @@ body { padding-bottom: 70px; }
   </div>
 
   <h4>Adapts to active nav states</h4>
-  <p>Built-in styles are included for placing badges in active states in pill and list navigations.</p>
+  <p>Built-in styles are included for placing badges in active states in pill navigations.</p>
   <div class="bs-example">
     <ul class="nav nav-pills">
       <li class="active"><a href="#">Home <span class="badge">42</span></a></li>
diff --git a/docs/examples/signin/index.html b/docs/examples/signin/index.html
index 14444abdb..c04764f95 100644
--- a/docs/examples/signin/index.html
+++ b/docs/examples/signin/index.html
@@ -32,7 +32,7 @@
 
       <form class="form-signin" role="form">
         <h2 class="form-signin-heading">Please sign in</h2>
-        <input type="text" class="form-control" placeholder="Email address" required autofocus>
+        <input type="email" class="form-control" placeholder="Email address" required autofocus>
         <input type="password" class="form-control" placeholder="Password" required>
         <label class="checkbox">
           <input type="checkbox" value="remember-me"> Remember me
diff --git a/docs/getting-started.html b/docs/getting-started.html
index a055857ae..1936433c9 100644
--- a/docs/getting-started.html
+++ b/docs/getting-started.html
@@ -486,7 +486,7 @@ bootstrap/
 {% highlight css %}
 @-ms-viewport       { width: device-width; }
 {% endhighlight %}
-  <p>However, this doesn't work as it causes Windows Phone 8 devices to show a mostly desktop view instead of narrow "phone" view. To address this, you'll need to <strong>include the following CSS and JavaScript to work around the bug until Microsoft issues a fix</strong>.</p>
+  <p>However, this doesn't work for devices running Windows Phone 8 versions older than <a href="http://blogs.windows.com/windows_phone/b/wpdev/archive/2013/10/14/introducing-windows-phone-preview-for-developers.aspx">Update 3 (a.k.a. GDR3)</a>, as it causes such devices to show a mostly desktop view instead of narrow "phone" view. To address this, you'll need to <strong>include the following CSS and JavaScript to work around the bug</strong>.</p>
 {% highlight css %}
 @-webkit-viewport   { width: device-width; }
 @-moz-viewport      { width: device-width; }
diff --git a/less/navbar.less b/less/navbar.less
index ac7a6a79f..eea376f59 100644
--- a/less/navbar.less
+++ b/less/navbar.less
@@ -48,7 +48,7 @@
 // content for the user's viewport.
 
 .navbar-collapse {
-  max-height: 340px;
+  max-height: @navbar-collapse-max-height;
   overflow-x: visible;
   padding-right: @navbar-padding-horizontal;
   padding-left:  @navbar-padding-horizontal;
diff --git a/less/variables.less b/less/variables.less
index e431f47b3..bbf54b48c 100644
--- a/less/variables.less
+++ b/less/variables.less
@@ -311,6 +311,7 @@
 @navbar-border-radius:             @border-radius-base;
 @navbar-padding-horizontal:        floor((@grid-gutter-width / 2));
 @navbar-padding-vertical:          ((@navbar-height - @line-height-computed) / 2);
+@navbar-collapse-max-height:       340px;
 
 @navbar-default-color:             #777;
 @navbar-default-bg:                #f8f8f8;
diff --git a/package.json b/package.json
index 14e0400aa..2a8e613bd 100644
--- a/package.json
+++ b/package.json
@@ -25,7 +25,7 @@
     }
   ],
   "devDependencies": {
-    "browserstack-runner": "~0.0.14",
+    "browserstack-runner": "~0.0.15",
     "btoa": "~1.1.1",
     "grunt": "~0.4.2",
     "grunt-banner": "~0.2.0",