3.0.0 -> 3.0.1

6 files changed, 49 insertions, 21 deletions

diff --git a/bower_components/bootstrap/_includes/footer.html b/bower_components/bootstrap/_includes/footer.html
index d187f95d..7f9f8f10 100755
--- a/bower_components/bootstrap/_includes/footer.html
+++ b/bower_components/bootstrap/_includes/footer.html
@@ -1,21 +1,21 @@
 <!-- Bootstrap core JavaScript
 ================================================== -->
 <!-- Placed at the end of the document so the pages load faster -->
-<script src="{{ page.base_url }}assets/js/jquery.js"></script>
+<script src="https://code.jquery.com/jquery-1.10.2.min.js"></script>
 <script src="{{ page.base_url }}dist/js/bootstrap.js"></script>
 
 <script src="http://platform.twitter.com/widgets.js"></script>
-<script src="{{ page.base_url }}assets/js/holder.js"></script>
+<script src="{{ page.base_url }}docs-assets/js/holder.js"></script>
 
-<script src="{{ page.base_url }}assets/js/application.js"></script>
+<script src="{{ page.base_url }}docs-assets/js/application.js"></script>
 
 {% if page.slug == "customize" %}
-<script src="{{ page.base_url }}assets/js/less.js"></script>
-<script src="{{ page.base_url }}assets/js/jszip.js"></script>
-<script src="{{ page.base_url }}assets/js/uglify.js"></script>
-<script src="{{ page.base_url }}assets/js/filesaver.js"></script>
-<script src="{{ page.base_url }}assets/js/raw-files.js"></script>
-<script src="{{ page.base_url }}assets/js/customizer.js"></script>
+<script src="{{ page.base_url }}docs-assets/js/less.js"></script>
+<script src="{{ page.base_url }}docs-assets/js/jszip.js"></script>
+<script src="{{ page.base_url }}docs-assets/js/uglify.js"></script>
+<script src="{{ page.base_url }}docs-assets/js/filesaver.js"></script>
+<script src="{{ page.base_url }}docs-assets/js/raw-files.js"></script>
+<script src="{{ page.base_url }}docs-assets/js/customizer.js"></script>
 {% endif %}
 
 <!-- Analytics
diff --git a/bower_components/bootstrap/_includes/header.html b/bower_components/bootstrap/_includes/header.html
index 827b1c2c..41ecfc8e 100755
--- a/bower_components/bootstrap/_includes/header.html
+++ b/bower_components/bootstrap/_includes/header.html
@@ -1,4 +1,5 @@
 <meta charset="utf-8">
+<meta http-equiv="X-UA-Compatible" content="IE=edge">
 <meta name="viewport" content="width=device-width, initial-scale=1.0">
 <meta name="description" content="">
 <meta name="author" content="">
@@ -6,30 +7,28 @@
 <title>
   {% if page.title == "Bootstrap" %}
     {{ page.title }}
-  {% else if %}
+  {% else %}
     {{ page.title }} &middot; Bootstrap
   {% endif %}
 </title>
 
 <!-- Bootstrap core CSS -->
-<link href="{{ page.base_url }}dist/css/bootstrap.css" rel="stylesheet">
+<link href="{{ page.base_url }}dist/css/bootstrap.min.css" rel="stylesheet">
 
 <!-- Documentation extras -->
-<link href="{{ page.base_url }}assets/css/docs.css" rel="stylesheet">
-<link href="{{ page.base_url }}assets/css/pygments-manni.css" rel="stylesheet">
+<link href="{{ page.base_url }}docs-assets/css/docs.css" rel="stylesheet">
+<link href="{{ page.base_url }}docs-assets/css/pygments-manni.css" rel="stylesheet">
+<!--[if lt IE 9]><script src="{{ page.base_url }}docs-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]>
-  <script src="{{ page.base_url }}assets/js/html5shiv.js"></script>
-  <script src="{{ page.base_url }}assets/js/respond.min.js"></script>
+  <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>
 <![endif]-->
 
 <!-- Favicons -->
-<link rel="apple-touch-icon-precomposed" sizes="144x144" href="{{ page.base_url }}assets/ico/apple-touch-icon-144-precomposed.png">
-<link rel="apple-touch-icon-precomposed" sizes="114x114" href="{{ page.base_url }}assets/ico/apple-touch-icon-114-precomposed.png">
-  <link rel="apple-touch-icon-precomposed" sizes="72x72" href="{{ page.base_url }}assets/ico/apple-touch-icon-72-precomposed.png">
-                <link rel="apple-touch-icon-precomposed" href="{{ page.base_url }}assets/ico/apple-touch-icon-57-precomposed.png">
-                               <link rel="shortcut icon" href="{{ page.base_url }}assets/ico/favicon.png">
+<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">
 
 <script>
   var _gaq = _gaq || [];
