diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip index 4a9a9eba5a..26436c0a2d 100644 Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ diff --git a/docs/assets/css/bootstrap-responsive.css b/docs/assets/css/bootstrap-responsive.css index d01791cc5c..780719e650 100644 --- a/docs/assets/css/bootstrap-responsive.css +++ b/docs/assets/css/bootstrap-responsive.css @@ -7,6 +7,16 @@ * * Designed and built with all the love in the world @twitter by @mdo and @fat. */ +.clearfix { + *zoom: 1; +} +.clearfix:before, .clearfix:after { + display: table; + content: ""; +} +.clearfix:after { + clear: both; +} .hidden { display: none; visibility: hidden; @@ -102,7 +112,7 @@ margin: 0; } } -@media (min-width: 768px) and (max-width: 980px) { +@media (min-width: 768px) and (max-width: 979px) { .row { margin-left: -20px; *zoom: 1; @@ -278,7 +288,7 @@ width: 714px; } } -@media (max-width: 980px) { +@media (max-width: 979px) { body { padding-top: 0; } diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 25c04944a1..b5b5f8475b 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -33,7 +33,7 @@ html { -ms-text-size-adjust: 100%; } a:focus { - outline: thin dotted; + outline: thin dotted #333; outline: 5px auto -webkit-focus-ring-color; outline-offset: -2px; } @@ -94,6 +94,16 @@ textarea { overflow: auto; vertical-align: top; } +.clearfix { + *zoom: 1; +} +.clearfix:before, .clearfix:after { + display: table; + content: ""; +} +.clearfix:after { + clear: both; +} body { margin: 0; font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; @@ -488,6 +498,7 @@ pre { white-space: pre; white-space: pre-wrap; word-break: break-all; + word-wrap: break-word; } pre.prettyprint { margin-bottom: 18px; @@ -530,11 +541,16 @@ input, button, select, textarea { - font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; font-size: 13px; font-weight: normal; line-height: 18px; } +input, +button, +select, +textarea { + font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; +} label { display: block; margin-bottom: 5px; @@ -573,11 +589,16 @@ input[type="image"], input[type="checkbox"], input[type="radio"] { /* IE7 */ line-height: normal; - border: 0; cursor: pointer; -webkit-border-radius: 0; -moz-border-radius: 0; border-radius: 0; + border: 0 \9; + /* IE9 and down */ + +} +input[type="image"] { + border: 0; } input[type="file"] { width: auto; @@ -670,7 +691,7 @@ select:focus { -webkit-box-shadow: none; -moz-box-shadow: none; box-shadow: none; - outline: thin dotted; + outline: thin dotted #333; outline: 5px auto -webkit-focus-ring-color; outline-offset: -2px; } @@ -1744,7 +1765,7 @@ table .span12 { transition: background-position 0.1s linear; } .btn:focus { - outline: thin dotted; + outline: thin dotted #333; outline: 5px auto -webkit-focus-ring-color; outline-offset: -2px; } @@ -1786,6 +1807,11 @@ table .span12 { .btn-small [class^="icon-"] { margin-top: -1px; } +.btn-mini { + padding: 2px 6px; + font-size: 11px; + line-height: 14px; +} .btn-primary, .btn-primary:hover, .btn-warning, diff --git a/docs/assets/js/bootstrap-alert.js b/docs/assets/js/bootstrap-alert.js index 4a65b135ab..1d69c5f533 100644 --- a/docs/assets/js/bootstrap-alert.js +++ b/docs/assets/js/bootstrap-alert.js @@ -51,11 +51,14 @@ $parent.length || ($parent = $this.hasClass('alert') ? $this : $this.parent()) - $parent.removeClass('in') + $parent + .trigger('close') + .removeClass('in') function removeElement() { - $parent.remove() - $parent.trigger('closed') + $parent + .trigger('closed') + .remove() } $.support.transition && $parent.hasClass('fade') ? @@ -88,4 +91,4 @@ $('body').on('click.alert.data-api', dismiss, Alert.prototype.close) }) -}( window.jQuery ) +}( window.jQuery ); \ No newline at end of file diff --git a/docs/assets/js/bootstrap-button.js b/docs/assets/js/bootstrap-button.js index a3f4657e8d..89101ed7be 100644 --- a/docs/assets/js/bootstrap-button.js +++ b/docs/assets/js/bootstrap-button.js @@ -95,4 +95,4 @@ }) }) -}( window.jQuery ) +}( window.jQuery ); \ No newline at end of file diff --git a/docs/assets/js/bootstrap-carousel.js b/docs/assets/js/bootstrap-carousel.js index 2f47edb8dc..bad4f46f46 100644 --- a/docs/assets/js/bootstrap-carousel.js +++ b/docs/assets/js/bootstrap-carousel.js @@ -61,6 +61,7 @@ , pause: function () { clearInterval(this.interval) + this.interval = null return this } @@ -82,6 +83,8 @@ , fallback = type == 'next' ? 'first' : 'last' , that = this + if (!$next.length) return + this.sliding = true isCycling && this.pause() @@ -151,4 +154,4 @@ }) }) -}( window.jQuery ) +}( window.jQuery ); \ No newline at end of file diff --git a/docs/assets/js/bootstrap-collapse.js b/docs/assets/js/bootstrap-collapse.js index 8134cc42ff..53bcd7c40f 100644 --- a/docs/assets/js/bootstrap-collapse.js +++ b/docs/assets/js/bootstrap-collapse.js @@ -133,4 +133,4 @@ }) }) -}( window.jQuery ) +}( window.jQuery ); \ No newline at end of file diff --git a/docs/assets/js/bootstrap-dropdown.js b/docs/assets/js/bootstrap-dropdown.js index 48d3ce0f85..ce65aa3b54 100644 --- a/docs/assets/js/bootstrap-dropdown.js +++ b/docs/assets/js/bootstrap-dropdown.js @@ -89,4 +89,4 @@ $('body').on('click.dropdown.data-api', toggle, Dropdown.prototype.toggle) }) -}( window.jQuery ) +}( window.jQuery ); \ No newline at end of file diff --git a/docs/assets/js/bootstrap-modal.js b/docs/assets/js/bootstrap-modal.js index ffbed0d2ef..0a69b6a2f8 100644 --- a/docs/assets/js/bootstrap-modal.js +++ b/docs/assets/js/bootstrap-modal.js @@ -207,4 +207,4 @@ }) }) -}( window.jQuery ) +}( window.jQuery ); \ No newline at end of file diff --git a/docs/assets/js/bootstrap-popover.js b/docs/assets/js/bootstrap-popover.js index 35ff9d0ab6..4df81fee94 100644 --- a/docs/assets/js/bootstrap-popover.js +++ b/docs/assets/js/bootstrap-popover.js @@ -92,4 +92,4 @@ , template: '

' }) -}( window.jQuery ) +}( window.jQuery ); \ No newline at end of file diff --git a/docs/assets/js/bootstrap-scrollspy.js b/docs/assets/js/bootstrap-scrollspy.js index e8bd0715c6..f9aba137b9 100644 --- a/docs/assets/js/bootstrap-scrollspy.js +++ b/docs/assets/js/bootstrap-scrollspy.js @@ -122,4 +122,4 @@ }) }) -}( window.jQuery ) +}( window.jQuery ); \ No newline at end of file diff --git a/docs/assets/js/bootstrap-tab.js b/docs/assets/js/bootstrap-tab.js index f19db5da1e..78258c6a07 100644 --- a/docs/assets/js/bootstrap-tab.js +++ b/docs/assets/js/bootstrap-tab.js @@ -127,4 +127,4 @@ }) }) -}( window.jQuery ) +}( window.jQuery ); \ No newline at end of file diff --git a/docs/assets/js/bootstrap-tooltip.js b/docs/assets/js/bootstrap-tooltip.js index 21f2311fb2..e1c8b2dc27 100644 --- a/docs/assets/js/bootstrap-tooltip.js +++ b/docs/assets/js/bootstrap-tooltip.js @@ -267,4 +267,4 @@ , template: '
' } -}( window.jQuery ) +}( window.jQuery ); \ No newline at end of file diff --git a/docs/assets/js/bootstrap-transition.js b/docs/assets/js/bootstrap-transition.js index 956350bd0a..0b13eccd4c 100644 --- a/docs/assets/js/bootstrap-transition.js +++ b/docs/assets/js/bootstrap-transition.js @@ -47,5 +47,5 @@ })() }) - -}( window.jQuery ) + +}( window.jQuery ); \ No newline at end of file diff --git a/docs/assets/js/bootstrap-typeahead.js b/docs/assets/js/bootstrap-typeahead.js index 1426185afc..e0be49fecd 100644 --- a/docs/assets/js/bootstrap-typeahead.js +++ b/docs/assets/js/bootstrap-typeahead.js @@ -268,4 +268,4 @@ }) }) -}( window.jQuery ) +}( window.jQuery ); \ No newline at end of file diff --git a/docs/base-css.html b/docs/base-css.html index d67d1bd554..c04dc7daa9 100644 --- a/docs/base-css.html +++ b/docs/base-css.html @@ -1266,37 +1266,37 @@ For example, <code>section</code> should be wrapped as inline. - Default + .btn Standard gray button with gradient - Primary + .btn-primary Provides extra visual weight and identifies the primary action in a set of buttons - Info + .btn-info Used as an alternate to the default styles - Success + .btn-success Indicates a successful or positive action - Warning + .btn-warning Indicates caution should be taken with this action - Danger + .btn-danger Indicates a dangerous or potentially negative action - Inverse + .btn-inverse Alternate dark gray button, not tied to a semantic action or use @@ -1313,7 +1313,7 @@ For example, <code>section</code> should be wrapped as inline.

Multiple sizes

-

Fancy larger or smaller buttons? Add .btn-large or .btn-small for two additional sizes.

+

Fancy larger or smaller buttons? Add .btn-large, .btn-small, or .btn-mini for two additional sizes.

@@ -1322,6 +1322,10 @@ For example, <code>section</code> should be wrapped as inline.

+

+ + +


Disabled state

For disabled buttons, add the .disabled class to links and the disabled attribute for <button> elements.

diff --git a/docs/components.html b/docs/components.html index bab4f9764e..617b21a416 100644 --- a/docs/components.html +++ b/docs/components.html @@ -864,14 +864,14 @@ <div class="navbar"> <div class="navbar-inner"> <div class="container"> - + <!-- .btn-navbar is used as the toggle for collapsed navbar content --> <a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse"> <span class="icon-bar"></span> <span class="icon-bar"></span> <span class="icon-bar"></span> </a> - + <!-- Be sure to leave the brand out there if you want it shown --> <a class="brand" href="#">Project name</a> @@ -900,11 +900,19 @@ <li><a href="#">Link</a></li> <li><a href="#">Link</a></li> </ul> + +

You can easily add dividers to your nav links with an empty list item and a simple class. Just add this between links:

+
+<ul class="nav">
+  ...
+  <li class="divider-vertical"></li>
+  ...
+</ul>

Component alignment

To align a nav, search form, or text, use the .pull-left or .pull-right utility classes. Both classes will add a CSS float in the specified direction.

Adding dropdowns

-

Adding dropdowns to the nav is super simple, but does require the use of our javascript plugin.

+

Adding dropdowns to the nav is super simple, but does require the use of our javascript plugin.

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

Get the javascript →

+

Get the javascript →

diff --git a/docs/javascript.html b/docs/javascript.html index 4ab4f5af3b..612724c798 100644 --- a/docs/javascript.html +++ b/docs/javascript.html @@ -289,7 +289,7 @@ 
-<div class="modal">
+<div class="modal" id="myModal">
   <div class="modal-header">
     <a class="close" data-dismiss="modal">×</a>
     <h3>Modal header</h3>
diff --git a/docs/scaffolding.html b/docs/scaffolding.html
index 18ec5fb422..525c1152fc 100644
--- a/docs/scaffolding.html
+++ b/docs/scaffolding.html
@@ -444,7 +444,7 @@
           
           
             Landscape tablets
-            768px to 980px
+            768px to 979px
             42px
             20px
           
diff --git a/docs/templates/pages/base-css.mustache b/docs/templates/pages/base-css.mustache
index 4b2f379c58..acb9cdcb2d 100644
--- a/docs/templates/pages/base-css.mustache
+++ b/docs/templates/pages/base-css.mustache
@@ -1190,37 +1190,37 @@
     
     
       
-        {{_i}}Default{{/i}}
+        
         .btn
         {{_i}}Standard gray button with gradient{{/i}}
       
       
-        {{_i}}Primary{{/i}}
+        
         .btn-primary
         {{_i}}Provides extra visual weight and identifies the primary action in a set of buttons{{/i}}
       
       
-        {{_i}}Info{{/i}}
+        
         .btn-info
         {{_i}}Used as an alternate to the default styles{{/i}}
       
       
-        {{_i}}Success{{/i}}
+        
         .btn-success
         {{_i}}Indicates a successful or positive action{{/i}}
       
       
-        {{_i}}Warning{{/i}}
+        
         .btn-warning
         {{_i}}Indicates caution should be taken with this action{{/i}}
       
       
-        {{_i}}Danger{{/i}}
+        
         .btn-danger
         {{_i}}Indicates a dangerous or potentially negative action{{/i}}
       
   	  
-        {{_i}}Inverse{{/i}}
+        
         .btn-inverse
         {{_i}}Alternate dark gray button, not tied to a semantic action or use{{/i}}
       
@@ -1237,7 +1237,7 @@
     
     

       
{{_i}}Multiple sizes{{/i}}

-      
{{_i}}Fancy larger or smaller buttons? Add .btn-large or .btn-small for two additional sizes.{{/i}}

+      
{{_i}}Fancy larger or smaller buttons? Add .btn-large, .btn-small, or .btn-mini for two additional sizes.{{/i}}

       

         
         
@@ -1246,6 +1246,10 @@
         
         
       

+      

+        
+        
+      

       

       
{{_i}}Disabled state{{/i}}

       
{{_i}}For disabled buttons, add the .disabled class to links and the disabled attribute for <button> elements.{{/i}}

diff --git a/docs/templates/pages/components.mustache b/docs/templates/pages/components.mustache
index 8649a9c286..9f9d08e35e 100644
--- a/docs/templates/pages/components.mustache
+++ b/docs/templates/pages/components.mustache
@@ -788,14 +788,14 @@
 <div class="navbar">
   <div class="navbar-inner">
     <div class="container">
-      
+
       <!-- {{_i}}.btn-navbar is used as the toggle for collapsed navbar content{{/i}} -->
       <a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
         <span class="icon-bar"></span>
         <span class="icon-bar"></span>
         <span class="icon-bar"></span>
       </a>
-      
+
       <!-- {{_i}}Be sure to leave the brand out there if you want it shown{{/i}} -->
       <a class="brand" href="#">{{_i}}Project name{{/i}}</a>
 
@@ -824,11 +824,19 @@
   <li><a href="#">{{_i}}Link{{/i}}</a></li>
   <li><a href="#">{{_i}}Link{{/i}}</a></li>
 </ul>
+
+

{{_i}}You can easily add dividers to your nav links with an empty list item and a simple class. Just add this between links:{{/i}}

+
+<ul class="nav">
+  ...
+  <li class="divider-vertical"></li>
+  ...
+</ul>

{{_i}}Component alignment{{/i}}

{{_i}}To align a nav, search form, or text, use the .pull-left or .pull-right utility classes. Both classes will add a CSS float in the specified direction.{{/i}}

{{_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">
@@ -844,7 +852,7 @@
   </li>
 </ul>
-

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

+

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

diff --git a/docs/templates/pages/javascript.mustache b/docs/templates/pages/javascript.mustache index c072e306bd..ac989f3ed7 100644 --- a/docs/templates/pages/javascript.mustache +++ b/docs/templates/pages/javascript.mustache @@ -213,7 +213,7 @@ 
-<div class="modal">
+<div class="modal" id="myModal">
   <div class="modal-header">
     <a class="close" data-dismiss="modal">×</a>
     <h3>Modal header</h3>
diff --git a/docs/templates/pages/scaffolding.mustache b/docs/templates/pages/scaffolding.mustache
index cc3cceea78..50c776e2de 100644
--- a/docs/templates/pages/scaffolding.mustache
+++ b/docs/templates/pages/scaffolding.mustache
@@ -368,7 +368,7 @@
           
           
             {{_i}}Landscape tablets{{/i}}
-            768px to 980px
+            768px to 979px
             42px
             20px
           
diff --git a/docs/templates/pages/upgrading.mustache b/docs/templates/pages/upgrading.mustache
index ebe70bcdd5..5a82e2dc98 100644
--- a/docs/templates/pages/upgrading.mustache
+++ b/docs/templates/pages/upgrading.mustache
@@ -39,7 +39,7 @@
     
+  
 
 
 
@@ -179,13 +179,10 @@
     
  • {{_i}}The animate option was renamed to animation.{{/i}}
    • 
     
  • {{_i}}The html option was removed, as the tooltips default to allowing HTML now.{{/i}}
    • 
   
-  
    {{_i}}Tooltips{{/i}}
    
-  
   
    {{_i}}Popovers{{/i}}
    
   
   
    {{_i}}New plugins{{/i}}
    
   
 
 
 
@@ -255,13 +255,10 @@
     
  • The animate option was renamed to animation.
    • 
     
  • The html option was removed, as the tooltips default to allowing HTML now.
    • 
   
-  
    Tooltips
    
-  
   
    Popovers
    
   
   
    New plugins