From 8ceea1f559fb432fc12df32153911de89caea36f Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 15 Jan 2012 11:26:06 -0800 Subject: [PATCH] fix some ie7 bugs, improve dropdowns for ie due to lack of a shadow, fix pager example code --- bootstrap.css | 9 ++++++--- bootstrap.min.css | 6 +++--- docs/assets/css/docs.css | 20 +++++++++----------- docs/components.html | 4 ++-- docs/index.html | 7 +++---- lib/dropdowns.less | 5 ++++- lib/tables.less | 2 +- 7 files changed, 28 insertions(+), 25 deletions(-) diff --git a/bootstrap.css b/bootstrap.css index 37241baf0f..7e2ba80237 100644 --- a/bootstrap.css +++ b/bootstrap.css @@ -6,7 +6,7 @@ * http://www.apache.org/licenses/LICENSE-2.0 * * Designed and built with all the love in the world @twitter by @mdo and @fat. - * Date: Sat Jan 14 23:33:26 PST 2012 + * Date: Sun Jan 15 00:04:02 PST 2012 */ html, body { margin: 0; @@ -1116,7 +1116,7 @@ table .header:after { visibility: hidden; } table .headerSortUp, table .headerSortDown { - background-color: rgba(141, 192, 219, 0.25); + background-color: #f7f7f9; text-shadow: 0 1px 1px rgba(255, 255, 255, 0.75); } table .header:hover:after { @@ -1440,6 +1440,7 @@ i { .dropdown .caret { margin-top: 8px; margin-left: 2px; + *margin-top: 7px; } .dropdown:hover .caret, .open.dropdown .caret { filter: alpha(opacity=100); @@ -1459,7 +1460,7 @@ i { margin: 0; list-style: none; background-color: #ffffff; - border-color: #999; + border-color: #ccc; border-color: rgba(0, 0, 0, 0.2); border-style: solid; border-width: 1px; @@ -1473,6 +1474,8 @@ i { -moz-background-clip: padding; background-clip: padding-box; zoom: 1; + *border-right-width: 2px; + *border-bottom-width: 2px; } .dropdown-menu .divider { height: 1px; diff --git a/bootstrap.min.css b/bootstrap.min.css index 6cc8946a5c..6b55745ea7 100644 --- a/bootstrap.min.css +++ b/bootstrap.min.css @@ -203,7 +203,7 @@ table .span10{float:none;width:764px;margin-left:0;} table .span11{float:none;width:844px;margin-left:0;} table .span12{float:none;width:924px;margin-left:0;} table .header{cursor:pointer;}table .header:after{content:"";float:right;margin-top:7px;border-width:0 4px 4px;border-style:solid;border-color:#000 transparent;visibility:hidden;} -table .headerSortUp,table .headerSortDown{background-color:rgba(141, 192, 219, 0.25);text-shadow:0 1px 1px rgba(255, 255, 255, 0.75);} +table .headerSortUp,table .headerSortDown{background-color:#f7f7f9;text-shadow:0 1px 1px rgba(255, 255, 255, 0.75);} table .header:hover:after{visibility:visible;} table .headerSortDown:after,table .headerSortDown:hover:after{visibility:visible;filter:alpha(opacity=60);-moz-opacity:0.6;opacity:0.6;} table .headerSortUp:after{border-bottom:none;border-left:4px solid transparent;border-right:4px solid transparent;border-top:4px solid #000;visibility:visible;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;filter:alpha(opacity=60);-moz-opacity:0.6;opacity:0.6;} @@ -300,9 +300,9 @@ i{background-image:url(docs/assets/img/glyphicons-halflings-sprite.png);backgrou .asterisk{background-position:-456px -96px;} .dropdown{position:relative;} .caret{display:inline-block;width:0;height:0;text-indent:-99999px;vertical-align:top;border-left:4px solid transparent;border-right:4px solid transparent;border-top:4px solid #000;filter:alpha(opacity=30);-moz-opacity:0.3;opacity:0.3;content:"\2193";} -.dropdown .caret{margin-top:8px;margin-left:2px;} +.dropdown .caret{margin-top:8px;margin-left:2px;*margin-top:7px;} .dropdown:hover .caret,.open.dropdown .caret{filter:alpha(opacity=100);-moz-opacity:1;opacity:1;} -.dropdown-menu{position:absolute;top:40px;z-index:1000;float:left;display:none;min-width:160px;max-width:220px;_width:160px;padding:4px 0;margin:0;list-style:none;background-color:#ffffff;border-color:#999;border-color:rgba(0, 0, 0, 0.2);border-style:solid;border-width:1px;-webkit-border-radius:0 0 5px 5px;-moz-border-radius:0 0 5px 5px;border-radius:0 0 5px 5px;-webkit-box-shadow:0 5px 10px rgba(0, 0, 0, 0.2);-moz-box-shadow:0 5px 10px rgba(0, 0, 0, 0.2);box-shadow:0 5px 10px rgba(0, 0, 0, 0.2);-webkit-background-clip:padding-box;-moz-background-clip:padding;background-clip:padding-box;zoom:1;}.dropdown-menu .divider{height:1px;margin:5px 1px;overflow:hidden;background-color:#e5e5e5;border-bottom:1px solid #ffffff;} +.dropdown-menu{position:absolute;top:40px;z-index:1000;float:left;display:none;min-width:160px;max-width:220px;_width:160px;padding:4px 0;margin:0;list-style:none;background-color:#ffffff;border-color:#ccc;border-color:rgba(0, 0, 0, 0.2);border-style:solid;border-width:1px;-webkit-border-radius:0 0 5px 5px;-moz-border-radius:0 0 5px 5px;border-radius:0 0 5px 5px;-webkit-box-shadow:0 5px 10px rgba(0, 0, 0, 0.2);-moz-box-shadow:0 5px 10px rgba(0, 0, 0, 0.2);box-shadow:0 5px 10px rgba(0, 0, 0, 0.2);-webkit-background-clip:padding-box;-moz-background-clip:padding;background-clip:padding-box;zoom:1;*border-right-width:2px;*border-bottom-width:2px;}.dropdown-menu .divider{height:1px;margin:5px 1px;overflow:hidden;background-color:#e5e5e5;border-bottom:1px solid #ffffff;} .dropdown-menu a{display:block;padding:3px 15px;clear:both;font-weight:normal;line-height:18px;color:#555555;white-space:nowrap;} .dropdown-menu li>a:hover,.dropdown-menu .active>a,.dropdown-menu .active>a:hover{color:#fff;text-decoration:none;background-color:#0088cc;} .dropdown.open .dropdown-toggle{color:#ffffff;background:#ccc;background:rgba(0, 0, 0, 0.3);} diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index 2f45032f2e..416b1830cd 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -130,6 +130,7 @@ section { /* Quick links -------------------------------------------------- */ .quick-links { + min-height: 30px; padding: 5px 20px; margin: 45px 0; list-style: none; @@ -141,11 +142,11 @@ section { -webkit-box-shadow: inset 0 1px 0 rgba(0,0,0,.03); -moz-box-shadow: inset 0 1px 0 rgba(0,0,0,.03); box-shadow: inset 0 1px 0 rgba(0,0,0,.03); + overflow: hidden; } .quick-links li { display: inline; margin: 0 5px; - line-height: 30px; } .quick-links .divider { color: #999; @@ -258,7 +259,7 @@ section { -ms-box-sizing: border-box; /* IE8 */ box-sizing: border-box; /* CSS3 spec*/ /* Hacks for IE7 to make this work just okay enough to function */ - *width: 90%; + *width: 270px; *height: 24px; } @@ -386,7 +387,7 @@ section { .popover-well .popover-menu-wrapper { height: 80px; } -img.large-bird { +.large-bird { margin: 5px 0 0 310px; opacity: .1; } @@ -467,9 +468,6 @@ form.well { /* Icons ------------------------- */ -.the-icons { - -} .the-icons i { display: block; margin-bottom: 5px; @@ -483,11 +481,11 @@ form.well { width: 100px; } -#javascript input[type='checkbox'] { -display: inline; -margin-left: 6px; -position: relative; -top: -1px; +#javascript input[type=checkbox] { + position: relative; + top: -1px; + display: inline; + margin-left: 6px; } diff --git a/docs/components.html b/docs/components.html index e88bd777c8..83a0244565 100644 --- a/docs/components.html +++ b/docs/components.html @@ -958,10 +958,10 @@ 
 <ul class="pager">
-  <li>
+  <li class="previous">
     <a href="#">&larr; Older</a>
   </li>
-  <li>
+  <li class="next">
     <a href="#">Newer &rarr;</a>
   </li>
 </ul>
diff --git a/docs/index.html b/docs/index.html
index cb924bae6d..736352b439 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -119,7 +119,6 @@
             

               Download on GitHub
               Get started →
-              Currently v2.0.0
             

 
             

@@ -145,10 +144,10 @@
           
  • Changelog
    • 
           
  • ·
    • 
           
  • 
-            
+            
           
    • 
           
  • 
-            
+            
           
    •