diff --git a/bower_components/bootstrap/_includes/nav-about.html b/bower_components/bootstrap/_includes/nav-about.html
new file mode 100755
index 00000000..2cf12359
--- /dev/null
+++ b/bower_components/bootstrap/_includes/nav-about.html
@@ -0,0 +1,12 @@
+<li>
+  <a href="#history">History</a>
+</li>
+<li>
+  <a href="#team">Core team</a>
+</li>
+<li>
+  <a href="#community">Community</a>
+</li>
+<li>
+  <a href="#translations">Translations</a>
+</li>
diff --git a/bower_components/bootstrap/_includes/nav-components.html b/bower_components/bootstrap/_includes/nav-components.html
index 8b239b22..f7a705b5 100755
--- a/bower_components/bootstrap/_includes/nav-components.html
+++ b/bower_components/bootstrap/_includes/nav-components.html
@@ -53,7 +53,6 @@
     <li><a href="#nav-pills">Pills</a></li>
     <li><a href="#nav-justified">Justified nav</a></li>
     <li><a href="#nav-disabled-links">Disabled links</a></li>
-    <li><a href="#nav-alignment">Alignment options</a></li>
     <li><a href="#nav-dropdowns">Using dropdowns</a></li>
   </ul>
 </li>
@@ -61,6 +60,7 @@
   <a href="#navbar">Navbar</a>
   <ul class="nav">
     <li><a href="#navbar-default">Default navbar</a></li>
+    <li><a href="#navbar-forms">Forms</a></li>
     <li><a href="#navbar-buttons">Buttons</a></li>
     <li><a href="#navbar-text">Text</a></li>
     <li><a href="#navbar-links">Non-nav links</a></li>
diff --git a/bower_components/bootstrap/_includes/nav-css.html b/bower_components/bootstrap/_includes/nav-css.html
index 853b4733..543d004f 100755
--- a/bower_components/bootstrap/_includes/nav-css.html
+++ b/bower_components/bootstrap/_includes/nav-css.html
@@ -12,6 +12,7 @@
 <li>
   <a href="#grid">Grid system</a>
   <ul class="nav">
+    <li><a href="#grid-intro">Introduction</a></li>
     <li><a href="#grid-media-queries">Media queries</a></li>
     <li><a href="#grid-options">Grid options</a></li>
     <li><a href="#grid-example-basic">Ex: Stacked-to-horizonal</a></li>
@@ -67,6 +68,7 @@
   <ul class="nav">
     <li><a href="#buttons-options">Options</a></li>
     <li><a href="#buttons-sizes">Sizes</a></li>
+    <li><a href="#buttons-active">Active state</a></li>
     <li><a href="#buttons-disabled">Disabled state</a></li>
     <li><a href="#buttons-tags">Button tags</a></li>
   </ul>
@@ -76,6 +78,16 @@
 </li>
 <li>
   <a href="#helper-classes">Helper classes</a>
+  <ul class="nav">
+    <li><a href="#helper-classes-close">Close icon</a></li>
+    <li><a href="#helper-classes-carets">Carets</a></li>
+    <li><a href="#helper-classes-floats">Quick floats</a></li>
+    <li><a href="#helper-classes-center">Center content blocks</a></li>
+    <li><a href="#helper-classes-clearfix">Clearfix</a></li>
+    <li><a href="#helper-classes-show-hide">Showing and hiding content</a></li>
+    <li><a href="#helper-classes-screen-readers">Screen reader content</a></li>
+    <li><a href="#helper-classes-image-replacement">Image replacement</a></li>
+  </ul>
 </li>
 <li>
   <a href="#responsive-utilities">Responsive utilities</a>
diff --git a/bower_components/bootstrap/_includes/nav-main.html b/bower_components/bootstrap/_includes/nav-main.html
index c880c329..a64b7c8a 100755
--- a/bower_components/bootstrap/_includes/nav-main.html
+++ b/bower_components/bootstrap/_includes/nav-main.html
@@ -27,6 +27,11 @@
           <a href="{{ page.base_url }}customize">Customize</a>
         </li>
       </ul>
+      <ul class="nav navbar-nav navbar-right">
+        <li{% if page.slug == "about" %} class="active"{% endif %}>
+          <a href="{{ page.base_url }}about">About</a>
+        </li>
+      </ul>
     </nav>
   </div>
 </header>