hella examples fixing, mostly navbars and lots of work on grids example

diff --git a/_includes/nav-getting-started.html b/_includes/nav-getting-started.html
index f0e6af7ac4c61926d216f4012600bfe48dc0fdb1..fca38bde367fecfbd62824dd94962c37628bb14d 100644 (file)
--- a/_includes/nav-getting-started.html
+++ b/_includes/nav-getting-started.html
@@ -11,6 +11,9 @@
 <li>
   <a href="#template">Basic template</a>
 </li>
+<li>
+  <a href="#examples">Examples</a>
+</li>
 <li>
   <a href="#disable-responsive">Disabling responsiveness</a>
 </li>

diff --git a/examples/carousel/index.html b/examples/carousel/index.html
index efb4bcf3cf3bee8af199c62af5ff4c6a5f54a3b5..8f3ac988acc614958f496e795fb98b9a2616f475 100644 (file)
--- a/examples/carousel/index.html
+++ b/examples/carousel/index.html
@@ -9,8 +9,8 @@
     <title>Carousel Template for Bootstrap</title>
 
     <!-- Bootstrap core CSS -->
-    <link href="../bootstrap/css/bootstrap.css" rel="stylesheet">
-    <link href="../bootstrap/css/bootstrap-glyphicons.css" rel="stylesheet">
+    <link href="../../dist/css/bootstrap.css" rel="stylesheet">
+    <link href="../../dist/css/bootstrap-glyphicons.css" rel="stylesheet">
 
     <!-- Custom styles for this template -->
     <link href="carousel.css" rel="stylesheet">
@@ -23,13 +23,15 @@
 
         <div class="navbar navbar-inverse navbar-static-top">
           <div class="container">
-           <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".nav-collapse">
-             <span class="icon-bar"></span>
-             <span class="icon-bar"></span>
-             <span class="icon-bar"></span>
-           </button>
-            <a class="navbar-brand" href="#">Project name</a>
-            <div class="nav-collapse collapse">
+            <div class="navbar-header">
+              <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
+                <span class="icon-bar"></span>
+                <span class="icon-bar"></span>
+                <span class="icon-bar"></span>
+              </button>
+              <a class="navbar-brand" href="#">Project name</a>
+            </div>
+            <div class="navbar-collapse collapse">
               <ul class="nav navbar-nav">
                 <li class="active"><a href="#">Home</a></li>
                 <li><a href="#about">About</a></li>
@@ -41,7 +43,7 @@
                     <li><a href="#">Another action</a></li>
                     <li><a href="#">Something else here</a></li>
                     <li class="divider"></li>
-                    <li class="nav-header">Nav header</li>
+                    <li class="dropdown-header">Nav header</li>
                     <li><a href="#">Separated link</a></li>
                     <li><a href="#">One more separated link</a></li>
                   </ul>
@@ -175,8 +177,8 @@
     <!-- Bootstrap core JavaScript
     ================================================== -->
     <!-- Placed at the end of the document so the pages load faster -->
-    <script src="../assets/js/jquery.js"></script>
-    <script src="../bootstrap/js/bootstrap.min.js"></script>
-    <script src="../assets/js/holder.js"></script>
+    <script src="../../assets/js/jquery.js"></script>
+    <script src="../../dist/js/bootstrap.min.js"></script>
+    <script src="../../assets/js/holder.js"></script>
   </body>
 </html>

diff --git a/examples/grid/grid.css b/examples/grid/grid.css
index c213ac6a7322aa34f5eb85ffe0eaf10deda1647c..963b128e3038717ca1e03f96b2f7d5e60377ccc9 100644 (file)
--- a/examples/grid/grid.css
+++ b/examples/grid/grid.css
@@ -13,9 +13,16 @@ h4 {
   margin-top: 10px;
   margin-bottom: 0;
 }
