From 64ea59234f30f51ab5497830d1825c7e043a575e Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 13 Feb 2012 08:18:19 -0800 Subject: change up fonts on form elements to remove unnecessary font-family on label element, per #1950 --- docs/assets/bootstrap.zip | Bin 53155 -> 53163 bytes docs/assets/css/bootstrap.css | 7 ++++++- 2 files changed, 6 insertions(+), 1 deletion(-) (limited to 'docs') diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip index b38db2772..464f1d0d0 100644 Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index e52d2f0cf..57c30ab63 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -530,11 +530,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; -- cgit v1.2.3 From 6e77c9d1233c1621deeaa2dd00e6eca3fd618610 Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Mon, 13 Feb 2012 18:41:02 -0800 Subject: add semicolons to the end of js files --- docs/assets/bootstrap.zip | Bin 52712 -> 52709 bytes docs/assets/js/bootstrap-alert.js | 2 +- docs/assets/js/bootstrap-button.js | 2 +- docs/assets/js/bootstrap-carousel.js | 2 +- docs/assets/js/bootstrap-collapse.js | 2 +- docs/assets/js/bootstrap-dropdown.js | 2 +- docs/assets/js/bootstrap-modal.js | 2 +- docs/assets/js/bootstrap-popover.js | 2 +- docs/assets/js/bootstrap-scrollspy.js | 2 +- docs/assets/js/bootstrap-tab.js | 2 +- docs/assets/js/bootstrap-tooltip.js | 2 +- docs/assets/js/bootstrap-transition.js | 4 ++-- docs/assets/js/bootstrap-typeahead.js | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) (limited to 'docs') diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip index 073df93f0..ca2768c6e 100644 Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ diff --git a/docs/assets/js/bootstrap-alert.js b/docs/assets/js/bootstrap-alert.js index 4a65b135a..56d89c298 100644 --- a/docs/assets/js/bootstrap-alert.js +++ b/docs/assets/js/bootstrap-alert.js @@ -88,4 +88,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 a3f4657e8..89101ed7b 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 2f47edb8d..3c0f1df83 100644 --- a/docs/assets/js/bootstrap-carousel.js +++ b/docs/assets/js/bootstrap-carousel.js @@ -151,4 +151,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 8134cc42f..53bcd7c40 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 48d3ce0f8..ce65aa3b5 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 ffbed0d2e..0a69b6a2f 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 35ff9d0ab..4df81fee9 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 e8bd0715c..f9aba137b 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 f19db5da1..78258c6a0 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 21f2311fb..e1c8b2dc2 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 956350bd0..0b13eccd4 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 1426185af..e0be49fec 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 -- cgit v1.2.3 From f9b578260f8898748a2de10bc0bec74699ec5c10 Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Thu, 16 Feb 2012 20:05:09 -0800 Subject: rebuild alerts --- docs/assets/bootstrap.zip | Bin 53160 -> 53167 bytes docs/assets/js/bootstrap-alert.js | 9 ++++++--- 2 files changed, 6 insertions(+), 3 deletions(-) (limited to 'docs') diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip index 2041e410b..e433b7305 100644 Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ diff --git a/docs/assets/js/bootstrap-alert.js b/docs/assets/js/bootstrap-alert.js index 56d89c298..1d69c5f53 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') ? -- cgit v1.2.3 From e730f8adb562ccb885d48fea6f8f075530ef53d8 Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Thu, 16 Feb 2012 20:22:01 -0800 Subject: null out interval so that pause doesn't resume on next or prev --- docs/assets/bootstrap.zip | Bin 53167 -> 53181 bytes docs/assets/js/bootstrap-carousel.js | 1 + 2 files changed, 1 insertion(+) (limited to 'docs') diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip index e433b7305..dacefe63f 100644 Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ diff --git a/docs/assets/js/bootstrap-carousel.js b/docs/assets/js/bootstrap-carousel.js index 3c0f1df83..374697994 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 } -- cgit v1.2.3 From 6da16a6def486413b1897540aff1f335638ed5e6 Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Thu, 16 Feb 2012 20:30:00 -0800 Subject: fix dropdown links --- docs/templates/pages/components.mustache | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'docs') diff --git a/docs/templates/pages/components.mustache b/docs/templates/pages/components.mustache index 0b55e60f0..76c78d141 100644 --- a/docs/templates/pages/components.mustache +++ b/docs/templates/pages/components.mustache @@ -767,14 +767,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> @@ -807,7 +807,7 @@

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

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

+

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

-- cgit v1.2.3 From 1520ec446ce9fc748efa3390a58c447841c48e73 Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Thu, 16 Feb 2012 20:30:18 -0800 Subject: rebuild bro --- docs/assets/bootstrap.zip | Bin 53181 -> 53181 bytes docs/components.html | 8 ++++---- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'docs') diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip index dacefe63f..e282ec6fd 100644 Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ diff --git a/docs/components.html b/docs/components.html index d0b5de632..af00ece97 100644 --- a/docs/components.html +++ b/docs/components.html @@ -843,14 +843,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> @@ -883,7 +883,7 @@

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">
@@ -899,7 +899,7 @@
   </li>
 </ul>
