diff --git a/assets/bootstrap.zip b/assets/bootstrap.zip index 3de85be8..52171a6c 100644 Binary files a/assets/bootstrap.zip and b/assets/bootstrap.zip differ diff --git a/assets/css/bootstrap.css b/assets/css/bootstrap.css index fa588699..a90e3193 100644 --- a/assets/css/bootstrap.css +++ b/assets/css/bootstrap.css @@ -2108,12 +2108,12 @@ button.btn.small, input[type="submit"].btn.small { .nav-list > li + .nav-header { margin-top: 9px; } -.nav-list .active > a { +.nav-list .active > a, .nav-list .active > a:hover { color: #ffffff; text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.2); background-color: #0088cc; } -.nav-list .icon { +.nav-list [class^="icon-"] { margin-right: 2px; } .nav-tabs, .nav-pills { diff --git a/base-css.html b/base-css.html index b53b873a..5176c3ec 100644 --- a/base-css.html +++ b/base-css.html @@ -600,7 +600,7 @@ For example, <code>section</code> should be wrapped as inline.

Get a little fancy with your tables by adding zebra-striping—just add the .table-striped class.

-

Note: Sprited tables use the :nth-child CSS selector and is not available in IE7-IE8.

+

Note: Striped tables use the :nth-child CSS selector and is not available in IE7-IE8.

 <table class="table table-striped">
   …
@@ -914,7 +914,7 @@ For example, <code>section</code> should be wrapped as inline.
@@ -1145,7 +1145,7 @@ For example, <code>section</code> should be wrapped as inline.
@@ -1088,7 +1088,7 @@ - New + Success <span class="label label-success">New</span> @@ -1295,25 +1295,25 @@

Wrap your message and an optional close icon in a div with simple class.

× - Warning! Best check yo self, you’re not looking too good. + Warning! Best check yo self, you're not looking too good. 
 <div class="alert">
   <a class="close">×</a>
-  <strong>Warning!</strong> Best check yo self, you’re not looking too good.
+  <strong>Warning!</strong> Best check yo self, you're not looking too good.
 </div>

Easily extend the standard alert message with two optional classes: .alert-block for more padding and text controls and .alert-heading for a matching heading.

×

Warning!

-

Best check yo self, you’re not looking too good. Nulla vitae elit libero, a pharetra augue. Praesent commodo cursus magna, vel scelerisque nisl consectetur et.

+

Best check yo self, you're not looking too good. Nulla vitae elit libero, a pharetra augue. Praesent commodo cursus magna, vel scelerisque nisl consectetur et.

 <div class="alert alert-block">
   <a class="close">×</a>
   <h4 class="alert-heading">Warning!</h4>
-  Best check yo self, you’re not...
+  Best check yo self, you're not...
 </div>
@@ -1349,7 +1349,7 @@

Information

× - Heads up! This alert needs your attention, but it’s not super important. + Heads up! This alert needs your attention, but it's not super important. 
 <div class="alert alert-info">
diff --git a/examples.html b/examples.html
index cf9cbefc..92528767 100644
--- a/examples.html
+++ b/examples.html
@@ -95,7 +95,7 @@
       
     
     
Fluid layout

-    
Uses are new responsive, fluid grid system to create seamless liquid layout.

+    
Uses our new responsive, fluid grid system to create seamless liquid layout.

   
   
  • 
     
diff --git a/examples/fluid.html b/examples/fluid.html
index 5249f2b4..7fe5df15 100644
--- a/examples/fluid.html
+++ b/examples/fluid.html
@@ -37,9 +37,9 @@
       
    
         
    
           
-            
-            
-            
+            
+            
+            
           
           Project name
           
    
@@ -128,14 +128,23 @@
       
 
     
    
-
-
+    
     
     
-    
+    
     
+    
+    
+    
+    
+    
+    
+    
+    
     
+    
+    
 
   
 
diff --git a/examples/hero.html b/examples/hero.html
index 2896aa79..7d60d1a4 100644
--- a/examples/hero.html
+++ b/examples/hero.html
@@ -34,9 +34,9 @@
       
    
         
    
           
-            
-            
-            
+            
+            
+            
           
           Project name
           
    
@@ -89,9 +89,19 @@
     
     
-    
+    
     
+    
+    
+    
+    
+    
+    
+    
+    
     
+    
+    
 
   
 
diff --git a/examples/starter-template.html b/examples/starter-template.html
index 5370f298..c8b2a09c 100644
--- a/examples/starter-template.html
+++ b/examples/starter-template.html
@@ -13,12 +13,12 @@
 
     
     
-    
     
+    
 
     
     
@@ -33,9 +33,9 @@
       
    
         
    
           
-            
-            
-            
+            
+            
+            
           
           Project name
           
    
@@ -59,8 +59,7 @@
     
     
-    
-    
+    
     
     
     
diff --git a/javascript.html b/javascript.html
index 900f431b..db694839 100644
--- a/javascript.html
+++ b/javascript.html
@@ -910,7 +910,7 @@ $('a[data-toggle="tab"]').on('shown', function (e) {
           
    The alerts plugin works on regular alert messages, and block messages.
    
           
    
             ×
-            Holy guacamole! Best check yo self, you’re not looking too good.
+            Holy guacamole! Best check yo self, you're not looking too good.
           
    
           
    
             ×
diff --git a/less.html b/less.html
index b7d1600e..739ebf2c 100644
--- a/less.html
+++ b/less.html
@@ -191,7 +191,6 @@
           
             @baseFontFamily
             "Helvetica Neue", Helvetica, Arial, sans-serif
-            
           
           
             @baseLineHeight
diff --git a/scaffolding.html b/scaffolding.html
index 9ad17ff1..cc89b593 100644
--- a/scaffolding.html
+++ b/scaffolding.html
@@ -338,13 +338,13 @@
           
           
             Landscape tablets
-            768px to 940px
+            768px to 980px
             44px
             20px
           
           
             Default
-            940px and up
+            980px and up
             60px
             20px
           
@@ -390,7 +390,7 @@
   @media (max-width: 768px) { ... }
 
   // Portrait tablet to landscape and desktop
-  @media (min-width: 768px) and (max-width: 940px) { ... }
+  @media (min-width: 768px) and (max-width: 980px) { ... }
 
   // Large desktop
   @media (min-width: 1200px) { .. }
diff --git a/templates/pages/base-css.mustache b/templates/pages/base-css.mustache
index cc235ffd..63480971 100644
--- a/templates/pages/base-css.mustache
+++ b/templates/pages/base-css.mustache
@@ -524,7 +524,7 @@
   
    
     
    
       
    {{_i}}Get a little fancy with your tables by adding zebra-striping—just add the .table-striped class.{{/i}}
    
-      
    {{_i}}Note: Sprited tables use the :nth-child CSS selector and is not available in IE7-IE8.{{/i}}
    
+      
    {{_i}}Note: Striped tables use the :nth-child CSS selector and is not available in IE7-IE8.{{/i}}
    
 
     <table class="table table-striped">
   …
@@ -838,7 +838,7 @@
             
    
               
             
    
           
    
@@ -1069,7 +1069,7 @@

    • {{_i}}Adding dropdowns{{/i}}

    -

    {{_i}}Adding dropdowns to the nav is super simple, but does require the use of our javascript plugin.{{/i}}

    +

    {{_i}}Adding dropdowns to the nav is super simple, but does require the use of our javascript plugin.{{/i}}

     <ul class="nav">
   <li class="dropdown">
@@ -805,7 +805,7 @@
   </li>
 </ul>
    -

    {{_i}}Get the javascript →{{/i}}

    +

    {{_i}}Get the javascript →{{/i}}

    @@ -1012,7 +1012,7 @@ - {{_i}}New{{/i}} + {{_i}}Success{{/i}} <span class="label label-success">{{/_i}}New{{/i}}</span> @@ -1219,25 +1219,25 @@

    {{_i}}Wrap your message and an optional close icon in a div with simple class.{{/i}}

    × - {{_i}}Warning!{{/i}} {{_i}}Best check yo self, you’re not looking too good.{{/i}} + {{_i}}Warning!{{/i}} {{_i}}Best check yo self, you're not looking too good.{{/i}} 
     <div class="alert">
   <a class="close">×</a>
-  <strong>{{_i}}Warning!{{/i}}</strong> {{_i}}Best check yo self, you’re not looking too good.{{/i}}
+  <strong>{{_i}}Warning!{{/i}}</strong> {{_i}}Best check yo self, you're not looking too good.{{/i}}
 </div>

    {{_i}}Easily extend the standard alert message with two optional classes: .alert-block for more padding and text controls and .alert-heading for a matching heading.{{/i}}

    ×

    {{_i}}Warning!{{/i}}

    -

    {{_i}}Best check yo self, you’re not looking too good.{{/i}} Nulla vitae elit libero, a pharetra augue. Praesent commodo cursus magna, vel scelerisque nisl consectetur et.

    +

    {{_i}}Best check yo self, you're not looking too good.{{/i}} Nulla vitae elit libero, a pharetra augue. Praesent commodo cursus magna, vel scelerisque nisl consectetur et.

     <div class="alert alert-block">
   <a class="close">×</a>
   <h4 class="alert-heading">{{_i}}Warning!{{/i}}</h4>
-  {{_i}}Best check yo self, you’re not...{{/i}}
+  {{_i}}Best check yo self, you're not...{{/i}}
 </div>
    @@ -1273,7 +1273,7 @@

    {{_i}}Information{{/i}}

    × - {{_i}}Heads up!{{/i}} {{_i}}This alert needs your attention, but it’s not super important.{{/i}} + {{_i}}Heads up!{{/i}} {{_i}}This alert needs your attention, but it's not super important.{{/i}} 
     <div class="alert alert-info">
diff --git a/templates/pages/examples.mustache b/templates/pages/examples.mustache
index 8ae07f41..485fbc57 100644
--- a/templates/pages/examples.mustache
+++ b/templates/pages/examples.mustache
@@ -19,7 +19,7 @@
       
     
     
    {{_i}}Fluid layout{{/i}}
    
-    
    {{_i}}Uses are new responsive, fluid grid system to create seamless liquid layout.{{/i}}
    
+    
    {{_i}}Uses our new responsive, fluid grid system to create seamless liquid layout.{{/i}}
    
   
   
  • 
     
diff --git a/templates/pages/javascript.mustache b/templates/pages/javascript.mustache
index 003a4386..aedd21f5 100644
--- a/templates/pages/javascript.mustache
+++ b/templates/pages/javascript.mustache
@@ -834,7 +834,7 @@ $('a[data-toggle="tab"]').on('shown', function (e) {
           
    {{_i}}The alerts plugin works on regular alert messages, and block messages.{{/i}}
    
           
    
             ×
-            {{_i}}Holy guacamole!{{/i}} {{_i}}Best check yo self, you’re not looking too good.{{/i}}
+            {{_i}}Holy guacamole!{{/i}} {{_i}}Best check yo self, you're not looking too good.{{/i}}
           
    
           
    
             ×
diff --git a/templates/pages/less.mustache b/templates/pages/less.mustache
index 70432cea..f69e43c2 100644
--- a/templates/pages/less.mustache
+++ b/templates/pages/less.mustache
@@ -115,7 +115,6 @@
           
             @baseFontFamily
             "Helvetica Neue", Helvetica, Arial, sans-serif
-            
           
           
             @baseLineHeight
diff --git a/templates/pages/scaffolding.mustache b/templates/pages/scaffolding.mustache
index bfbd879d..e20c5240 100644
--- a/templates/pages/scaffolding.mustache
+++ b/templates/pages/scaffolding.mustache
@@ -262,13 +262,13 @@
           
           
             {{_i}}Landscape tablets{{/i}}
-            768px to 940px
+            768px to 980px
             44px
             20px
           
           
             {{_i}}Default{{/i}}
-            940px and up
+            980px and up
             60px
             20px
           
@@ -314,7 +314,7 @@
   @media (max-width: 768px) { ... }
 
   // {{_i}}Portrait tablet to landscape and desktop{{/i}}
-  @media (min-width: 768px) and (max-width: 940px) { ... }
+  @media (min-width: 768px) and (max-width: 980px) { ... }
 
   // {{_i}}Large desktop{{/i}}
   @media (min-width: 1200px) { .. }