-[class*="col-lg-"] {
+[class*="col-"] {
   padding-top: 15px;
   padding-bottom: 15px;
-  background-color: rgba(185,74,72,.15);
-  border: 1px solid rgba(185,74,72,.2);
+  background-color: #eee;
+  border: 1px solid #ddd;
+  background-color: rgba(86,61,124,.15);
+  border: 1px solid rgba(86,61,124,.2);
 }
+
+hr {
+  margin-top: 40px;
+  margin-bottom: 40px;
+}
\ No newline at end of file

diff --git a/examples/grid/index.html b/examples/grid/index.html
index bd86f4ab96c824672c80af597a6141150a208be0..4525f7e499b7d561edca02cac81f55363e2ded3f 100644 (file)
--- a/examples/grid/index.html
+++ b/examples/grid/index.html
@@ -9,7 +9,7 @@
     <title>Grid Template for Bootstrap</title>
 
     <!-- Bootstrap core CSS -->
-    <link href="../bootstrap/css/bootstrap.css" rel="stylesheet">
+    <link href="../../dist/css/bootstrap.css" rel="stylesheet">
 
     <!-- Custom styles for this template -->
     <link href="grid.css" rel="stylesheet">
@@ -18,72 +18,88 @@
   <body>
     <div class="container">
 
-      <h2>Bootstrap grids</h2>
-      <p class="lead">Basic grid layouts to get you familiar with building within the Bootstrap grid system.</p>
+      <div class="page-header">
+        <h1>Bootstrap grid examples</h1>
+        <p class="lead">Basic grid layouts to get you familiar with building within the Bootstrap grid system.</p>
+      </div>
 
-      <h4>Three equal columns</h4>
+      <h3>Three equal columns</h3>
+      <p>Get three equal-width columns <strong>starting at desktops and scaling to large desktops</strong>. On mobile devices, tablets and below, the columns will automatically stack.</p>
       <div class="row">
-        <div class="col-lg-4">.col-lg-4</div>
-        <div class="col-lg-4">.col-lg-4</div>
-        <div class="col-lg-4">.col-lg-4</div>
+        <div class="col-md-4">.col-md-4</div>
+        <div class="col-md-4">.col-md-4</div>
+        <div class="col-md-4">.col-md-4</div>
       </div>
 
-      <h4>Three unequal columns</h4>
+      <h3>Three unequal columns</h3>
+      <p>Get three columns <strong>starting at desktops and scaling to large desktops</strong> of various widths. Remember, grid columns should add up to twelve for a single horizontal block. More than that, and columns start stacking no matter the viewport.</p>
       <div class="row">
-        <div class="col-lg-3">.col-lg-3</div>
-        <div class="col-lg-6">.col-lg-6</div>
-        <div class="col-lg-3">.col-lg-3</div>
+        <div class="col-md-3">.col-md-3</div>
+        <div class="col-md-6">.col-md-6</div>
+        <div class="col-md-3">.col-md-3</div>
       </div>
 
-      <h4>Two columns</h4>
+      <h3>Two columns</h3>
+      <p>Get two columns <strong>starting at desktops and scaling to large desktops</strong>.</p>
       <div class="row">
-        <div class="col-lg-8">.col-lg-8</div>
-        <div class="col-lg-4">.col-lg-4</div>
+        <div class="col-md-8">.col-md-8</div>
+        <div class="col-md-4">.col-md-4</div>
       </div>
 
-      <h4>Full width, single column</h4>
+      <h3>Full width, single column</h3>
       <p class="text-warning">No grid classes are necessary for full-width elements.</p>
 
-      <h4>Two columns with two nested columns</h4>
+      <hr>
+
+      <h3>Two columns with two nested columns</h3>
+      <p>Per the documentation, nesting is easy—just put a row of columns within an existing row. This gives you two columns <strong>starting at desktops and scaling to large desktops</strong>, with another two (equal widths) within the larger column.</p>
+      <p>At mobile device sizes, tablets and down, these columns and their nested columns will stack.</p>
       <div class="row">
-        <div class="col-lg-8">
-          .col-lg-8
+        <div class="col-md-8">
+          .col-md-8
           <div class="row">
-            <div class="col-lg-6">.col-lg-6</div>
-            <div class="col-lg-6">.col-lg-6</div>
+            <div class="col-md-6">.col-md-6</div>
+            <div class="col-md-6">.col-md-6</div>
           </div>
         </div>
-        <div class="col-lg-4">.col-lg-4</div>
+        <div class="col-md-4">.col-md-4</div>
       </div>
 
-      <h4>Mixed: mobile and desktop</h4>
+      <hr>
+
+      <h3>Mixed: mobile and desktop</h3>
+      <p>The Bootstrap 3 grid system has four tiers of classes: xs (phones), sm (tablets), md (desktops), and lg (larger desktops). You can use nearly any combination of these classes to create more dynamic and flexible layouts.</p>
+      <p>Each tier of classes scales up, meaning if you plan on setting the same widths for xs and sm, you only need to specify xs.</p>
       <div class="row">
-        <div class="col-12 col-lg-8">.col-12 .col-lg-8</div>
-        <div class="col-6 col-lg-4">.col-6 .col-lg-4</div>
+        <div class="col-xs-12 col-md-8">.col-xs-12 .col-md-8</div>
+        <div class="col-xs-6 col-md-4">.col-xs-6 .col-md-4</div>
       </div>
       <div class="row">
-        <div class="col-6 col-lg-4">.col-6 .col-lg-4</div>
-        <div class="col-6 col-lg-4">.col-6 .col-lg-4</div>
-        <div class="col-6 col-lg-4">.col-6 .col-lg-4</div>
+        <div class="col-xs-6 col-md-4">.col-xs-6 .col-md-4</div>
+        <div class="col-xs-6 col-md-4">.col-xs-6 .col-md-4</div>
+        <div class="col-xs-6 col-md-4">.col-xs-6 .col-md-4</div>
       </div>
       <div class="row">
-        <div class="col-6 col-lg-6">.col-6 .col-lg-6</div>
-        <div class="col-6 col-lg-6">.col-6 .col-lg-6</div>
+        <div class="col-xs-6 col-md-6">.col-xs-6 .col-md-6</div>
+        <div class="col-xs-6 col-md-6">.col-xs-6 .col-md-6</div>
       </div>
 
-      <h4>Mixed: mobile, tablet, and desktop</h4>
+      <hr>
+
+      <h3>Mixed: mobile, tablet, and desktop</h3>
+      <p></p>
       <div class="row">
-        <div class="col-12 col-sm-8 col-lg-8">.col-12 .col-lg-8</div>
-        <div class="col-6 col-sm-4 col-lg-4">.col-6 .col-lg-4</div>
+        <div class="col-xs-12 col-sm-8 col-lg-8">.col-xs-12 .col-lg-8</div>
+        <div class="col-xs-6 col-sm-4 col-lg-4">.col-xs-6 .col-lg-4</div>
       </div>
       <div class="row">
-        <div class="col-6 col-sm-4 col-lg-4">.col-6 .col-lg-4</div>
-        <div class="col-6 col-sm-4 col-lg-4">.col-6 .col-lg-4</div>
-        <div class="col-6 col-sm-4 col-lg-4">.col-6 .col-lg-4</div>
+        <div class="col-xs-6 col-sm-4 col-lg-4">.col-xs-6 .col-sm-4 .col-lg-4</div>
+        <div class="col-xs-6 col-sm-4 col-lg-4">.col-xs-6 .col-sm-4 .col-lg-4</div>
+        <div class="col-xs-6 col-sm-4 col-lg-4">.col-xs-6 .col-sm-4 .col-lg-4</div>
       </div>
       <div class="row">
-        <div class="col-6 col-sm-6 col-lg-6">.col-6 .col-lg-6</div>
-        <div class="col-6 col-sm-6 col-lg-6">.col-6 .col-lg-6</div>
+        <div class="col-xs-6 col-sm-6 col-lg-6">.col-xs-6 .col-sm-6 .col-lg-6</div>
+        <div class="col-xs-6 col-sm-6 col-lg-6">.col-xs-6 .col-sm-6 .col-lg-6</div>
       </div>
 
     </div> <!-- /container -->

diff --git a/examples/jumbotron-narrow/index.html b/examples/jumbotron-narrow/index.html
index a34fbb92fa2f0e66c237cb46784291ed24ea7abc..1d09fa852b1def46cb4d533e2c5c73ab0c8f29f4 100644 (file)
--- a/examples/jumbotron-narrow/index.html
+++ b/examples/jumbotron-narrow/index.html
@@ -9,7 +9,7 @@
     <title>Narrow Jumbotron Template for Bootstrap</title>
 
     <!-- Bootstrap core CSS -->
-    <link href="../bootstrap/css/bootstrap.css" rel="stylesheet">
+    <link href="../../dist/css/bootstrap.css" rel="stylesheet">
 
     <!-- Custom styles for this template -->
     <link href="jumbotron-narrow.css" rel="stylesheet">

diff --git a/examples/jumbotron/index.html b/examples/jumbotron/index.html
index 09bb1227711e086ab905a123053185bef985b36b..b5a5a11ece26a2abde057475239e61baf69a8754 100644 (file)
--- a/examples/jumbotron/index.html
+++ b/examples/jumbotron/index.html
@@ -9,7 +9,7 @@
     <title>Jumbotron Template for Bootstrap</title>
 
     <!-- Bootstrap core CSS -->
-    <link href="../bootstrap/css/bootstrap.css" rel="stylesheet">
+    <link href="../../dist/css/bootstrap.css" rel="stylesheet">
 
     <!-- Custom styles for this template -->
     <link href="jumbotron.css" rel="stylesheet">
@@ -19,13 +19,15 @@
 
     <div class="navbar navbar-inverse navbar-fixed-top">
       <div class="container">
-        <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".nav-collapse">
-          <span class="icon-bar"></span>
-          <span class="icon-bar"></span>
-          <span class="icon-bar"></span>
-        </button>
-        <a class="navbar-brand" href="#">Project name</a>
-        <div class="nav-collapse collapse">
+        <div class="navbar-header">
+          <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
+            <span class="icon-bar"></span>
+            <span class="icon-bar"></span>
+            <span class="icon-bar"></span>
+          </button>
+          <a class="navbar-brand" href="#">Project name</a>
+        </div>
+        <div class="navbar-collapse collapse">
           <ul class="nav navbar-nav">
             <li class="active"><a href="#">Home</a></li>
             <li><a href="#about">About</a></li>
@@ -43,12 +45,12 @@
               </ul>
             </li>
           </ul>
-          <form class="navbar-form form-inline pull-right">
+          <form class="navbar-form navbar-right">
             <input type="text" placeholder="Email" class="form-control">
             <input type="password" placeholder="Password" class="form-control">
             <button type="submit" class="btn">Sign in</button>
           </form>
-        </div><!--/.nav-collapse -->
+        </div><!--/.navbar-collapse -->
       </div>
     </div>
 
@@ -91,7 +93,7 @@
 
     </div> <!-- /container -->
 
-    <script src="../assets/js/jquery.js"></script>
-    <script src="../bootstrap/js/bootstrap.min.js"></script>
+    <script src="../../assets/js/jquery.js"></script>
+    <script src="../../dist/js/bootstrap.min.js"></script>
   </body>
 </html>
\ No newline at end of file

diff --git a/examples/justified-nav/index.html b/examples/justified-nav/index.html
index f5fbc5851a89c07f793acf56f9246f36d4fd1dc9..de9ce387e242ddca43fd2bceb489b5fb7a1c868c 100644 (file)
--- a/examples/justified-nav/index.html
+++ b/examples/justified-nav/index.html
@@ -9,7 +9,7 @@
     <title>Justified Nav Template for Bootstrap</title>
 
     <!-- Bootstrap core CSS -->
-    <link href="../bootstrap/css/bootstrap.css" rel="stylesheet">
+    <link href="../../dist/css/bootstrap.css" rel="stylesheet">
 
     <!-- Custom styles for this template -->
     <link href="justified-nav.css" rel="stylesheet">

diff --git a/examples/navbar-fixed-top/index.html b/examples/navbar-fixed-top/index.html
index 5a0e596af786373ecaaf9ef42002e181c65cd9f0..9bc75b5f22c21d100731edd1691cd3cee7916abb 100644 (file)
--- a/examples/navbar-fixed-top/index.html
+++ b/examples/navbar-fixed-top/index.html
@@ -9,7 +9,7 @@
     <title>Fixed Top Navbar Example for Bootstrap</title>
 
     <!-- Bootstrap core CSS -->
-    <link href="../bootstrap/css/bootstrap.css" rel="stylesheet">
+    <link href="../../dist/css/bootstrap.css" rel="stylesheet">
 
     <!-- Custom styles for this template -->
     <link href="navbar-fixed-top.css" rel="stylesheet">
@@ -20,13 +20,15 @@
     <!-- Fixed navbar -->
     <div class="navbar navbar-fixed-top">
       <div class="container">
-        <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".nav-collapse">
-          <span class="icon-bar"></span>
-          <span class="icon-bar"></span>
-          <span class="icon-bar"></span>
-        </button>
-        <a class="navbar-brand" href="#">Project name</a>
-        <div class="nav-collapse collapse">
+        <div class="navbar-header">
+          <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
+            <span class="icon-bar"></span>
+            <span class="icon-bar"></span>
+            <span class="icon-bar"></span>
+          </button>
+          <a class="navbar-brand" href="#">Project name</a>
+        </div>
+        <div class="navbar-collapse collapse">
           <ul class="nav navbar-nav">
             <li class="active"><a href="#">Home</a></li>
             <li><a href="#about">About</a></li>
@@ -38,13 +40,13 @@
                 <li><a href="#">Another action</a></li>
                 <li><a href="#">Something else here</a></li>
                 <li class="divider"></li>
-                <li class="dropdown-header">Dropdown header</li>
+                <li class="dropdown-header">Nav header</li>
                 <li><a href="#">Separated link</a></li>
                 <li><a href="#">One more separated link</a></li>
               </ul>
             </li>
           </ul>
-          <ul class="nav navbar-nav pull-right">
+          <ul class="nav navbar-nav navbar-right">
             <li><a href="http://examples.getbootstrap.com/navbar/index.html">Default</a></li>
             <li><a href="http://examples.getbootstrap.com/navbar-static-top/index.html">Static top</a></li>
             <li class="active"><a href="http://examples.getbootstrap.com/navbar-fixed-top/index.html">Fixed top</a></li>
@@ -69,7 +71,7 @@
     <!-- Bootstrap core JavaScript
     ================================================== -->
     <!-- Placed at the end of the document so the pages load faster -->
-    <script src="../assets/js/jquery.js"></script>
-    <script src="../bootstrap/js/bootstrap.min.js"></script>
+    <script src="../../assets/js/jquery.js"></script>
+    <script src="../../dist/js/bootstrap.min.js"></script>
   </body>
 </html>

diff --git a/examples/navbar-static-top/index.html b/examples/navbar-static-top/index.html
index 25e9dcec40d1ef934c6f53855aa175c775f7d08f..1a49c82295ee8da41772fef63787983f9131c601 100644 (file)
--- a/examples/navbar-static-top/index.html
+++ b/examples/navbar-static-top/index.html
@@ -9,7 +9,7 @@
     <title>Static Top Navbar Example for Bootstrap</title>
 
     <!-- Bootstrap core CSS -->
-    <link href="../bootstrap/css/bootstrap.css" rel="stylesheet">
+    <link href="../../dist/css/bootstrap.css" rel="stylesheet">
 
     <!-- Custom styles for this template -->
     <link href="navbar-static-top.css" rel="stylesheet">
@@ -20,13 +20,15 @@
     <!-- Static navbar -->
     <div class="navbar navbar-static-top">
       <div class="container">
-        <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".nav-collapse">
-          <span class="icon-bar"></span>
-          <span class="icon-bar"></span>
-          <span class="icon-bar"></span>
-        </button>
-        <a class="navbar-brand" href="#">Project name</a>
-        <div class="nav-collapse collapse">
+        <div class="navbar-header">
+          <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
+            <span class="icon-bar"></span>
+            <span class="icon-bar"></span>
+            <span class="icon-bar"></span>
+          </button>
+          <a class="navbar-brand" href="#">Project name</a>
+        </div>
+        <div class="navbar-collapse collapse">
           <ul class="nav navbar-nav">
             <li class="active"><a href="#">Home</a></li>
             <li><a href="#about">About</a></li>
@@ -38,13 +40,13 @@
                 <li><a href="#">Another action</a></li>
                 <li><a href="#">Something else here</a></li>
                 <li class="divider"></li>
-                <li class="dropdown-header">Dropdown header</li>
+                <li class="dropdown-header">Nav header</li>
                 <li><a href="#">Separated link</a></li>
                 <li><a href="#">One more separated link</a></li>
               </ul>
             </li>
           </ul>
-          <ul class="nav navbar-nav pull-right">
+          <ul class="nav navbar-nav navbar-right">
             <li><a href="http://examples.getbootstrap.com/navbar/index.html">Default</a></li>
             <li class="active"><a href="http://examples.getbootstrap.com/navbar-static-top/index.html">Static top</a></li>
             <li><a href="http://examples.getbootstrap.com/navbar-fixed-top/index.html">Fixed top</a></li>
@@ -70,7 +72,7 @@
     <!-- Bootstrap core JavaScript
     ================================================== -->
     <!-- Placed at the end of the document so the pages load faster -->
-    <script src="../assets/js/jquery.js"></script>
-    <script src="../bootstrap/js/bootstrap.min.js"></script>
+    <script src="../../assets/js/jquery.js"></script>
+    <script src="../../dist/js/bootstrap.min.js"></script>
   </body>
 </html>

diff --git a/examples/navbar/index.html b/examples/navbar/index.html
index 689a0e35c571cd6af1efa39453a695efc23411f6..e89c831133982c819307876e586ee49c9781873b 100644 (file)
--- a/examples/navbar/index.html
+++ b/examples/navbar/index.html
@@ -9,7 +9,7 @@
     <title>Navbar Template for Bootstrap</title>
 
     <!-- Bootstrap core CSS -->
-    <link href="../bootstrap/css/bootstrap.css" rel="stylesheet">
+    <link href="../../dist/css/bootstrap.css" rel="stylesheet">
 
     <!-- Custom styles for this template -->
     <link href="navbar.css" rel="stylesheet">
@@ -22,13 +22,15 @@
       <!-- Static navbar -->
       <div class="navbar">
         <div class="container">
-          <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".nav-collapse">
-            <span class="icon-bar"></span>
-            <span class="icon-bar"></span>
-            <span class="icon-bar"></span>
-          </button>
-          <a class="navbar-brand" href="#">Project name</a>
-          <div class="nav-collapse collapse">
+          <div class="navbar-header">
+            <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
+              <span class="icon-bar"></span>
+              <span class="icon-bar"></span>
+              <span class="icon-bar"></span>
+            </button>
+            <a class="navbar-brand" href="#">Project name</a>
+          </div>
+          <div class="navbar-collapse collapse">
             <ul class="nav navbar-nav">
               <li class="active"><a href="#">Home</a></li>
               <li><a href="#about">About</a></li>
@@ -40,13 +42,13 @@
                   <li><a href="#">Another action</a></li>
                   <li><a href="#">Something else here</a></li>
                   <li class="divider"></li>
-                  <li class="dropdown-header">Dropdown header</li>
+                  <li class="dropdown-header">Nav header</li>
                   <li><a href="#">Separated link</a></li>
                   <li><a href="#">One more separated link</a></li>
                 </ul>
               </li>
             </ul>
-            <ul class="nav navbar-nav pull-right">
+            <ul class="nav navbar-nav navbar-right">
               <li class="active"><a href="http://examples.getbootstrap.com/navbar/index.html">Default</a></li>
               <li><a href="http://examples.getbootstrap.com/navbar-static-top/index.html">Static top</a></li>
               <li><a href="http://examples.getbootstrap.com/navbar-fixed-top/index.html">Fixed top</a></li>
@@ -69,7 +71,7 @@
     <!-- Bootstrap core JavaScript
     ================================================== -->
     <!-- Placed at the end of the document so the pages load faster -->
-    <script src="../assets/js/jquery.js"></script>
-    <script src="../bootstrap/js/bootstrap.min.js"></script>
+    <script src="../../assets/js/jquery.js"></script>
+    <script src="../../dist/js/bootstrap.min.js"></script>
   </body>
 </html>

diff --git a/examples/offcanvas/index.html b/examples/offcanvas/index.html
index 1092f2c1a36c9f9efaf8b0187e83f8623fdae8bb..e6c186462ce9c2e42d1127edf825d97e91cb2255 100644 (file)
--- a/examples/offcanvas/index.html
+++ b/examples/offcanvas/index.html
@@ -9,7 +9,7 @@
     <title>Off Canvas Template for Bootstrap</title>
 
     <!-- Bootstrap core CSS -->
-    <link href="../bootstrap/css/bootstrap.min.css" rel="stylesheet">
+    <link href="../../dist/css/bootstrap.min.css" rel="stylesheet">
 
     <!-- Custom styles for this template -->
     <link href="offcanvas.css" rel="stylesheet">
@@ -18,16 +18,15 @@
   <body>
     <div class="navbar navbar-fixed-top navbar-inverse" role="navigation">
       <div class="container">
-
-        <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-responsive-collapse">
-          <span class="icon-bar"></span>
-          <span class="icon-bar"></span>
-          <span class="icon-bar"></span>
-        </button>
-
-        <a class="navbar-brand" href="#">Project name</a>
-
-        <div class="nav-collapse collapse navbar-responsive-collapse">
+        <div class="navbar-header">
+          <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
+            <span class="icon-bar"></span>
+            <span class="icon-bar"></span>
+            <span class="icon-bar"></span>
+          </button>
+          <a class="navbar-brand" href="#">Project name</a>
+        </div>
+        <div class="collapse navbar-collapse">
           <ul class="nav navbar-nav">
             <li class="active"><a href="#">Home</a></li>
             <li><a href="#about">About</a></li>
@@ -40,8 +39,8 @@
     <div class="container">
 
       <div class="row row-offcanvas row-offcanvas-right">
-        <div class="col-12 col-sm-9 col-lg-9">
-          <p class="pull-right visible-sm">
+        <div class="col-xs-12 col-sm-9">
+          <p class="pull-right visible-xs">
             <button type="button" class="btn btn-primary btn-xs" data-toggle="offcanvas">Toggle nav</button>
           </p>
           <div class="jumbotron">
@@ -81,7 +80,8 @@
             </div><!--/span-->
           </div><!--/row-->
         </div><!--/span-->
-        <nav class="col-3 col-sm-3 col-lg-3 sidebar-offcanvas" id="sidebar" role="navigation">
+
+        <div class="col-xs-12 col-sm-3 sidebar-offcanvas" id="sidebar" role="navigation">
           <div class="well sidebar-nav">
             <ul class="nav">
               <li>Sidebar</li>
@@ -97,7 +97,7 @@
               <li><a href="#">Link</a></li>
             </ul>
           </div><!--/.well -->
-        </nav><!--/span-->
+        </div><!--/span-->
       </div><!--/row-->
 
       <hr>
@@ -109,8 +109,8 @@
     </div><!--/.container-->
 
     <!-- jQuery and plugin -->
-    <script src="../assets/js/jquery.js"></script>
-    <script src="../bootstrap/js/bootstrap.min.js"></script>
+    <script src="../../assets/js/jquery.js"></script>
+    <script src="../../dist/js/bootstrap.min.js"></script>
     <script src="offcanvas.js"></script>
   </body>
 </html>
\ No newline at end of file

diff --git a/examples/offcanvas/offcanvas.css b/examples/offcanvas/offcanvas.css
index 27a075d76e08ed69e6234fb29f116ce14c580be9..e83e71824a25396318ce3d8387f4b7e4ca6f95d4 100644 (file)
--- a/examples/offcanvas/offcanvas.css
+++ b/examples/offcanvas/offcanvas.css
@@ -17,7 +17,7 @@ footer {
 @media screen and (max-width: 768px) {
   .row-offcanvas {
     position: relative;
-    overflow: hidden // Needed for Internet Explorer
+    overflow: hidden; /* Needed for Internet Explorer */
     -webkit-transition: all 0.25s ease-out;
     -moz-transition: all 0.25s ease-out;
     transition: all 0.25s ease-out;
@@ -25,24 +25,24 @@ footer {
 
   .row-offcanvas-right
   .sidebar-offcanvas {
-    right: -58.333333333333336%; // 6 columns
+    right: -58.333333333333336%; /* 6 columns */
   }
 
   .row-offcanvas-left
   .sidebar-offcanvas {
-    left: -58.333333333333336%; // 6 columns
+    left: -58.333333333333336%; /* 6 columns */
   }
 
   .row-offcanvas-right.active {
-    right: 58.333333333333336%; // 6 columns
+    right: 58.333333333333336%; /* 6 columns */
   }
 
   .row-offcanvas-left.active {
-    left: 58.333333333333336%; // 6 columns
+    left: 58.333333333333336%; /* 6 columns */
   }
 
   .sidebar-offcanvas {
     position: absolute;
-    width: 58.333333333333336%; // 6 columns
+    width: 58.333333333333336%; /* 6 columns */
   }
 }
\ No newline at end of file

diff --git a/examples/signin/index.html b/examples/signin/index.html
index 0b5d9bd950c4fc3aa6728b99e2e5b213ec678b28..9521fb437b0d708e32107a92e6b18c1309c650bd 100644 (file)
--- a/examples/signin/index.html
+++ b/examples/signin/index.html
@@ -9,7 +9,7 @@
     <title>Signin Template for Bootstrap</title>
 
     <!-- Bootstrap core CSS -->
-    <link href="../bootstrap/css/bootstrap.css" rel="stylesheet">
+    <link href="../../dist/css/bootstrap.css" rel="stylesheet">
 
     <!-- Custom styles for this template -->
     <link href="signin.css" rel="stylesheet">

diff --git a/examples/signin/signin.css b/examples/signin/signin.css
index a68420fadf906dc1d03c6769de468bc179e32bb7..a6bf9b15943388eb0fe0772c9ad454a0a304cd50 100644 (file)
--- a/examples/signin/signin.css
+++ b/examples/signin/signin.css
@@ -16,8 +16,7 @@ body {
 .form-signin .checkbox {
   font-weight: normal;
 }
-.form-signin input[type="text"],
-.form-signin input[type="password"] {
+.form-signin .form-control {
   position: relative;
   font-size: 16px;
   height: auto;
@@ -26,8 +25,7 @@ body {
      -moz-box-sizing: border-box;
           box-sizing: border-box;
 }
-.form-signin input[type="text"]:focus,
-.form-signin input[type="password"]:focus {
+.form-signin .form-control:focus {
   z-index: 2;
 }
 .form-signin input[type="text"] {

diff --git a/examples/starter-template/index.html b/examples/starter-template/index.html
index 08a277208473845f78815d6bc1d8fa4019c4c7b4..008125d14b0e8bf2c96b5483f83f9ce6156b7bcc 100644 (file)
--- a/examples/starter-template/index.html
+++ b/examples/starter-template/index.html
@@ -9,7 +9,7 @@
     <title>Starter Template for Bootstrap</title>
 
     <!-- Bootstrap core CSS -->
-    <link href="../bootstrap/css/bootstrap.css" rel="stylesheet">
+    <link href="../../dist/css/bootstrap.css" rel="stylesheet">
 
     <!-- Custom styles for this template -->
     <link href="starter-template.css" rel="stylesheet">
@@ -19,13 +19,15 @@
 
     <div class="navbar navbar-inverse navbar-fixed-top">
       <div class="container">
-        <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".nav-collapse">
-          <span class="icon-bar"></span>
-          <span class="icon-bar"></span>
-          <span class="icon-bar"></span>
-        </button>
-        <a class="navbar-brand" href="#">Project name</a>
-        <div class="nav-collapse collapse">
+        <div class="navbar-header">
+          <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
+            <span class="icon-bar"></span>
+            <span class="icon-bar"></span>
+            <span class="icon-bar"></span>
+          </button>
+          <a class="navbar-brand" href="#">Project name</a>
+        </div>
+        <div class="collapse navbar-collapse">
           <ul class="nav navbar-nav">
             <li class="active"><a href="#">Home</a></li>
             <li><a href="#about">About</a></li>
@@ -44,7 +46,7 @@
 
     </div><!-- /.container -->
 
-    <script src="../assets/js/jquery.js"></script>
-    <script src="../bootstrap/js/bootstrap.min.js"></script>
+    <script src="../../assets/js/jquery.js"></script>
+    <script src="../../dist/js/bootstrap.min.js"></script>
   </body>
 </html>
\ No newline at end of file

diff --git a/examples/sticky-footer-navbar/index.html b/examples/sticky-footer-navbar/index.html
index d5e033f58eee6e13670804eddea2fcc7d4758eac..a5182eeafa017d20e84a720fbbe99446209193ec 100644 (file)
--- a/examples/sticky-footer-navbar/index.html
+++ b/examples/sticky-footer-navbar/index.html
@@ -9,7 +9,7 @@
     <title>Sticky Footer Navbar Template for Bootstrap</title>
 
     <!-- Bootstrap core CSS -->
-    <link href="../bootstrap/css/bootstrap.css" rel="stylesheet">
+    <link href="../../dist/css/bootstrap.css" rel="stylesheet">
 
     <!-- Custom styles for this template -->
     <link href="sticky-footer-navbar.css" rel="stylesheet">
@@ -23,13 +23,15 @@
       <!-- Fixed navbar -->
       <div class="navbar navbar-fixed-top">
         <div class="container">
-          <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".nav-collapse">
-            <span class="icon-bar"></span>
-            <span class="icon-bar"></span>
-            <span class="icon-bar"></span>
-          </button>
-          <a class="navbar-brand" href="#">Project name</a>
-          <div class="nav-collapse collapse">
+          <div class="navbar-header">
+            <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
+              <span class="icon-bar"></span>
+              <span class="icon-bar"></span>
+              <span class="icon-bar"></span>
+            </button>
+            <a class="navbar-brand" href="#">Project name</a>
+          </div>
+          <div class="collapse navbar-collapse">
             <ul class="nav navbar-nav">
               <li class="active"><a href="#">Home</a></li>
               <li><a href="#about">About</a></li>
@@ -69,7 +71,7 @@
 
     <!-- Bootstrap core JavaScript
     ================================================== -->
-    <script src="../assets/js/jquery.js"></script>
-    <script src="../bootstrap/js/bootstrap.min.js"></script>
+    <script src="../../assets/js/jquery.js"></script>
+    <script src="../../dist/js/bootstrap.min.js"></script>
   </body>
 </html>
\ No newline at end of file

diff --git a/examples/sticky-footer/index.html b/examples/sticky-footer/index.html
index 13476cd118210092757a7e1b12b07ce643675d74..8505d76375623726313cc29a395dcb562cd56bd3 100644 (file)
--- a/examples/sticky-footer/index.html
+++ b/examples/sticky-footer/index.html
@@ -9,7 +9,7 @@
     <title>Sticky Footer Template for Bootstrap</title>
 
     <!-- Bootstrap core CSS -->
-    <link href="../bootstrap/css/bootstrap.css" rel="stylesheet">
+    <link href="../../dist/css/bootstrap.css" rel="stylesheet">
 
     <!-- Custom styles for this template -->
     <link href="sticky-footer.css" rel="stylesheet">

diff --git a/getting-started.html b/getting-started.html
index fdb703dd969d39fcd4442052e6dca538520e3863..ec99133691f3fe94d6f9dd937470d8b022a99cc6 100644 (file)
--- a/getting-started.html
+++ b/getting-started.html
@@ -93,7 +93,7 @@ bootstrap/
     <div class="page-header">
       <h1 id="template">Basic template</h1>
     </div>
-    <p class="lead">Make use of a super basic HTML template, or dive into a <a href="{{ site.examples }}">few examples</a> we've started for you. We encourage folks to iterate on these examples and not simply use them as an end result.</p>
+    <p class="lead">Make use of a super basic HTML template, or dive into a <a href="../getting-started#examples">few examples</a> we've started for you. We encourage folks to iterate on these examples and not simply use them as an end result.</p>
 
     <p>Copy and paste the HTML from below to get started with a bare bones Bootstrap document.</p>
 {% highlight html %}
@@ -125,6 +125,91 @@ bootstrap/
 
 
 
+  <!-- Template
+  ================================================== -->
+  <div class="bs-docs-section">
+    <div class="page-header">
+      <h1 id="examples">Examples</h1>
+    </div>
+    <p class="lead">Build on the basic template above with Bootstrap's many components. Check out some of the more advanced tips for how to customize and build on top of them.</p>
+
+    <div class="row">
+      <div class="col-xs-6 col-md-4">
+        <a href="../examples/carousel/">
+          Carousel
+        </a>
+      </div>
+      <div class="col-xs-6 col-md-4">
+        <a href="../examples/grid/">
+          Grids
+        </a>
+      </div>
+      <div class="clearfix visible-xs"></div>
+
+      <div class="col-xs-6 col-md-4">
+        <a href="../examples/jumbotron/">
+          Jumbotron
+        </a>
+      </div>
+      <div class="col-xs-6 col-md-4">
+        <a href="../examples/jumbotron-narrow/">
+          Narrow jumbotron
+        </a>
+      </div>
+      <div class="clearfix visible-xs"></div>
+
+      <div class="col-xs-6 col-md-4">
+        <a href="../examples/navbar/">
+          Navbar
+        </a>
+      </div>
+      <div class="col-xs-6 col-md-4">
+        <a href="../examples/navbar-static-top/">
+          Static navbar
+        </a>
+      </div>
+      <div class="clearfix visible-xs"></div>
+
+      <div class="col-xs-6 col-md-4">
+        <a href="../examples/navbar-fixed-top/">
+          Fixed navbar
+        </a>
+      </div>
+      <div class="col-xs-6 col-md-4">
+        <a href="../examples/offcanvas/">
+          Offcanvas
+        </a>
+      </div>
+      <div class="clearfix visible-xs"></div>
+
+      <div class="col-xs-6 col-md-4">
+        <a href="../examples/signin/">
+          Sign-in page
+        </a>
+      </div>
+      <div class="col-xs-6 col-md-4">
+        <a href="../examples/sticky-footer/">
+          Sticky footer
+        </a>
+      </div>
+      <div class="clearfix visible-xs"></div>
+
+      <div class="col-xs-6 col-md-4">
+        <a href="../examples/sticky-footer-navbar/">
+          Sticky footer with navbar
+        </a>
+      </div>
+      <div class="col-xs-6 col-md-4">
+        <a href="../examples/starter-template/">
+          Starter template
+        </a>
+      </div>
+    </div>
+
+  </div>
+
+
+
   <!-- Template
   ================================================== -->
   <div class="bs-docs-section">