-

Get the javascript →

+

Get the javascript →

-- cgit v1.2.3 From b3e4e5ae2212c4bda6424815871499d9c7693ee6 Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Thu, 16 Feb 2012 20:33:15 -0800 Subject: add idea to modal markup exmaple --- docs/assets/bootstrap.zip | Bin 53181 -> 53181 bytes docs/javascript.html | 2 +- docs/templates/pages/javascript.mustache | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) (limited to 'docs') diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip index e282ec6fd..a68034b6a 100644 Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ diff --git a/docs/javascript.html b/docs/javascript.html index 4ab4f5af3..612724c79 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/templates/pages/javascript.mustache b/docs/templates/pages/javascript.mustache
index c072e306b..ac989f3ed 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>
-- 
cgit v1.2.3


From 9d12b2d60168505fdb68672f6fe7992bb264da90 Mon Sep 17 00:00:00 2001
From: Jacob Thornton 
Date: Thu, 16 Feb 2012 20:43:57 -0800
Subject: don't try next if not next

---
 docs/assets/bootstrap.zip            | Bin 53181 -> 53191 bytes
 docs/assets/js/bootstrap-carousel.js |   2 ++
 2 files changed, 2 insertions(+)

(limited to 'docs')

diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip
index a68034b6a..0aad46dec 100644
Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ
diff --git a/docs/assets/js/bootstrap-carousel.js b/docs/assets/js/bootstrap-carousel.js
index 374697994..bad4f46f4 100644
--- a/docs/assets/js/bootstrap-carousel.js
+++ b/docs/assets/js/bootstrap-carousel.js
@@ -83,6 +83,8 @@
         , fallback  = type == 'next' ? 'first' : 'last'
         , that = this
 
+      if (!$next.length) return
+
       this.sliding = true
 
       isCycling && this.pause()
-- 
cgit v1.2.3


From c3d3cf7262ff53215f11ec4772c9c787643b33e2 Mon Sep 17 00:00:00 2001
From: Jacob Thornton 
Date: Thu, 16 Feb 2012 20:46:35 -0800
Subject: add note about popover placement

---
 docs/templates/pages/upgrading.mustache | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

(limited to 'docs')

diff --git a/docs/templates/pages/upgrading.mustache b/docs/templates/pages/upgrading.mustache
index ebe70bcdd..5a82e2dc9 100644
--- a/docs/templates/pages/upgrading.mustache
+++ b/docs/templates/pages/upgrading.mustache
@@ -39,7 +39,7 @@
   
    
     
  • {{_i}}Media queries added for basic support across mobile and tablet devices{{/i}}
     
  • {{_i}}Responsive CSS is compiled separately, as bootstrap-responsive.css{{/i}}
    • 
-  
  
+  
 
 
 
@@ -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}}Values for placement option changed from above and below to top and bottom. (Affects popovers, too.){{/i}}
      • 
-  
    
   
    {{_i}}Popovers{{/i}}
    
   
      
     
    • {{_i}}Child elements now properly namespaced: .title to .popover-title, .inner to .popover-inner, and .content to .popover-content.{{/i}}
      • 
+    
    • {{_i}}The placement option value that was below is now bottom, and above is now top.{{/i}}
      • 
   
    
   
    {{_i}}New plugins{{/i}}
    
   
      
-- 
cgit v1.2.3


From 0369c1fcfc22530171fdf6a1d6400767dc13f609 Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Thu, 16 Feb 2012 21:04:16 -0800
Subject: add mention of navbar vertical divider in docs

---
 docs/assets/bootstrap.zip                | Bin 53191 -> 53191 bytes
 docs/components.html                     |   8 ++++++++
 docs/templates/pages/components.mustache |   8 ++++++++
 docs/upgrading.html                      |   7 ++-----
 4 files changed, 18 insertions(+), 5 deletions(-)

(limited to 'docs')

diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip
index 0aad46dec..7aee4471a 100644
Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ
diff --git a/docs/components.html b/docs/components.html
index af00ece97..cf11e6998 100644
--- a/docs/components.html
+++ b/docs/components.html
@@ -879,6 +879,14 @@
   <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.

    diff --git a/docs/templates/pages/components.mustache b/docs/templates/pages/components.mustache index 76c78d141..1887b6f77 100644 --- a/docs/templates/pages/components.mustache +++ b/docs/templates/pages/components.mustache @@ -803,6 +803,14 @@ <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}}

    diff --git a/docs/upgrading.html b/docs/upgrading.html index 0c9ab1673..f56f22545 100644 --- a/docs/upgrading.html +++ b/docs/upgrading.html @@ -115,7 +115,7 @@
    • Media queries added for basic support across mobile and tablet devices
    • Responsive CSS is compiled separately, as bootstrap-responsive.css
      • -
    + @@ -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

    -
      -
    • Values for placement option changed from above and below to top and bottom. (Affects popovers, too.)
      • -

    Popovers

    • Child elements now properly namespaced: .title to .popover-title, .inner to .popover-inner, and .content to .popover-content.
      • +
    • The placement option value that was below is now bottom, and above is now top.

    New plugins

      -- cgit v1.2.3 From 489276f5be328773e4e4dbd7d6d8e326d3135437 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 16 Feb 2012 21:08:52 -0800 Subject: fix responsive media queries to use 979 and 980 where appropro --- docs/assets/bootstrap.zip | Bin 53191 -> 53195 bytes docs/assets/css/bootstrap-responsive.css | 4 ++-- docs/scaffolding.html | 2 +- docs/templates/pages/scaffolding.mustache | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) (limited to 'docs') diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip index 7aee4471a..644dd58f7 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 d01791cc5..a4277a26f 100644 --- a/docs/assets/css/bootstrap-responsive.css +++ b/docs/assets/css/bootstrap-responsive.css @@ -102,7 +102,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 +278,7 @@ width: 714px; } } -@media (max-width: 980px) { +@media (max-width: 979px) { body { padding-top: 0; } diff --git a/docs/scaffolding.html b/docs/scaffolding.html index 18ec5fb42..525c1152f 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/scaffolding.mustache b/docs/templates/pages/scaffolding.mustache index cc3cceea7..50c776e2d 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 -- cgit v1.2.3 From 61e2201c64a9a61792680c2b1d236b0a753ed182 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 16 Feb 2012 21:25:40 -0800 Subject: fix buttons focus state and swap a buttons for button buttons --- docs/assets/bootstrap.zip | Bin 53195 -> 53198 bytes docs/assets/css/bootstrap.css | 6 +++--- docs/base-css.html | 14 +++++++------- docs/templates/pages/base-css.mustache | 14 +++++++------- 4 files changed, 17 insertions(+), 17 deletions(-) (limited to 'docs') diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip index 644dd58f7..71552e7f8 100644 Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 57c30ab63..e16383b1c 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; } @@ -675,7 +675,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; } @@ -1749,7 +1749,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; } diff --git a/docs/base-css.html b/docs/base-css.html index d67d1bd55..7ab18108c 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 diff --git a/docs/templates/pages/base-css.mustache b/docs/templates/pages/base-css.mustache index 4b2f379c5..f3d18ffd0 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}} -- cgit v1.2.3 From 268e7d67abb32ed5cfc575c71f03d635672e781c Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 16 Feb 2012 21:28:16 -0800 Subject: add mini buttons per #1971 --- docs/assets/bootstrap.zip | Bin 53198 -> 53227 bytes docs/assets/css/bootstrap.css | 5 +++++ docs/base-css.html | 6 +++++- docs/templates/pages/base-css.mustache | 6 +++++- 4 files changed, 15 insertions(+), 2 deletions(-) (limited to 'docs') diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip index 71552e7f8..5d59b6d7f 100644 Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index e16383b1c..d6441d133 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -1791,6 +1791,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/base-css.html b/docs/base-css.html index 7ab18108c..c04dc7daa 100644 --- a/docs/base-css.html +++ b/docs/base-css.html @@ -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/templates/pages/base-css.mustache b/docs/templates/pages/base-css.mustache index f3d18ffd0..acb9cdcb2 100644 --- a/docs/templates/pages/base-css.mustache +++ b/docs/templates/pages/base-css.mustache @@ -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}}

      -- cgit v1.2.3 From 6f6adfb52fc2f6043f84ac4fab876592c00b2894 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 16 Feb 2012 22:04:11 -0800 Subject: change clearfix mixin to drop parens that prevent it from being a class, too --- docs/assets/bootstrap.zip | Bin 53227 -> 53322 bytes docs/assets/css/bootstrap-responsive.css | 10 ++++++++++ docs/assets/css/bootstrap.css | 10 ++++++++++ 3 files changed, 20 insertions(+) (limited to 'docs') diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip index 5d59b6d7f..4ef9191d6 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 a4277a26f..780719e65 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; diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index d6441d133..74d7308be 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -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; -- cgit v1.2.3 From 091622644a0c619e1afbb21041c141da30df76b7 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 16 Feb 2012 22:34:30 -0800 Subject: bring back checkbox borders to iOS by conditionalizing the border: 0; on it to IE7-9; fix word break on pre in IE --- docs/assets/bootstrap.zip | Bin 53322 -> 53357 bytes docs/assets/css/bootstrap.css | 8 +++++++- 2 files changed, 7 insertions(+), 1 deletion(-) (limited to 'docs') diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip index 4ef9191d6..622ad0117 100644 Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 74d7308be..ed32b339f 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -498,6 +498,7 @@ pre { white-space: pre; white-space: pre-wrap; word-break: break-all; + word-wrap: break-word; } pre.prettyprint { margin-bottom: 18px; @@ -588,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; -- cgit v1.2.3