From 1fc4491cd6f18809468dfc73ce5e55ac87352d1d Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Sun, 21 Aug 2011 11:22:33 -0700 Subject: [PATCH 01/38] simplify drop down logic - fix color of search hover for ie --- bootstrap-1.0.0.css | 6 +++--- bootstrap-1.0.0.min.css | 4 ++-- docs/assets/js/application.js | 21 ++++----------------- lib/patterns.less | 4 ++-- 4 files changed, 11 insertions(+), 24 deletions(-) diff --git a/bootstrap-1.0.0.css b/bootstrap-1.0.0.css index a2ba3c38f4..3a83c6c315 100644 --- a/bootstrap-1.0.0.css +++ b/bootstrap-1.0.0.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 Aug 20 18:40:26 PDT 2011 + * Date: Sun Aug 21 11:20:03 PDT 2011 */ /* Reset.less * Props to Eric Meyer (meyerweb.com) for his CSS reset file. We're using an adapted version here that cuts out some of the reset HTML elements we will never need here (i.e., dfn, samp, etc). @@ -1145,7 +1145,7 @@ div.topbar form { opacity: 1; } div.topbar form input { - background-color: #bfbfbf; + background-color: #444; background-color: rgba(255, 255, 255, 0.3); font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; font-size: normal; @@ -1173,7 +1173,7 @@ div.topbar form input::-webkit-input-placeholder { color: #e6e6e6; } div.topbar form input:hover { - background-color: #444; + background-color: #bfbfbf; background-color: rgba(255, 255, 255, 0.5); color: #fff; } diff --git a/bootstrap-1.0.0.min.css b/bootstrap-1.0.0.min.css index 6b0b218310..7d3ba191ff 100644 --- a/bootstrap-1.0.0.min.css +++ b/bootstrap-1.0.0.min.css @@ -156,9 +156,9 @@ table.zebra-striped th.headerSortUp.purple,table.zebra-striped th.headerSortDown div.topbar{background-color:#222222;background-repeat:repeat-x;background-image:-khtml-gradient(linear, left top, left bottom, from(#333333), to(#222222));background-image:-moz-linear-gradient(#333333, #222222);background-image:-ms-linear-gradient(#333333, #222222);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #333333), color-stop(100%, #222222));background-image:-webkit-linear-gradient(#333333, #222222);background-image:-o-linear-gradient(#333333, #222222);-ms-filter:"progid:DXImageTransform.Microsoft.gradient(startColorstr='#333333', endColorstr='#222222', GradientType=0)";filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#333333', endColorstr='#222222', GradientType=0);background-image:linear-gradient(#333333, #222222);height:40px;position:fixed;top:0;left:0;right:0;z-index:10000;overflow:visible;-webkit-box-shadow:0 1px 3px rgba(0, 0, 0, 0.25),inset 0 -1px 0 rgba(0, 0, 0, 0.1);-moz-box-shadow:0 1px 3px rgba(0, 0, 0, 0.25),inset 0 -1px 0 rgba(0, 0, 0, 0.1);box-shadow:0 1px 3px rgba(0, 0, 0, 0.25),inset 0 -1px 0 rgba(0, 0, 0, 0.1);}div.topbar a{color:#bfbfbf;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);} div.topbar a:hover,div.topbar ul li.active a{background-color:#333;background-color:rgba(255, 255, 255, 0.05);color:#ffffff;text-decoration:none;} div.topbar h3 a{float:left;display:block;padding:8px 20px 12px;margin-left:-20px;color:#ffffff;font-size:20px;font-weight:200;line-height:1;} -div.topbar form{float:left;margin:5px 0 0 0;position:relative;filter:alpha(opacity=100);-khtml-opacity:1;-moz-opacity:1;opacity:1;}div.topbar form input{background-color:#bfbfbf;background-color:rgba(255, 255, 255, 0.3);font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:normal;font-weight:13px;line-height:1;width:220px;padding:4px 9px;color:#fff;color:rgba(255, 255, 255, 0.75);border:1px solid #111;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-webkit-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1),0 1px 0px rgba(255, 255, 255, 0.25);-moz-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1),0 1px 0px rgba(255, 255, 255, 0.25);box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1),0 1px 0px rgba(255, 255, 255, 0.25);-webkit-transition:none;-moz-transition:none;transition:none;}div.topbar form input:-moz-placeholder{color:#e6e6e6;} +div.topbar form{float:left;margin:5px 0 0 0;position:relative;filter:alpha(opacity=100);-khtml-opacity:1;-moz-opacity:1;opacity:1;}div.topbar form input{background-color:#444;background-color:rgba(255, 255, 255, 0.3);font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:normal;font-weight:13px;line-height:1;width:220px;padding:4px 9px;color:#fff;color:rgba(255, 255, 255, 0.75);border:1px solid #111;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-webkit-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1),0 1px 0px rgba(255, 255, 255, 0.25);-moz-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1),0 1px 0px rgba(255, 255, 255, 0.25);box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1),0 1px 0px rgba(255, 255, 255, 0.25);-webkit-transition:none;-moz-transition:none;transition:none;}div.topbar form input:-moz-placeholder{color:#e6e6e6;} div.topbar form input::-webkit-input-placeholder{color:#e6e6e6;} -div.topbar form input:hover{background-color:#444;background-color:rgba(255, 255, 255, 0.5);color:#fff;} +div.topbar form input:hover{background-color:#bfbfbf;background-color:rgba(255, 255, 255, 0.5);color:#fff;} div.topbar form input:focus,div.topbar form input.focused{outline:none;background-color:#fff;color:#404040;text-shadow:0 1px 0 #fff;border:0;padding:5px 10px;-webkit-box-shadow:0 0 3px rgba(0, 0, 0, 0.15);-moz-box-shadow:0 0 3px rgba(0, 0, 0, 0.15);box-shadow:0 0 3px rgba(0, 0, 0, 0.15);} div.topbar ul{display:block;float:left;margin:0 10px 0 0;position:relative;}div.topbar ul.secondary-nav{float:right;margin-left:10px;margin-right:0;} div.topbar ul li{display:block;float:left;font-size:13px;}div.topbar ul li a{display:block;float:none;padding:10px 10px 11px;line-height:19px;text-decoration:none;}div.topbar ul li a:hover{color:#fff;text-decoration:none;} diff --git a/docs/assets/js/application.js b/docs/assets/js/application.js index 0de6ca96f6..3319e607db 100644 --- a/docs/assets/js/application.js +++ b/docs/assets/js/application.js @@ -42,25 +42,12 @@ $(document).ready(function(){ // Dropdown example for topbar nav // =============================== - $("body").bind("click", function(e) { - $("ul.menu-dropdown").hide(); - $('a.menu').parent("li").removeClass("open").children("ul.menu-dropdown").hide(); + $("body").bind("click", function (e) { + $('a.menu').parent("li").removeClass("open"); }); - $("a.menu").click(function(e) { - var $target = $(this); - var $parent = $target.parent("li"); - var $siblings = $target.siblings("ul.menu-dropdown"); - var $parentSiblings = $parent.siblings("li"); - if ($parent.hasClass("open")) { - $parent.removeClass("open"); - $siblings.hide(); - } else { - $parent.addClass("open"); - $siblings.show(); - } - $parentSiblings.children("ul.menu-dropdown").hide(); - $parentSiblings.removeClass("open"); + $("a.menu").click(function (e) { + var $li = $(this).parent("li").toggleClass('open'); return false; }); diff --git a/lib/patterns.less b/lib/patterns.less index eeb0107abd..2f8f6c9193 100644 --- a/lib/patterns.less +++ b/lib/patterns.less @@ -53,7 +53,7 @@ div.topbar { position: relative; .opacity(100); input { - background-color: @grayLight; + background-color: #444; background-color: rgba(255,255,255,.3); #font > .sans-serif(13px, normal, 1); width: 220px; @@ -74,7 +74,7 @@ div.topbar { color: @grayLighter; } &:hover { - background-color: #444; + background-color: @grayLight; background-color: rgba(255,255,255,.5); color: #fff; } From 3d73e674dd4f27159b2f3968c83547da4e7cb225 Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Sun, 21 Aug 2011 11:45:24 -0700 Subject: [PATCH 02/38] more debugging of ie nav display issues --- bootstrap-1.0.0.css | 10 +++++----- bootstrap-1.0.0.min.css | 8 ++++---- lib/patterns.less | 2 +- lib/preboot.less | 4 ++-- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/bootstrap-1.0.0.css b/bootstrap-1.0.0.css index 3a83c6c315..17d1f68229 100644 --- a/bootstrap-1.0.0.css +++ b/bootstrap-1.0.0.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: Sun Aug 21 11:20:03 PDT 2011 + * Date: Sun Aug 21 11:45:18 PDT 2011 */ /* Reset.less * Props to Eric Meyer (meyerweb.com) for his CSS reset file. We're using an adapted version here that cuts out some of the reset HTML elements we will never need here (i.e., dfn, samp, etc). @@ -421,8 +421,8 @@ a:hover { background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #049cdb), color-stop(100%, #0064cd)); background-image: -webkit-linear-gradient(#049cdb, #0064cd); background-image: -o-linear-gradient(#049cdb, #0064cd); - -ms-filter: "progid:DXImageTransform.Microsoft.gradient(startColorstr='#049cdb', endColorstr='#0064cd', GradientType=0)"; filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#049cdb', endColorstr='#0064cd', GradientType=0); + -ms-filter: "progid:DXImageTransform.Microsoft.gradient(startColorstr='#049cdb', endColorstr='#0064cd', GradientType=0)"; background-image: linear-gradient(#049cdb, #0064cd); color: #fff; text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); @@ -1101,8 +1101,8 @@ div.topbar { background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #333333), color-stop(100%, #222222)); background-image: -webkit-linear-gradient(#333333, #222222); background-image: -o-linear-gradient(#333333, #222222); - -ms-filter: "progid:DXImageTransform.Microsoft.gradient(startColorstr='#333333', endColorstr='#222222', GradientType=0)"; filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#333333', endColorstr='#222222', GradientType=0); + -ms-filter: "progid:DXImageTransform.Microsoft.gradient(startColorstr='#333333', endColorstr='#222222', GradientType=0)"; background-image: linear-gradient(#333333, #222222); height: 40px; position: fixed; @@ -1246,7 +1246,7 @@ div.topbar ul li.menu a.menu:after { opacity: 0.5; } div.topbar ul li.menu.open a.menu, div.topbar ul li.menu.open a:hover { - background-color: #00b4eb; + background-color: #333; background-color: rgba(255, 255, 255, 0.1); color: #fff; } @@ -1361,8 +1361,8 @@ div.alert-message { background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, transparent), color-stop(100%, rgba(0, 0, 0, 0.15))); background-image: -webkit-linear-gradient(transparent, rgba(0, 0, 0, 0.15)); background-image: -o-linear-gradient(transparent, rgba(0, 0, 0, 0.15)); - -ms-filter: "progid:DXImageTransform.Microsoft.gradient(startColorstr='transparent', endColorstr='rgba(0, 0, 0, 0.15)', GradientType=0)"; filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='transparent', endColorstr='rgba(0, 0, 0, 0.15)', GradientType=0); + -ms-filter: "progid:DXImageTransform.Microsoft.gradient(startColorstr='transparent', endColorstr='rgba(0, 0, 0, 0.15)', GradientType=0)"; background-image: linear-gradient(transparent, rgba(0, 0, 0, 0.15)); background-color: #e6e6e6; margin-bottom: 18px; diff --git a/bootstrap-1.0.0.min.css b/bootstrap-1.0.0.min.css index 7d3ba191ff..68915fda3f 100644 --- a/bootstrap-1.0.0.min.css +++ b/bootstrap-1.0.0.min.css @@ -48,7 +48,7 @@ div.container-fluid div.sidebar{float:left;width:220px;} div.container-fluid div.content{min-width:700px;max-width:1180px;margin-left:240px;} a{color:#0069d6;text-decoration:none;line-height:inherit;}a:hover{color:#0050a3;text-decoration:underline;} .btn{display:inline-block;background-color:#e6e6e6;background-repeat:no-repeat;background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), color-stop(0.25, #ffffff), to(#e6e6e6));background-image:-webkit-linear-gradient(#ffffff, color-stop(0.25, #ffffff), #e6e6e6);background-image:-moz-linear-gradient(#ffffff, color-stop(#ffffff, 0.25), #e6e6e6);background-image:-ms-linear-gradient(#ffffff, color-stop(#ffffff, 0.25), #e6e6e6);background-image:-o-linear-gradient(#ffffff, color-stop(#ffffff, 0.25), #e6e6e6);background-image:linear-gradient(#ffffff, color-stop(#ffffff, 0.25), #e6e6e6);padding:4px 14px;text-shadow:0 1px 1px rgba(255, 255, 255, 0.75);color:#333333;font-size:13px;line-height:18px;border:1px solid rgba(0, 0, 0, 0.1);border-bottom-color:rgba(0, 0, 0, 0.25);-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-webkit-box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0, 0.05);-moz-box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0, 0.05);box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0, 0.05);-webkit-transition:0.1s linear all;-moz-transition:0.1s linear all;transition:0.1s linear all;}.btn:hover{background-position:0 -15px;color:#333333;text-decoration:none;} -.btn.primary{background-color:#0064cd;background-repeat:repeat-x;background-image:-khtml-gradient(linear, left top, left bottom, from(#049cdb), to(#0064cd));background-image:-moz-linear-gradient(#049cdb, #0064cd);background-image:-ms-linear-gradient(#049cdb, #0064cd);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #049cdb), color-stop(100%, #0064cd));background-image:-webkit-linear-gradient(#049cdb, #0064cd);background-image:-o-linear-gradient(#049cdb, #0064cd);-ms-filter:"progid:DXImageTransform.Microsoft.gradient(startColorstr='#049cdb', endColorstr='#0064cd', GradientType=0)";filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#049cdb', endColorstr='#0064cd', GradientType=0);background-image:linear-gradient(#049cdb, #0064cd);color:#fff;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);}.btn.primary:hover{color:#fff;} +.btn.primary{background-color:#0064cd;background-repeat:repeat-x;background-image:-khtml-gradient(linear, left top, left bottom, from(#049cdb), to(#0064cd));background-image:-moz-linear-gradient(#049cdb, #0064cd);background-image:-ms-linear-gradient(#049cdb, #0064cd);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #049cdb), color-stop(100%, #0064cd));background-image:-webkit-linear-gradient(#049cdb, #0064cd);background-image:-o-linear-gradient(#049cdb, #0064cd);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#049cdb', endColorstr='#0064cd', GradientType=0);-ms-filter:"progid:DXImageTransform.Microsoft.gradient(startColorstr='#049cdb', endColorstr='#0064cd', GradientType=0)";background-image:linear-gradient(#049cdb, #0064cd);color:#fff;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);}.btn.primary:hover{color:#fff;} .btn.large{font-size:16px;line-height:28px;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;} .btn.small{padding-right:9px;padding-left:9px;font-size:11px;} .btn:disabled,.btn.disabled{background-image:none;filter:alpha(opacity=65);-khtml-opacity:0.65;-moz-opacity:0.65;opacity:0.65;cursor:default;} @@ -153,7 +153,7 @@ table.zebra-striped th.orange{color:#f89406;border-bottom-color:#f89406;} table.zebra-striped th.headerSortUp.orange,table.zebra-striped th.headerSortDown.orange{background-color:#fee9cc;} table.zebra-striped th.purple{color:#7a43b6;border-bottom-color:#7a43b6;} table.zebra-striped th.headerSortUp.purple,table.zebra-striped th.headerSortDown.purple{background-color:#e2d5f0;} -div.topbar{background-color:#222222;background-repeat:repeat-x;background-image:-khtml-gradient(linear, left top, left bottom, from(#333333), to(#222222));background-image:-moz-linear-gradient(#333333, #222222);background-image:-ms-linear-gradient(#333333, #222222);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #333333), color-stop(100%, #222222));background-image:-webkit-linear-gradient(#333333, #222222);background-image:-o-linear-gradient(#333333, #222222);-ms-filter:"progid:DXImageTransform.Microsoft.gradient(startColorstr='#333333', endColorstr='#222222', GradientType=0)";filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#333333', endColorstr='#222222', GradientType=0);background-image:linear-gradient(#333333, #222222);height:40px;position:fixed;top:0;left:0;right:0;z-index:10000;overflow:visible;-webkit-box-shadow:0 1px 3px rgba(0, 0, 0, 0.25),inset 0 -1px 0 rgba(0, 0, 0, 0.1);-moz-box-shadow:0 1px 3px rgba(0, 0, 0, 0.25),inset 0 -1px 0 rgba(0, 0, 0, 0.1);box-shadow:0 1px 3px rgba(0, 0, 0, 0.25),inset 0 -1px 0 rgba(0, 0, 0, 0.1);}div.topbar a{color:#bfbfbf;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);} +div.topbar{background-color:#222222;background-repeat:repeat-x;background-image:-khtml-gradient(linear, left top, left bottom, from(#333333), to(#222222));background-image:-moz-linear-gradient(#333333, #222222);background-image:-ms-linear-gradient(#333333, #222222);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #333333), color-stop(100%, #222222));background-image:-webkit-linear-gradient(#333333, #222222);background-image:-o-linear-gradient(#333333, #222222);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#333333', endColorstr='#222222', GradientType=0);-ms-filter:"progid:DXImageTransform.Microsoft.gradient(startColorstr='#333333', endColorstr='#222222', GradientType=0)";background-image:linear-gradient(#333333, #222222);height:40px;position:fixed;top:0;left:0;right:0;z-index:10000;overflow:visible;-webkit-box-shadow:0 1px 3px rgba(0, 0, 0, 0.25),inset 0 -1px 0 rgba(0, 0, 0, 0.1);-moz-box-shadow:0 1px 3px rgba(0, 0, 0, 0.25),inset 0 -1px 0 rgba(0, 0, 0, 0.1);box-shadow:0 1px 3px rgba(0, 0, 0, 0.25),inset 0 -1px 0 rgba(0, 0, 0, 0.1);}div.topbar a{color:#bfbfbf;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);} div.topbar a:hover,div.topbar ul li.active a{background-color:#333;background-color:rgba(255, 255, 255, 0.05);color:#ffffff;text-decoration:none;} div.topbar h3 a{float:left;display:block;padding:8px 20px 12px;margin-left:-20px;color:#ffffff;font-size:20px;font-weight:200;line-height:1;} div.topbar form{float:left;margin:5px 0 0 0;position:relative;filter:alpha(opacity=100);-khtml-opacity:1;-moz-opacity:1;opacity:1;}div.topbar form input{background-color:#444;background-color:rgba(255, 255, 255, 0.3);font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:normal;font-weight:13px;line-height:1;width:220px;padding:4px 9px;color:#fff;color:rgba(255, 255, 255, 0.75);border:1px solid #111;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-webkit-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1),0 1px 0px rgba(255, 255, 255, 0.25);-moz-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1),0 1px 0px rgba(255, 255, 255, 0.25);box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1),0 1px 0px rgba(255, 255, 255, 0.25);-webkit-transition:none;-moz-transition:none;transition:none;}div.topbar form input:-moz-placeholder{color:#e6e6e6;} @@ -166,7 +166,7 @@ div.topbar ul li.active a{background-color:#222;background-color:rgba(0, 0, 0, 0 div.topbar ul.primary-nav li ul{left:0;} div.topbar ul.secondary-nav li ul{right:0;} div.topbar ul li.menu{position:relative;}div.topbar ul li.menu a.menu:after{width:0px;height:0px;display:inline-block;content:"↓";text-indent:-99999px;vertical-align:top;margin-top:8px;margin-left:4px;border-left:4px solid transparent;border-right:4px solid transparent;border-top:4px solid #fff;filter:alpha(opacity=50);-khtml-opacity:0.5;-moz-opacity:0.5;opacity:0.5;} -div.topbar ul li.menu.open a.menu,div.topbar ul li.menu.open a:hover{background-color:#00b4eb;background-color:rgba(255, 255, 255, 0.1);color:#fff;} +div.topbar ul li.menu.open a.menu,div.topbar ul li.menu.open a:hover{background-color:#333;background-color:rgba(255, 255, 255, 0.1);color:#fff;} div.topbar ul li.menu.open ul{display:block;}div.topbar ul li.menu.open ul li a{background-color:transparent;font-weight:normal;}div.topbar ul li.menu.open ul li a:hover{background-color:rgba(255, 255, 255, 0.1);color:#fff;} div.topbar ul li.menu.open ul li.active a{background-color:rgba(255, 255, 255, 0.1);font-weight:bold;} div.topbar ul li ul{background-color:#333;float:left;display:none;position:absolute;top:40px;min-width:160px;max-width:220px;_width:160px;margin-left:0;margin-right:0;padding:0;text-align:left;border:0;zoom:1;-webkit-border-radius:0 0 5px 5px;-moz-border-radius:0 0 5px 5px;border-radius:0 0 5px 5px;-webkit-box-shadow:0 1px 2px rgba(0, 0, 0, 0.6);-moz-box-shadow:0 1px 2px rgba(0, 0, 0, 0.6);box-shadow:0 1px 2px rgba(0, 0, 0, 0.6);}div.topbar ul li ul li{float:none;clear:both;display:block;background:none;font-size:12px;}div.topbar ul li ul li a{display:block;padding:6px 15px;clear:both;font-weight:normal;line-height:19px;color:#bbb;}div.topbar ul li ul li a:hover{background-color:#333;background-color:rgba(255, 255, 255, 0.25);color:#fff;} @@ -175,7 +175,7 @@ div.topbar ul li ul li span{clear:both;display:block;background:rgba(0, 0, 0, 0. .hero-unit{background-color:#f5f5f5;margin-bottom:30px;padding:60px;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;}.hero-unit h1{margin-bottom:0;font-size:60px;line-height:1;letter-spacing:-1px;} .hero-unit p{font-size:18px;font-weight:200;line-height:27px;} div.page-header{margin-bottom:17px;border-bottom:1px solid #ddd;-webkit-box-shadow:0 1px 0 rgba(255, 255, 255, 0.5);-moz-box-shadow:0 1px 0 rgba(255, 255, 255, 0.5);box-shadow:0 1px 0 rgba(255, 255, 255, 0.5);}div.page-header h1{margin-bottom:8px;} -div.alert-message{background-color:rgba(0, 0, 0, 0.15);background-repeat:repeat-x;background-image:-khtml-gradient(linear, left top, left bottom, from(transparent), to(rgba(0, 0, 0, 0.15)));background-image:-moz-linear-gradient(transparent, rgba(0, 0, 0, 0.15));background-image:-ms-linear-gradient(transparent, rgba(0, 0, 0, 0.15));background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, transparent), color-stop(100%, rgba(0, 0, 0, 0.15)));background-image:-webkit-linear-gradient(transparent, rgba(0, 0, 0, 0.15));background-image:-o-linear-gradient(transparent, rgba(0, 0, 0, 0.15));-ms-filter:"progid:DXImageTransform.Microsoft.gradient(startColorstr='transparent', endColorstr='rgba(0, 0, 0, 0.15)', GradientType=0)";filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='transparent', endColorstr='rgba(0, 0, 0, 0.15)', GradientType=0);background-image:linear-gradient(transparent, rgba(0, 0, 0, 0.15));background-color:#e6e6e6;margin-bottom:18px;padding:8px 15px;color:#fff;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);border-bottom:1px solid rgba(0, 0, 0, 0.25);-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;}div.alert-message p{color:#fff;margin-bottom:0;}div.alert-message p+p{margin-top:5px;} +div.alert-message{background-color:rgba(0, 0, 0, 0.15);background-repeat:repeat-x;background-image:-khtml-gradient(linear, left top, left bottom, from(transparent), to(rgba(0, 0, 0, 0.15)));background-image:-moz-linear-gradient(transparent, rgba(0, 0, 0, 0.15));background-image:-ms-linear-gradient(transparent, rgba(0, 0, 0, 0.15));background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, transparent), color-stop(100%, rgba(0, 0, 0, 0.15)));background-image:-webkit-linear-gradient(transparent, rgba(0, 0, 0, 0.15));background-image:-o-linear-gradient(transparent, rgba(0, 0, 0, 0.15));filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='transparent', endColorstr='rgba(0, 0, 0, 0.15)', GradientType=0);-ms-filter:"progid:DXImageTransform.Microsoft.gradient(startColorstr='transparent', endColorstr='rgba(0, 0, 0, 0.15)', GradientType=0)";background-image:linear-gradient(transparent, rgba(0, 0, 0, 0.15));background-color:#e6e6e6;margin-bottom:18px;padding:8px 15px;color:#fff;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);border-bottom:1px solid rgba(0, 0, 0, 0.25);-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;}div.alert-message p{color:#fff;margin-bottom:0;}div.alert-message p+p{margin-top:5px;} div.alert-message.error{background-color:#e06359;} div.alert-message.warning{background-color:#ffd75a;} div.alert-message.success{background-color:#74c474;} diff --git a/lib/patterns.less b/lib/patterns.less index 2f8f6c9193..c189e6271a 100644 --- a/lib/patterns.less +++ b/lib/patterns.less @@ -151,7 +151,7 @@ div.topbar { &.open { a.menu, a:hover { - background-color: lighten(#00a0d1,5); + background-color: #333; background-color: rgba(255,255,255,.1); color: #fff; } diff --git a/lib/preboot.less b/lib/preboot.less index b90021ebe2..74f0f48d58 100644 --- a/lib/preboot.less +++ b/lib/preboot.less @@ -223,8 +223,8 @@ background-image: -webkit-gradient(linear, left top, right top, color-stop(0%, @startColor), color-stop(100%, @endColor)); // Safari 4+, Chrome 2+ background-image: -webkit-linear-gradient(left, @startColor, @endColor); // Safari 5.1+, Chrome 10+ background-image: -o-linear-gradient(left, @startColor, @endColor); // Opera 11.10 - -ms-filter: %("progid:DXImageTransform.Microsoft.gradient(startColorstr='%d', endColorstr='%d', GradientType=1)",@startColor,@endColor); // IE8+ filter: e(%("progid:DXImageTransform.Microsoft.gradient(startColorstr='%d', endColorstr='%d', GradientType=1)",@startColor,@endColor)); // IE6 & IE7 + -ms-filter: %("progid:DXImageTransform.Microsoft.gradient(startColorstr='%d', endColorstr='%d', GradientType=1)",@startColor,@endColor); // IE8+ background-image: linear-gradient(left, @startColor, @endColor); // Le standard } .vertical (@startColor: #555, @endColor: #333) { @@ -236,8 +236,8 @@ background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, @startColor), color-stop(100%, @endColor)); // Safari 4+, Chrome 2+ background-image: -webkit-linear-gradient(@startColor, @endColor); // Safari 5.1+, Chrome 10+ background-image: -o-linear-gradient(@startColor, @endColor); // Opera 11.10 - -ms-filter: %("progid:DXImageTransform.Microsoft.gradient(startColorstr='%d', endColorstr='%d', GradientType=0)",@startColor,@endColor); // IE8+ filter: e(%("progid:DXImageTransform.Microsoft.gradient(startColorstr='%d', endColorstr='%d', GradientType=0)",@startColor,@endColor)); // IE6 & IE7 + -ms-filter: %("progid:DXImageTransform.Microsoft.gradient(startColorstr='%d', endColorstr='%d', GradientType=0)",@startColor,@endColor); // IE8+ background-image: linear-gradient(@startColor, @endColor); // The standard } .directional (@startColor: #555, @endColor: #333, @deg: 45deg) { From 2203ba3df1724a14ef948bd714e76e8d6c4a1929 Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Sun, 21 Aug 2011 11:53:06 -0700 Subject: [PATCH 03/38] ie Xp --- bootstrap-1.0.0.css | 11 +++++++---- bootstrap-1.0.0.min.css | 6 +++--- lib/patterns.less | 3 +++ lib/preboot.less | 4 ++-- 4 files changed, 15 insertions(+), 9 deletions(-) diff --git a/bootstrap-1.0.0.css b/bootstrap-1.0.0.css index 17d1f68229..2e9903ad63 100644 --- a/bootstrap-1.0.0.css +++ b/bootstrap-1.0.0.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: Sun Aug 21 11:45:18 PDT 2011 + * Date: Sun Aug 21 11:52:41 PDT 2011 */ /* Reset.less * Props to Eric Meyer (meyerweb.com) for his CSS reset file. We're using an adapted version here that cuts out some of the reset HTML elements we will never need here (i.e., dfn, samp, etc). @@ -421,8 +421,8 @@ a:hover { background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #049cdb), color-stop(100%, #0064cd)); background-image: -webkit-linear-gradient(#049cdb, #0064cd); background-image: -o-linear-gradient(#049cdb, #0064cd); - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#049cdb', endColorstr='#0064cd', GradientType=0); -ms-filter: "progid:DXImageTransform.Microsoft.gradient(startColorstr='#049cdb', endColorstr='#0064cd', GradientType=0)"; + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#049cdb', endColorstr='#0064cd', GradientType=0); background-image: linear-gradient(#049cdb, #0064cd); color: #fff; text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); @@ -1093,6 +1093,7 @@ table.zebra-striped th.headerSortUp.purple, table.zebra-striped th.headerSortDow * Repeatable UI elements outside the base styles provided from the scaffolding * ---------------------------------------------------------------------------- */ div.topbar { + background: #222; background-color: #222222; background-repeat: repeat-x; background-image: -khtml-gradient(linear, left top, left bottom, from(#333333), to(#222222)); @@ -1101,9 +1102,11 @@ div.topbar { background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #333333), color-stop(100%, #222222)); background-image: -webkit-linear-gradient(#333333, #222222); background-image: -o-linear-gradient(#333333, #222222); - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#333333', endColorstr='#222222', GradientType=0); -ms-filter: "progid:DXImageTransform.Microsoft.gradient(startColorstr='#333333', endColorstr='#222222', GradientType=0)"; + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#333333', endColorstr='#222222', GradientType=0); background-image: linear-gradient(#333333, #222222); + filter: "progid:DXImageTransform.Microsoft.gradient(enabled=false)"; + -ms-filter: "progid:DXImageTransform.Microsoft.gradient(enabled=false)"; height: 40px; position: fixed; top: 0; @@ -1361,8 +1364,8 @@ div.alert-message { background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, transparent), color-stop(100%, rgba(0, 0, 0, 0.15))); background-image: -webkit-linear-gradient(transparent, rgba(0, 0, 0, 0.15)); background-image: -o-linear-gradient(transparent, rgba(0, 0, 0, 0.15)); - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='transparent', endColorstr='rgba(0, 0, 0, 0.15)', GradientType=0); -ms-filter: "progid:DXImageTransform.Microsoft.gradient(startColorstr='transparent', endColorstr='rgba(0, 0, 0, 0.15)', GradientType=0)"; + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='transparent', endColorstr='rgba(0, 0, 0, 0.15)', GradientType=0); background-image: linear-gradient(transparent, rgba(0, 0, 0, 0.15)); background-color: #e6e6e6; margin-bottom: 18px; diff --git a/bootstrap-1.0.0.min.css b/bootstrap-1.0.0.min.css index 68915fda3f..64aae8e740 100644 --- a/bootstrap-1.0.0.min.css +++ b/bootstrap-1.0.0.min.css @@ -48,7 +48,7 @@ div.container-fluid div.sidebar{float:left;width:220px;} div.container-fluid div.content{min-width:700px;max-width:1180px;margin-left:240px;} a{color:#0069d6;text-decoration:none;line-height:inherit;}a:hover{color:#0050a3;text-decoration:underline;} .btn{display:inline-block;background-color:#e6e6e6;background-repeat:no-repeat;background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), color-stop(0.25, #ffffff), to(#e6e6e6));background-image:-webkit-linear-gradient(#ffffff, color-stop(0.25, #ffffff), #e6e6e6);background-image:-moz-linear-gradient(#ffffff, color-stop(#ffffff, 0.25), #e6e6e6);background-image:-ms-linear-gradient(#ffffff, color-stop(#ffffff, 0.25), #e6e6e6);background-image:-o-linear-gradient(#ffffff, color-stop(#ffffff, 0.25), #e6e6e6);background-image:linear-gradient(#ffffff, color-stop(#ffffff, 0.25), #e6e6e6);padding:4px 14px;text-shadow:0 1px 1px rgba(255, 255, 255, 0.75);color:#333333;font-size:13px;line-height:18px;border:1px solid rgba(0, 0, 0, 0.1);border-bottom-color:rgba(0, 0, 0, 0.25);-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-webkit-box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0, 0.05);-moz-box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0, 0.05);box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0, 0.05);-webkit-transition:0.1s linear all;-moz-transition:0.1s linear all;transition:0.1s linear all;}.btn:hover{background-position:0 -15px;color:#333333;text-decoration:none;} -.btn.primary{background-color:#0064cd;background-repeat:repeat-x;background-image:-khtml-gradient(linear, left top, left bottom, from(#049cdb), to(#0064cd));background-image:-moz-linear-gradient(#049cdb, #0064cd);background-image:-ms-linear-gradient(#049cdb, #0064cd);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #049cdb), color-stop(100%, #0064cd));background-image:-webkit-linear-gradient(#049cdb, #0064cd);background-image:-o-linear-gradient(#049cdb, #0064cd);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#049cdb', endColorstr='#0064cd', GradientType=0);-ms-filter:"progid:DXImageTransform.Microsoft.gradient(startColorstr='#049cdb', endColorstr='#0064cd', GradientType=0)";background-image:linear-gradient(#049cdb, #0064cd);color:#fff;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);}.btn.primary:hover{color:#fff;} +.btn.primary{background-color:#0064cd;background-repeat:repeat-x;background-image:-khtml-gradient(linear, left top, left bottom, from(#049cdb), to(#0064cd));background-image:-moz-linear-gradient(#049cdb, #0064cd);background-image:-ms-linear-gradient(#049cdb, #0064cd);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #049cdb), color-stop(100%, #0064cd));background-image:-webkit-linear-gradient(#049cdb, #0064cd);background-image:-o-linear-gradient(#049cdb, #0064cd);-ms-filter:"progid:DXImageTransform.Microsoft.gradient(startColorstr='#049cdb', endColorstr='#0064cd', GradientType=0)";filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#049cdb', endColorstr='#0064cd', GradientType=0);background-image:linear-gradient(#049cdb, #0064cd);color:#fff;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);}.btn.primary:hover{color:#fff;} .btn.large{font-size:16px;line-height:28px;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;} .btn.small{padding-right:9px;padding-left:9px;font-size:11px;} .btn:disabled,.btn.disabled{background-image:none;filter:alpha(opacity=65);-khtml-opacity:0.65;-moz-opacity:0.65;opacity:0.65;cursor:default;} @@ -153,7 +153,7 @@ table.zebra-striped th.orange{color:#f89406;border-bottom-color:#f89406;} table.zebra-striped th.headerSortUp.orange,table.zebra-striped th.headerSortDown.orange{background-color:#fee9cc;} table.zebra-striped th.purple{color:#7a43b6;border-bottom-color:#7a43b6;} table.zebra-striped th.headerSortUp.purple,table.zebra-striped th.headerSortDown.purple{background-color:#e2d5f0;} -div.topbar{background-color:#222222;background-repeat:repeat-x;background-image:-khtml-gradient(linear, left top, left bottom, from(#333333), to(#222222));background-image:-moz-linear-gradient(#333333, #222222);background-image:-ms-linear-gradient(#333333, #222222);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #333333), color-stop(100%, #222222));background-image:-webkit-linear-gradient(#333333, #222222);background-image:-o-linear-gradient(#333333, #222222);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#333333', endColorstr='#222222', GradientType=0);-ms-filter:"progid:DXImageTransform.Microsoft.gradient(startColorstr='#333333', endColorstr='#222222', GradientType=0)";background-image:linear-gradient(#333333, #222222);height:40px;position:fixed;top:0;left:0;right:0;z-index:10000;overflow:visible;-webkit-box-shadow:0 1px 3px rgba(0, 0, 0, 0.25),inset 0 -1px 0 rgba(0, 0, 0, 0.1);-moz-box-shadow:0 1px 3px rgba(0, 0, 0, 0.25),inset 0 -1px 0 rgba(0, 0, 0, 0.1);box-shadow:0 1px 3px rgba(0, 0, 0, 0.25),inset 0 -1px 0 rgba(0, 0, 0, 0.1);}div.topbar a{color:#bfbfbf;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);} +div.topbar{background:#222;background-color:#222222;background-repeat:repeat-x;background-image:-khtml-gradient(linear, left top, left bottom, from(#333333), to(#222222));background-image:-moz-linear-gradient(#333333, #222222);background-image:-ms-linear-gradient(#333333, #222222);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #333333), color-stop(100%, #222222));background-image:-webkit-linear-gradient(#333333, #222222);background-image:-o-linear-gradient(#333333, #222222);-ms-filter:"progid:DXImageTransform.Microsoft.gradient(startColorstr='#333333', endColorstr='#222222', GradientType=0)";filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#333333', endColorstr='#222222', GradientType=0);background-image:linear-gradient(#333333, #222222);filter:"progid:DXImageTransform.Microsoft.gradient(enabled=false)";-ms-filter:"progid:DXImageTransform.Microsoft.gradient(enabled=false)";height:40px;position:fixed;top:0;left:0;right:0;z-index:10000;overflow:visible;-webkit-box-shadow:0 1px 3px rgba(0, 0, 0, 0.25),inset 0 -1px 0 rgba(0, 0, 0, 0.1);-moz-box-shadow:0 1px 3px rgba(0, 0, 0, 0.25),inset 0 -1px 0 rgba(0, 0, 0, 0.1);box-shadow:0 1px 3px rgba(0, 0, 0, 0.25),inset 0 -1px 0 rgba(0, 0, 0, 0.1);}div.topbar a{color:#bfbfbf;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);} div.topbar a:hover,div.topbar ul li.active a{background-color:#333;background-color:rgba(255, 255, 255, 0.05);color:#ffffff;text-decoration:none;} div.topbar h3 a{float:left;display:block;padding:8px 20px 12px;margin-left:-20px;color:#ffffff;font-size:20px;font-weight:200;line-height:1;} div.topbar form{float:left;margin:5px 0 0 0;position:relative;filter:alpha(opacity=100);-khtml-opacity:1;-moz-opacity:1;opacity:1;}div.topbar form input{background-color:#444;background-color:rgba(255, 255, 255, 0.3);font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:normal;font-weight:13px;line-height:1;width:220px;padding:4px 9px;color:#fff;color:rgba(255, 255, 255, 0.75);border:1px solid #111;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-webkit-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1),0 1px 0px rgba(255, 255, 255, 0.25);-moz-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1),0 1px 0px rgba(255, 255, 255, 0.25);box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1),0 1px 0px rgba(255, 255, 255, 0.25);-webkit-transition:none;-moz-transition:none;transition:none;}div.topbar form input:-moz-placeholder{color:#e6e6e6;} @@ -175,7 +175,7 @@ div.topbar ul li ul li span{clear:both;display:block;background:rgba(0, 0, 0, 0. .hero-unit{background-color:#f5f5f5;margin-bottom:30px;padding:60px;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;}.hero-unit h1{margin-bottom:0;font-size:60px;line-height:1;letter-spacing:-1px;} .hero-unit p{font-size:18px;font-weight:200;line-height:27px;} div.page-header{margin-bottom:17px;border-bottom:1px solid #ddd;-webkit-box-shadow:0 1px 0 rgba(255, 255, 255, 0.5);-moz-box-shadow:0 1px 0 rgba(255, 255, 255, 0.5);box-shadow:0 1px 0 rgba(255, 255, 255, 0.5);}div.page-header h1{margin-bottom:8px;} -div.alert-message{background-color:rgba(0, 0, 0, 0.15);background-repeat:repeat-x;background-image:-khtml-gradient(linear, left top, left bottom, from(transparent), to(rgba(0, 0, 0, 0.15)));background-image:-moz-linear-gradient(transparent, rgba(0, 0, 0, 0.15));background-image:-ms-linear-gradient(transparent, rgba(0, 0, 0, 0.15));background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, transparent), color-stop(100%, rgba(0, 0, 0, 0.15)));background-image:-webkit-linear-gradient(transparent, rgba(0, 0, 0, 0.15));background-image:-o-linear-gradient(transparent, rgba(0, 0, 0, 0.15));filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='transparent', endColorstr='rgba(0, 0, 0, 0.15)', GradientType=0);-ms-filter:"progid:DXImageTransform.Microsoft.gradient(startColorstr='transparent', endColorstr='rgba(0, 0, 0, 0.15)', GradientType=0)";background-image:linear-gradient(transparent, rgba(0, 0, 0, 0.15));background-color:#e6e6e6;margin-bottom:18px;padding:8px 15px;color:#fff;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);border-bottom:1px solid rgba(0, 0, 0, 0.25);-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;}div.alert-message p{color:#fff;margin-bottom:0;}div.alert-message p+p{margin-top:5px;} +div.alert-message{background-color:rgba(0, 0, 0, 0.15);background-repeat:repeat-x;background-image:-khtml-gradient(linear, left top, left bottom, from(transparent), to(rgba(0, 0, 0, 0.15)));background-image:-moz-linear-gradient(transparent, rgba(0, 0, 0, 0.15));background-image:-ms-linear-gradient(transparent, rgba(0, 0, 0, 0.15));background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, transparent), color-stop(100%, rgba(0, 0, 0, 0.15)));background-image:-webkit-linear-gradient(transparent, rgba(0, 0, 0, 0.15));background-image:-o-linear-gradient(transparent, rgba(0, 0, 0, 0.15));-ms-filter:"progid:DXImageTransform.Microsoft.gradient(startColorstr='transparent', endColorstr='rgba(0, 0, 0, 0.15)', GradientType=0)";filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='transparent', endColorstr='rgba(0, 0, 0, 0.15)', GradientType=0);background-image:linear-gradient(transparent, rgba(0, 0, 0, 0.15));background-color:#e6e6e6;margin-bottom:18px;padding:8px 15px;color:#fff;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);border-bottom:1px solid rgba(0, 0, 0, 0.25);-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;}div.alert-message p{color:#fff;margin-bottom:0;}div.alert-message p+p{margin-top:5px;} div.alert-message.error{background-color:#e06359;} div.alert-message.warning{background-color:#ffd75a;} div.alert-message.success{background-color:#74c474;} diff --git a/lib/patterns.less b/lib/patterns.less index c189e6271a..c767df63ce 100644 --- a/lib/patterns.less +++ b/lib/patterns.less @@ -8,7 +8,10 @@ // Topbar for Branding and Nav div.topbar { + background:#222; #gradient > .vertical(#333, #222); + filter: "progid:DXImageTransform.Microsoft.gradient(enabled=false)"; + -ms-filter: "progid:DXImageTransform.Microsoft.gradient(enabled=false)"; height: 40px; position: fixed; top: 0; diff --git a/lib/preboot.less b/lib/preboot.less index 74f0f48d58..b90021ebe2 100644 --- a/lib/preboot.less +++ b/lib/preboot.less @@ -223,8 +223,8 @@ background-image: -webkit-gradient(linear, left top, right top, color-stop(0%, @startColor), color-stop(100%, @endColor)); // Safari 4+, Chrome 2+ background-image: -webkit-linear-gradient(left, @startColor, @endColor); // Safari 5.1+, Chrome 10+ background-image: -o-linear-gradient(left, @startColor, @endColor); // Opera 11.10 - filter: e(%("progid:DXImageTransform.Microsoft.gradient(startColorstr='%d', endColorstr='%d', GradientType=1)",@startColor,@endColor)); // IE6 & IE7 -ms-filter: %("progid:DXImageTransform.Microsoft.gradient(startColorstr='%d', endColorstr='%d', GradientType=1)",@startColor,@endColor); // IE8+ + filter: e(%("progid:DXImageTransform.Microsoft.gradient(startColorstr='%d', endColorstr='%d', GradientType=1)",@startColor,@endColor)); // IE6 & IE7 background-image: linear-gradient(left, @startColor, @endColor); // Le standard } .vertical (@startColor: #555, @endColor: #333) { @@ -236,8 +236,8 @@ background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, @startColor), color-stop(100%, @endColor)); // Safari 4+, Chrome 2+ background-image: -webkit-linear-gradient(@startColor, @endColor); // Safari 5.1+, Chrome 10+ background-image: -o-linear-gradient(@startColor, @endColor); // Opera 11.10 - filter: e(%("progid:DXImageTransform.Microsoft.gradient(startColorstr='%d', endColorstr='%d', GradientType=0)",@startColor,@endColor)); // IE6 & IE7 -ms-filter: %("progid:DXImageTransform.Microsoft.gradient(startColorstr='%d', endColorstr='%d', GradientType=0)",@startColor,@endColor); // IE8+ + filter: e(%("progid:DXImageTransform.Microsoft.gradient(startColorstr='%d', endColorstr='%d', GradientType=0)",@startColor,@endColor)); // IE6 & IE7 background-image: linear-gradient(@startColor, @endColor); // The standard } .directional (@startColor: #555, @endColor: #333, @deg: 45deg) { From 0e8e30bf1dbc15aa42dc84898b088a76c3e7d536 Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Sun, 21 Aug 2011 11:56:16 -0700 Subject: [PATCH 04/38] ie8 dropdown tweaks --- bootstrap-1.0.0.css | 5 +++-- bootstrap-1.0.0.min.css | 4 ++-- lib/patterns.less | 3 ++- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/bootstrap-1.0.0.css b/bootstrap-1.0.0.css index 2e9903ad63..8451a98b5f 100644 --- a/bootstrap-1.0.0.css +++ b/bootstrap-1.0.0.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: Sun Aug 21 11:52:41 PDT 2011 + * Date: Sun Aug 21 11:56:11 PDT 2011 */ /* Reset.less * Props to Eric Meyer (meyerweb.com) for his CSS reset file. We're using an adapted version here that cuts out some of the reset HTML elements we will never need here (i.e., dfn, samp, etc). @@ -1249,7 +1249,7 @@ div.topbar ul li.menu a.menu:after { opacity: 0.5; } div.topbar ul li.menu.open a.menu, div.topbar ul li.menu.open a:hover { - background-color: #333; + background-color: 444; background-color: rgba(255, 255, 255, 0.1); color: #fff; } @@ -1313,6 +1313,7 @@ div.topbar ul li ul li a:hover { div.topbar ul li ul li.divider { height: 1px; overflow: hidden; + background: #222; background: rgba(0, 0, 0, 0.2); border-bottom: 1px solid rgba(255, 255, 255, 0.1); margin: 5px 0; diff --git a/bootstrap-1.0.0.min.css b/bootstrap-1.0.0.min.css index 64aae8e740..66864a4458 100644 --- a/bootstrap-1.0.0.min.css +++ b/bootstrap-1.0.0.min.css @@ -166,11 +166,11 @@ div.topbar ul li.active a{background-color:#222;background-color:rgba(0, 0, 0, 0 div.topbar ul.primary-nav li ul{left:0;} div.topbar ul.secondary-nav li ul{right:0;} div.topbar ul li.menu{position:relative;}div.topbar ul li.menu a.menu:after{width:0px;height:0px;display:inline-block;content:"↓";text-indent:-99999px;vertical-align:top;margin-top:8px;margin-left:4px;border-left:4px solid transparent;border-right:4px solid transparent;border-top:4px solid #fff;filter:alpha(opacity=50);-khtml-opacity:0.5;-moz-opacity:0.5;opacity:0.5;} -div.topbar ul li.menu.open a.menu,div.topbar ul li.menu.open a:hover{background-color:#333;background-color:rgba(255, 255, 255, 0.1);color:#fff;} +div.topbar ul li.menu.open a.menu,div.topbar ul li.menu.open a:hover{background-color:444;background-color:rgba(255, 255, 255, 0.1);color:#fff;} div.topbar ul li.menu.open ul{display:block;}div.topbar ul li.menu.open ul li a{background-color:transparent;font-weight:normal;}div.topbar ul li.menu.open ul li a:hover{background-color:rgba(255, 255, 255, 0.1);color:#fff;} div.topbar ul li.menu.open ul li.active a{background-color:rgba(255, 255, 255, 0.1);font-weight:bold;} div.topbar ul li ul{background-color:#333;float:left;display:none;position:absolute;top:40px;min-width:160px;max-width:220px;_width:160px;margin-left:0;margin-right:0;padding:0;text-align:left;border:0;zoom:1;-webkit-border-radius:0 0 5px 5px;-moz-border-radius:0 0 5px 5px;border-radius:0 0 5px 5px;-webkit-box-shadow:0 1px 2px rgba(0, 0, 0, 0.6);-moz-box-shadow:0 1px 2px rgba(0, 0, 0, 0.6);box-shadow:0 1px 2px rgba(0, 0, 0, 0.6);}div.topbar ul li ul li{float:none;clear:both;display:block;background:none;font-size:12px;}div.topbar ul li ul li a{display:block;padding:6px 15px;clear:both;font-weight:normal;line-height:19px;color:#bbb;}div.topbar ul li ul li a:hover{background-color:#333;background-color:rgba(255, 255, 255, 0.25);color:#fff;} -div.topbar ul li ul li.divider{height:1px;overflow:hidden;background:rgba(0, 0, 0, 0.2);border-bottom:1px solid rgba(255, 255, 255, 0.1);margin:5px 0;} +div.topbar ul li ul li.divider{height:1px;overflow:hidden;background:#222;background:rgba(0, 0, 0, 0.2);border-bottom:1px solid rgba(255, 255, 255, 0.1);margin:5px 0;} div.topbar ul li ul li span{clear:both;display:block;background:rgba(0, 0, 0, 0.2);padding:6px 15px;cursor:default;color:#808080;border-top:1px solid rgba(0, 0, 0, 0.2);} .hero-unit{background-color:#f5f5f5;margin-bottom:30px;padding:60px;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;}.hero-unit h1{margin-bottom:0;font-size:60px;line-height:1;letter-spacing:-1px;} .hero-unit p{font-size:18px;font-weight:200;line-height:27px;} diff --git a/lib/patterns.less b/lib/patterns.less index c767df63ce..6106f3a3fa 100644 --- a/lib/patterns.less +++ b/lib/patterns.less @@ -154,7 +154,7 @@ div.topbar { &.open { a.menu, a:hover { - background-color: #333; + background-color: 444; background-color: rgba(255,255,255,.1); color: #fff; } @@ -218,6 +218,7 @@ div.topbar { &.divider { height: 1px; overflow: hidden; + background: #222; background: rgba(0,0,0,.2); border-bottom: 1px solid rgba(255,255,255,.1); margin: 5px 0; From 612e5c3c9e9c4ead98ebbb52db8cebeee082289b Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Sun, 21 Aug 2011 11:57:25 -0700 Subject: [PATCH 05/38] add # to color --- bootstrap-1.0.0.css | 4 ++-- bootstrap-1.0.0.min.css | 2 +- lib/patterns.less | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/bootstrap-1.0.0.css b/bootstrap-1.0.0.css index 8451a98b5f..6c5f00a87c 100644 --- a/bootstrap-1.0.0.css +++ b/bootstrap-1.0.0.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: Sun Aug 21 11:56:11 PDT 2011 + * Date: Sun Aug 21 11:57:22 PDT 2011 */ /* Reset.less * Props to Eric Meyer (meyerweb.com) for his CSS reset file. We're using an adapted version here that cuts out some of the reset HTML elements we will never need here (i.e., dfn, samp, etc). @@ -1249,7 +1249,7 @@ div.topbar ul li.menu a.menu:after { opacity: 0.5; } div.topbar ul li.menu.open a.menu, div.topbar ul li.menu.open a:hover { - background-color: 444; + background-color: #444; background-color: rgba(255, 255, 255, 0.1); color: #fff; } diff --git a/bootstrap-1.0.0.min.css b/bootstrap-1.0.0.min.css index 66864a4458..6a579ec675 100644 --- a/bootstrap-1.0.0.min.css +++ b/bootstrap-1.0.0.min.css @@ -166,7 +166,7 @@ div.topbar ul li.active a{background-color:#222;background-color:rgba(0, 0, 0, 0 div.topbar ul.primary-nav li ul{left:0;} div.topbar ul.secondary-nav li ul{right:0;} div.topbar ul li.menu{position:relative;}div.topbar ul li.menu a.menu:after{width:0px;height:0px;display:inline-block;content:"↓";text-indent:-99999px;vertical-align:top;margin-top:8px;margin-left:4px;border-left:4px solid transparent;border-right:4px solid transparent;border-top:4px solid #fff;filter:alpha(opacity=50);-khtml-opacity:0.5;-moz-opacity:0.5;opacity:0.5;} -div.topbar ul li.menu.open a.menu,div.topbar ul li.menu.open a:hover{background-color:444;background-color:rgba(255, 255, 255, 0.1);color:#fff;} +div.topbar ul li.menu.open a.menu,div.topbar ul li.menu.open a:hover{background-color:#444;background-color:rgba(255, 255, 255, 0.1);color:#fff;} div.topbar ul li.menu.open ul{display:block;}div.topbar ul li.menu.open ul li a{background-color:transparent;font-weight:normal;}div.topbar ul li.menu.open ul li a:hover{background-color:rgba(255, 255, 255, 0.1);color:#fff;} div.topbar ul li.menu.open ul li.active a{background-color:rgba(255, 255, 255, 0.1);font-weight:bold;} div.topbar ul li ul{background-color:#333;float:left;display:none;position:absolute;top:40px;min-width:160px;max-width:220px;_width:160px;margin-left:0;margin-right:0;padding:0;text-align:left;border:0;zoom:1;-webkit-border-radius:0 0 5px 5px;-moz-border-radius:0 0 5px 5px;border-radius:0 0 5px 5px;-webkit-box-shadow:0 1px 2px rgba(0, 0, 0, 0.6);-moz-box-shadow:0 1px 2px rgba(0, 0, 0, 0.6);box-shadow:0 1px 2px rgba(0, 0, 0, 0.6);}div.topbar ul li ul li{float:none;clear:both;display:block;background:none;font-size:12px;}div.topbar ul li ul li a{display:block;padding:6px 15px;clear:both;font-weight:normal;line-height:19px;color:#bbb;}div.topbar ul li ul li a:hover{background-color:#333;background-color:rgba(255, 255, 255, 0.25);color:#fff;} diff --git a/lib/patterns.less b/lib/patterns.less index 6106f3a3fa..5fffc309cb 100644 --- a/lib/patterns.less +++ b/lib/patterns.less @@ -154,7 +154,7 @@ div.topbar { &.open { a.menu, a:hover { - background-color: 444; + background-color: #444; background-color: rgba(255,255,255,.1); color: #fff; } From d97fb89480383db9b259f3ded839e35f0f4dd53f Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Sun, 21 Aug 2011 11:59:50 -0700 Subject: [PATCH 06/38] just disable filter --- lib/patterns.less | 1 - 1 file changed, 1 deletion(-) diff --git a/lib/patterns.less b/lib/patterns.less index 5fffc309cb..f281ac7778 100644 --- a/lib/patterns.less +++ b/lib/patterns.less @@ -11,7 +11,6 @@ div.topbar { background:#222; #gradient > .vertical(#333, #222); filter: "progid:DXImageTransform.Microsoft.gradient(enabled=false)"; - -ms-filter: "progid:DXImageTransform.Microsoft.gradient(enabled=false)"; height: 40px; position: fixed; top: 0; From 5c1d364740d62bc6ebe47f0d6d4253e1c9112a37 Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Sun, 21 Aug 2011 12:00:10 -0700 Subject: [PATCH 07/38] remake --- bootstrap-1.0.0.css | 3 +-- bootstrap-1.0.0.min.css | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/bootstrap-1.0.0.css b/bootstrap-1.0.0.css index 6c5f00a87c..2b8b32078b 100644 --- a/bootstrap-1.0.0.css +++ b/bootstrap-1.0.0.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: Sun Aug 21 11:57:22 PDT 2011 + * Date: Sun Aug 21 12:00:04 PDT 2011 */ /* Reset.less * Props to Eric Meyer (meyerweb.com) for his CSS reset file. We're using an adapted version here that cuts out some of the reset HTML elements we will never need here (i.e., dfn, samp, etc). @@ -1106,7 +1106,6 @@ div.topbar { filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#333333', endColorstr='#222222', GradientType=0); background-image: linear-gradient(#333333, #222222); filter: "progid:DXImageTransform.Microsoft.gradient(enabled=false)"; - -ms-filter: "progid:DXImageTransform.Microsoft.gradient(enabled=false)"; height: 40px; position: fixed; top: 0; diff --git a/bootstrap-1.0.0.min.css b/bootstrap-1.0.0.min.css index 6a579ec675..51f799fcca 100644 --- a/bootstrap-1.0.0.min.css +++ b/bootstrap-1.0.0.min.css @@ -153,7 +153,7 @@ table.zebra-striped th.orange{color:#f89406;border-bottom-color:#f89406;} table.zebra-striped th.headerSortUp.orange,table.zebra-striped th.headerSortDown.orange{background-color:#fee9cc;} table.zebra-striped th.purple{color:#7a43b6;border-bottom-color:#7a43b6;} table.zebra-striped th.headerSortUp.purple,table.zebra-striped th.headerSortDown.purple{background-color:#e2d5f0;} -div.topbar{background:#222;background-color:#222222;background-repeat:repeat-x;background-image:-khtml-gradient(linear, left top, left bottom, from(#333333), to(#222222));background-image:-moz-linear-gradient(#333333, #222222);background-image:-ms-linear-gradient(#333333, #222222);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #333333), color-stop(100%, #222222));background-image:-webkit-linear-gradient(#333333, #222222);background-image:-o-linear-gradient(#333333, #222222);-ms-filter:"progid:DXImageTransform.Microsoft.gradient(startColorstr='#333333', endColorstr='#222222', GradientType=0)";filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#333333', endColorstr='#222222', GradientType=0);background-image:linear-gradient(#333333, #222222);filter:"progid:DXImageTransform.Microsoft.gradient(enabled=false)";-ms-filter:"progid:DXImageTransform.Microsoft.gradient(enabled=false)";height:40px;position:fixed;top:0;left:0;right:0;z-index:10000;overflow:visible;-webkit-box-shadow:0 1px 3px rgba(0, 0, 0, 0.25),inset 0 -1px 0 rgba(0, 0, 0, 0.1);-moz-box-shadow:0 1px 3px rgba(0, 0, 0, 0.25),inset 0 -1px 0 rgba(0, 0, 0, 0.1);box-shadow:0 1px 3px rgba(0, 0, 0, 0.25),inset 0 -1px 0 rgba(0, 0, 0, 0.1);}div.topbar a{color:#bfbfbf;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);} +div.topbar{background:#222;background-color:#222222;background-repeat:repeat-x;background-image:-khtml-gradient(linear, left top, left bottom, from(#333333), to(#222222));background-image:-moz-linear-gradient(#333333, #222222);background-image:-ms-linear-gradient(#333333, #222222);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #333333), color-stop(100%, #222222));background-image:-webkit-linear-gradient(#333333, #222222);background-image:-o-linear-gradient(#333333, #222222);-ms-filter:"progid:DXImageTransform.Microsoft.gradient(startColorstr='#333333', endColorstr='#222222', GradientType=0)";filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#333333', endColorstr='#222222', GradientType=0);background-image:linear-gradient(#333333, #222222);filter:"progid:DXImageTransform.Microsoft.gradient(enabled=false)";height:40px;position:fixed;top:0;left:0;right:0;z-index:10000;overflow:visible;-webkit-box-shadow:0 1px 3px rgba(0, 0, 0, 0.25),inset 0 -1px 0 rgba(0, 0, 0, 0.1);-moz-box-shadow:0 1px 3px rgba(0, 0, 0, 0.25),inset 0 -1px 0 rgba(0, 0, 0, 0.1);box-shadow:0 1px 3px rgba(0, 0, 0, 0.25),inset 0 -1px 0 rgba(0, 0, 0, 0.1);}div.topbar a{color:#bfbfbf;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);} div.topbar a:hover,div.topbar ul li.active a{background-color:#333;background-color:rgba(255, 255, 255, 0.05);color:#ffffff;text-decoration:none;} div.topbar h3 a{float:left;display:block;padding:8px 20px 12px;margin-left:-20px;color:#ffffff;font-size:20px;font-weight:200;line-height:1;} div.topbar form{float:left;margin:5px 0 0 0;position:relative;filter:alpha(opacity=100);-khtml-opacity:1;-moz-opacity:1;opacity:1;}div.topbar form input{background-color:#444;background-color:rgba(255, 255, 255, 0.3);font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:normal;font-weight:13px;line-height:1;width:220px;padding:4px 9px;color:#fff;color:rgba(255, 255, 255, 0.75);border:1px solid #111;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-webkit-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1),0 1px 0px rgba(255, 255, 255, 0.25);-moz-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1),0 1px 0px rgba(255, 255, 255, 0.25);box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1),0 1px 0px rgba(255, 255, 255, 0.25);-webkit-transition:none;-moz-transition:none;transition:none;}div.topbar form input:-moz-placeholder{color:#e6e6e6;} From bb94457b4b3cba13b90e45550fe7a6ffafbfa5fc Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Sun, 21 Aug 2011 12:01:27 -0700 Subject: [PATCH 08/38] blah --- lib/patterns.less | 1 - 1 file changed, 1 deletion(-) diff --git a/lib/patterns.less b/lib/patterns.less index f281ac7778..eacd71a8b5 100644 --- a/lib/patterns.less +++ b/lib/patterns.less @@ -10,7 +10,6 @@ div.topbar { background:#222; #gradient > .vertical(#333, #222); - filter: "progid:DXImageTransform.Microsoft.gradient(enabled=false)"; height: 40px; position: fixed; top: 0; From c9f6e18f4ae27e8ce9173c3cd5941fbb8d9d100e Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Sun, 21 Aug 2011 12:03:20 -0700 Subject: [PATCH 09/38] remake --- bootstrap-1.0.0.css | 3 +-- bootstrap-1.0.0.min.css | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/bootstrap-1.0.0.css b/bootstrap-1.0.0.css index 2b8b32078b..2da67c1785 100644 --- a/bootstrap-1.0.0.css +++ b/bootstrap-1.0.0.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: Sun Aug 21 12:00:04 PDT 2011 + * Date: Sun Aug 21 12:03:15 PDT 2011 */ /* Reset.less * Props to Eric Meyer (meyerweb.com) for his CSS reset file. We're using an adapted version here that cuts out some of the reset HTML elements we will never need here (i.e., dfn, samp, etc). @@ -1105,7 +1105,6 @@ div.topbar { -ms-filter: "progid:DXImageTransform.Microsoft.gradient(startColorstr='#333333', endColorstr='#222222', GradientType=0)"; filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#333333', endColorstr='#222222', GradientType=0); background-image: linear-gradient(#333333, #222222); - filter: "progid:DXImageTransform.Microsoft.gradient(enabled=false)"; height: 40px; position: fixed; top: 0; diff --git a/bootstrap-1.0.0.min.css b/bootstrap-1.0.0.min.css index 51f799fcca..eb5ef1aefc 100644 --- a/bootstrap-1.0.0.min.css +++ b/bootstrap-1.0.0.min.css @@ -153,7 +153,7 @@ table.zebra-striped th.orange{color:#f89406;border-bottom-color:#f89406;} table.zebra-striped th.headerSortUp.orange,table.zebra-striped th.headerSortDown.orange{background-color:#fee9cc;} table.zebra-striped th.purple{color:#7a43b6;border-bottom-color:#7a43b6;} table.zebra-striped th.headerSortUp.purple,table.zebra-striped th.headerSortDown.purple{background-color:#e2d5f0;} -div.topbar{background:#222;background-color:#222222;background-repeat:repeat-x;background-image:-khtml-gradient(linear, left top, left bottom, from(#333333), to(#222222));background-image:-moz-linear-gradient(#333333, #222222);background-image:-ms-linear-gradient(#333333, #222222);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #333333), color-stop(100%, #222222));background-image:-webkit-linear-gradient(#333333, #222222);background-image:-o-linear-gradient(#333333, #222222);-ms-filter:"progid:DXImageTransform.Microsoft.gradient(startColorstr='#333333', endColorstr='#222222', GradientType=0)";filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#333333', endColorstr='#222222', GradientType=0);background-image:linear-gradient(#333333, #222222);filter:"progid:DXImageTransform.Microsoft.gradient(enabled=false)";height:40px;position:fixed;top:0;left:0;right:0;z-index:10000;overflow:visible;-webkit-box-shadow:0 1px 3px rgba(0, 0, 0, 0.25),inset 0 -1px 0 rgba(0, 0, 0, 0.1);-moz-box-shadow:0 1px 3px rgba(0, 0, 0, 0.25),inset 0 -1px 0 rgba(0, 0, 0, 0.1);box-shadow:0 1px 3px rgba(0, 0, 0, 0.25),inset 0 -1px 0 rgba(0, 0, 0, 0.1);}div.topbar a{color:#bfbfbf;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);} +div.topbar{background:#222;background-color:#222222;background-repeat:repeat-x;background-image:-khtml-gradient(linear, left top, left bottom, from(#333333), to(#222222));background-image:-moz-linear-gradient(#333333, #222222);background-image:-ms-linear-gradient(#333333, #222222);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #333333), color-stop(100%, #222222));background-image:-webkit-linear-gradient(#333333, #222222);background-image:-o-linear-gradient(#333333, #222222);-ms-filter:"progid:DXImageTransform.Microsoft.gradient(startColorstr='#333333', endColorstr='#222222', GradientType=0)";filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#333333', endColorstr='#222222', GradientType=0);background-image:linear-gradient(#333333, #222222);height:40px;position:fixed;top:0;left:0;right:0;z-index:10000;overflow:visible;-webkit-box-shadow:0 1px 3px rgba(0, 0, 0, 0.25),inset 0 -1px 0 rgba(0, 0, 0, 0.1);-moz-box-shadow:0 1px 3px rgba(0, 0, 0, 0.25),inset 0 -1px 0 rgba(0, 0, 0, 0.1);box-shadow:0 1px 3px rgba(0, 0, 0, 0.25),inset 0 -1px 0 rgba(0, 0, 0, 0.1);}div.topbar a{color:#bfbfbf;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);} div.topbar a:hover,div.topbar ul li.active a{background-color:#333;background-color:rgba(255, 255, 255, 0.05);color:#ffffff;text-decoration:none;} div.topbar h3 a{float:left;display:block;padding:8px 20px 12px;margin-left:-20px;color:#ffffff;font-size:20px;font-weight:200;line-height:1;} div.topbar form{float:left;margin:5px 0 0 0;position:relative;filter:alpha(opacity=100);-khtml-opacity:1;-moz-opacity:1;opacity:1;}div.topbar form input{background-color:#444;background-color:rgba(255, 255, 255, 0.3);font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:normal;font-weight:13px;line-height:1;width:220px;padding:4px 9px;color:#fff;color:rgba(255, 255, 255, 0.75);border:1px solid #111;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-webkit-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1),0 1px 0px rgba(255, 255, 255, 0.25);-moz-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1),0 1px 0px rgba(255, 255, 255, 0.25);box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1),0 1px 0px rgba(255, 255, 255, 0.25);-webkit-transition:none;-moz-transition:none;transition:none;}div.topbar form input:-moz-placeholder{color:#e6e6e6;} From 1d96417201721280c2a0579b875c0b64ea12c1ba Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Sun, 21 Aug 2011 12:06:22 -0700 Subject: [PATCH 10/38] try only -ms-filter --- bootstrap-1.0.0.css | 5 +---- bootstrap-1.0.0.min.css | 6 +++--- lib/preboot.less | 4 ++-- 3 files changed, 6 insertions(+), 9 deletions(-) diff --git a/bootstrap-1.0.0.css b/bootstrap-1.0.0.css index 2da67c1785..1de3ff56e8 100644 --- a/bootstrap-1.0.0.css +++ b/bootstrap-1.0.0.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: Sun Aug 21 12:03:15 PDT 2011 + * Date: Sun Aug 21 12:06:13 PDT 2011 */ /* Reset.less * Props to Eric Meyer (meyerweb.com) for his CSS reset file. We're using an adapted version here that cuts out some of the reset HTML elements we will never need here (i.e., dfn, samp, etc). @@ -422,7 +422,6 @@ a:hover { background-image: -webkit-linear-gradient(#049cdb, #0064cd); background-image: -o-linear-gradient(#049cdb, #0064cd); -ms-filter: "progid:DXImageTransform.Microsoft.gradient(startColorstr='#049cdb', endColorstr='#0064cd', GradientType=0)"; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#049cdb', endColorstr='#0064cd', GradientType=0); background-image: linear-gradient(#049cdb, #0064cd); color: #fff; text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); @@ -1103,7 +1102,6 @@ div.topbar { background-image: -webkit-linear-gradient(#333333, #222222); background-image: -o-linear-gradient(#333333, #222222); -ms-filter: "progid:DXImageTransform.Microsoft.gradient(startColorstr='#333333', endColorstr='#222222', GradientType=0)"; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#333333', endColorstr='#222222', GradientType=0); background-image: linear-gradient(#333333, #222222); height: 40px; position: fixed; @@ -1364,7 +1362,6 @@ div.alert-message { background-image: -webkit-linear-gradient(transparent, rgba(0, 0, 0, 0.15)); background-image: -o-linear-gradient(transparent, rgba(0, 0, 0, 0.15)); -ms-filter: "progid:DXImageTransform.Microsoft.gradient(startColorstr='transparent', endColorstr='rgba(0, 0, 0, 0.15)', GradientType=0)"; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='transparent', endColorstr='rgba(0, 0, 0, 0.15)', GradientType=0); background-image: linear-gradient(transparent, rgba(0, 0, 0, 0.15)); background-color: #e6e6e6; margin-bottom: 18px; diff --git a/bootstrap-1.0.0.min.css b/bootstrap-1.0.0.min.css index eb5ef1aefc..a783540fcd 100644 --- a/bootstrap-1.0.0.min.css +++ b/bootstrap-1.0.0.min.css @@ -48,7 +48,7 @@ div.container-fluid div.sidebar{float:left;width:220px;} div.container-fluid div.content{min-width:700px;max-width:1180px;margin-left:240px;} a{color:#0069d6;text-decoration:none;line-height:inherit;}a:hover{color:#0050a3;text-decoration:underline;} .btn{display:inline-block;background-color:#e6e6e6;background-repeat:no-repeat;background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), color-stop(0.25, #ffffff), to(#e6e6e6));background-image:-webkit-linear-gradient(#ffffff, color-stop(0.25, #ffffff), #e6e6e6);background-image:-moz-linear-gradient(#ffffff, color-stop(#ffffff, 0.25), #e6e6e6);background-image:-ms-linear-gradient(#ffffff, color-stop(#ffffff, 0.25), #e6e6e6);background-image:-o-linear-gradient(#ffffff, color-stop(#ffffff, 0.25), #e6e6e6);background-image:linear-gradient(#ffffff, color-stop(#ffffff, 0.25), #e6e6e6);padding:4px 14px;text-shadow:0 1px 1px rgba(255, 255, 255, 0.75);color:#333333;font-size:13px;line-height:18px;border:1px solid rgba(0, 0, 0, 0.1);border-bottom-color:rgba(0, 0, 0, 0.25);-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-webkit-box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0, 0.05);-moz-box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0, 0.05);box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0, 0.05);-webkit-transition:0.1s linear all;-moz-transition:0.1s linear all;transition:0.1s linear all;}.btn:hover{background-position:0 -15px;color:#333333;text-decoration:none;} -.btn.primary{background-color:#0064cd;background-repeat:repeat-x;background-image:-khtml-gradient(linear, left top, left bottom, from(#049cdb), to(#0064cd));background-image:-moz-linear-gradient(#049cdb, #0064cd);background-image:-ms-linear-gradient(#049cdb, #0064cd);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #049cdb), color-stop(100%, #0064cd));background-image:-webkit-linear-gradient(#049cdb, #0064cd);background-image:-o-linear-gradient(#049cdb, #0064cd);-ms-filter:"progid:DXImageTransform.Microsoft.gradient(startColorstr='#049cdb', endColorstr='#0064cd', GradientType=0)";filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#049cdb', endColorstr='#0064cd', GradientType=0);background-image:linear-gradient(#049cdb, #0064cd);color:#fff;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);}.btn.primary:hover{color:#fff;} +.btn.primary{background-color:#0064cd;background-repeat:repeat-x;background-image:-khtml-gradient(linear, left top, left bottom, from(#049cdb), to(#0064cd));background-image:-moz-linear-gradient(#049cdb, #0064cd);background-image:-ms-linear-gradient(#049cdb, #0064cd);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #049cdb), color-stop(100%, #0064cd));background-image:-webkit-linear-gradient(#049cdb, #0064cd);background-image:-o-linear-gradient(#049cdb, #0064cd);-ms-filter:"progid:DXImageTransform.Microsoft.gradient(startColorstr='#049cdb', endColorstr='#0064cd', GradientType=0)";background-image:linear-gradient(#049cdb, #0064cd);color:#fff;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);}.btn.primary:hover{color:#fff;} .btn.large{font-size:16px;line-height:28px;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;} .btn.small{padding-right:9px;padding-left:9px;font-size:11px;} .btn:disabled,.btn.disabled{background-image:none;filter:alpha(opacity=65);-khtml-opacity:0.65;-moz-opacity:0.65;opacity:0.65;cursor:default;} @@ -153,7 +153,7 @@ table.zebra-striped th.orange{color:#f89406;border-bottom-color:#f89406;} table.zebra-striped th.headerSortUp.orange,table.zebra-striped th.headerSortDown.orange{background-color:#fee9cc;} table.zebra-striped th.purple{color:#7a43b6;border-bottom-color:#7a43b6;} table.zebra-striped th.headerSortUp.purple,table.zebra-striped th.headerSortDown.purple{background-color:#e2d5f0;} -div.topbar{background:#222;background-color:#222222;background-repeat:repeat-x;background-image:-khtml-gradient(linear, left top, left bottom, from(#333333), to(#222222));background-image:-moz-linear-gradient(#333333, #222222);background-image:-ms-linear-gradient(#333333, #222222);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #333333), color-stop(100%, #222222));background-image:-webkit-linear-gradient(#333333, #222222);background-image:-o-linear-gradient(#333333, #222222);-ms-filter:"progid:DXImageTransform.Microsoft.gradient(startColorstr='#333333', endColorstr='#222222', GradientType=0)";filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#333333', endColorstr='#222222', GradientType=0);background-image:linear-gradient(#333333, #222222);height:40px;position:fixed;top:0;left:0;right:0;z-index:10000;overflow:visible;-webkit-box-shadow:0 1px 3px rgba(0, 0, 0, 0.25),inset 0 -1px 0 rgba(0, 0, 0, 0.1);-moz-box-shadow:0 1px 3px rgba(0, 0, 0, 0.25),inset 0 -1px 0 rgba(0, 0, 0, 0.1);box-shadow:0 1px 3px rgba(0, 0, 0, 0.25),inset 0 -1px 0 rgba(0, 0, 0, 0.1);}div.topbar a{color:#bfbfbf;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);} +div.topbar{background:#222;background-color:#222222;background-repeat:repeat-x;background-image:-khtml-gradient(linear, left top, left bottom, from(#333333), to(#222222));background-image:-moz-linear-gradient(#333333, #222222);background-image:-ms-linear-gradient(#333333, #222222);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #333333), color-stop(100%, #222222));background-image:-webkit-linear-gradient(#333333, #222222);background-image:-o-linear-gradient(#333333, #222222);-ms-filter:"progid:DXImageTransform.Microsoft.gradient(startColorstr='#333333', endColorstr='#222222', GradientType=0)";background-image:linear-gradient(#333333, #222222);height:40px;position:fixed;top:0;left:0;right:0;z-index:10000;overflow:visible;-webkit-box-shadow:0 1px 3px rgba(0, 0, 0, 0.25),inset 0 -1px 0 rgba(0, 0, 0, 0.1);-moz-box-shadow:0 1px 3px rgba(0, 0, 0, 0.25),inset 0 -1px 0 rgba(0, 0, 0, 0.1);box-shadow:0 1px 3px rgba(0, 0, 0, 0.25),inset 0 -1px 0 rgba(0, 0, 0, 0.1);}div.topbar a{color:#bfbfbf;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);} div.topbar a:hover,div.topbar ul li.active a{background-color:#333;background-color:rgba(255, 255, 255, 0.05);color:#ffffff;text-decoration:none;} div.topbar h3 a{float:left;display:block;padding:8px 20px 12px;margin-left:-20px;color:#ffffff;font-size:20px;font-weight:200;line-height:1;} div.topbar form{float:left;margin:5px 0 0 0;position:relative;filter:alpha(opacity=100);-khtml-opacity:1;-moz-opacity:1;opacity:1;}div.topbar form input{background-color:#444;background-color:rgba(255, 255, 255, 0.3);font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:normal;font-weight:13px;line-height:1;width:220px;padding:4px 9px;color:#fff;color:rgba(255, 255, 255, 0.75);border:1px solid #111;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-webkit-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1),0 1px 0px rgba(255, 255, 255, 0.25);-moz-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1),0 1px 0px rgba(255, 255, 255, 0.25);box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1),0 1px 0px rgba(255, 255, 255, 0.25);-webkit-transition:none;-moz-transition:none;transition:none;}div.topbar form input:-moz-placeholder{color:#e6e6e6;} @@ -175,7 +175,7 @@ div.topbar ul li ul li span{clear:both;display:block;background:rgba(0, 0, 0, 0. .hero-unit{background-color:#f5f5f5;margin-bottom:30px;padding:60px;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;}.hero-unit h1{margin-bottom:0;font-size:60px;line-height:1;letter-spacing:-1px;} .hero-unit p{font-size:18px;font-weight:200;line-height:27px;} div.page-header{margin-bottom:17px;border-bottom:1px solid #ddd;-webkit-box-shadow:0 1px 0 rgba(255, 255, 255, 0.5);-moz-box-shadow:0 1px 0 rgba(255, 255, 255, 0.5);box-shadow:0 1px 0 rgba(255, 255, 255, 0.5);}div.page-header h1{margin-bottom:8px;} -div.alert-message{background-color:rgba(0, 0, 0, 0.15);background-repeat:repeat-x;background-image:-khtml-gradient(linear, left top, left bottom, from(transparent), to(rgba(0, 0, 0, 0.15)));background-image:-moz-linear-gradient(transparent, rgba(0, 0, 0, 0.15));background-image:-ms-linear-gradient(transparent, rgba(0, 0, 0, 0.15));background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, transparent), color-stop(100%, rgba(0, 0, 0, 0.15)));background-image:-webkit-linear-gradient(transparent, rgba(0, 0, 0, 0.15));background-image:-o-linear-gradient(transparent, rgba(0, 0, 0, 0.15));-ms-filter:"progid:DXImageTransform.Microsoft.gradient(startColorstr='transparent', endColorstr='rgba(0, 0, 0, 0.15)', GradientType=0)";filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='transparent', endColorstr='rgba(0, 0, 0, 0.15)', GradientType=0);background-image:linear-gradient(transparent, rgba(0, 0, 0, 0.15));background-color:#e6e6e6;margin-bottom:18px;padding:8px 15px;color:#fff;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);border-bottom:1px solid rgba(0, 0, 0, 0.25);-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;}div.alert-message p{color:#fff;margin-bottom:0;}div.alert-message p+p{margin-top:5px;} +div.alert-message{background-color:rgba(0, 0, 0, 0.15);background-repeat:repeat-x;background-image:-khtml-gradient(linear, left top, left bottom, from(transparent), to(rgba(0, 0, 0, 0.15)));background-image:-moz-linear-gradient(transparent, rgba(0, 0, 0, 0.15));background-image:-ms-linear-gradient(transparent, rgba(0, 0, 0, 0.15));background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, transparent), color-stop(100%, rgba(0, 0, 0, 0.15)));background-image:-webkit-linear-gradient(transparent, rgba(0, 0, 0, 0.15));background-image:-o-linear-gradient(transparent, rgba(0, 0, 0, 0.15));-ms-filter:"progid:DXImageTransform.Microsoft.gradient(startColorstr='transparent', endColorstr='rgba(0, 0, 0, 0.15)', GradientType=0)";background-image:linear-gradient(transparent, rgba(0, 0, 0, 0.15));background-color:#e6e6e6;margin-bottom:18px;padding:8px 15px;color:#fff;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);border-bottom:1px solid rgba(0, 0, 0, 0.25);-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;}div.alert-message p{color:#fff;margin-bottom:0;}div.alert-message p+p{margin-top:5px;} div.alert-message.error{background-color:#e06359;} div.alert-message.warning{background-color:#ffd75a;} div.alert-message.success{background-color:#74c474;} diff --git a/lib/preboot.less b/lib/preboot.less index b90021ebe2..7839287b94 100644 --- a/lib/preboot.less +++ b/lib/preboot.less @@ -224,7 +224,7 @@ background-image: -webkit-linear-gradient(left, @startColor, @endColor); // Safari 5.1+, Chrome 10+ background-image: -o-linear-gradient(left, @startColor, @endColor); // Opera 11.10 -ms-filter: %("progid:DXImageTransform.Microsoft.gradient(startColorstr='%d', endColorstr='%d', GradientType=1)",@startColor,@endColor); // IE8+ - filter: e(%("progid:DXImageTransform.Microsoft.gradient(startColorstr='%d', endColorstr='%d', GradientType=1)",@startColor,@endColor)); // IE6 & IE7 + // filter: e(%("progid:DXImageTransform.Microsoft.gradient(startColorstr='%d', endColorstr='%d', GradientType=1)",@startColor,@endColor)); // IE6 & IE7 background-image: linear-gradient(left, @startColor, @endColor); // Le standard } .vertical (@startColor: #555, @endColor: #333) { @@ -237,7 +237,7 @@ background-image: -webkit-linear-gradient(@startColor, @endColor); // Safari 5.1+, Chrome 10+ background-image: -o-linear-gradient(@startColor, @endColor); // Opera 11.10 -ms-filter: %("progid:DXImageTransform.Microsoft.gradient(startColorstr='%d', endColorstr='%d', GradientType=0)",@startColor,@endColor); // IE8+ - filter: e(%("progid:DXImageTransform.Microsoft.gradient(startColorstr='%d', endColorstr='%d', GradientType=0)",@startColor,@endColor)); // IE6 & IE7 + // filter: e(%("progid:DXImageTransform.Microsoft.gradient(startColorstr='%d', endColorstr='%d', GradientType=0)",@startColor,@endColor)); // IE6 & IE7 background-image: linear-gradient(@startColor, @endColor); // The standard } .directional (@startColor: #555, @endColor: #333, @deg: 45deg) { From b18e76f99072fe94f771ad30e492f2d8aca463cb Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Sun, 21 Aug 2011 12:19:01 -0700 Subject: [PATCH 11/38] introduce .fill class to top-nav for overflow bug --- bootstrap-1.0.0.css | 29 +++++++++++++++++++++-------- bootstrap-1.0.0.min.css | 9 +++++---- docs/assets/css/docs.css | 3 +++ docs/index.html | 2 ++ lib/patterns.less | 38 +++++++++++++++++++++++++------------- lib/preboot.less | 4 ++-- 6 files changed, 58 insertions(+), 27 deletions(-) diff --git a/bootstrap-1.0.0.css b/bootstrap-1.0.0.css index 1de3ff56e8..8ea22a823a 100644 --- a/bootstrap-1.0.0.css +++ b/bootstrap-1.0.0.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: Sun Aug 21 12:06:13 PDT 2011 + * Date: Sun Aug 21 12:18:33 PDT 2011 */ /* Reset.less * Props to Eric Meyer (meyerweb.com) for his CSS reset file. We're using an adapted version here that cuts out some of the reset HTML elements we will never need here (i.e., dfn, samp, etc). @@ -422,6 +422,7 @@ a:hover { background-image: -webkit-linear-gradient(#049cdb, #0064cd); background-image: -o-linear-gradient(#049cdb, #0064cd); -ms-filter: "progid:DXImageTransform.Microsoft.gradient(startColorstr='#049cdb', endColorstr='#0064cd', GradientType=0)"; + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#049cdb', endColorstr='#0064cd', GradientType=0); background-image: linear-gradient(#049cdb, #0064cd); color: #fff; text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); @@ -1092,7 +1093,21 @@ table.zebra-striped th.headerSortUp.purple, table.zebra-striped th.headerSortDow * Repeatable UI elements outside the base styles provided from the scaffolding * ---------------------------------------------------------------------------- */ div.topbar { + height: 40px; + position: fixed; + top: 0; + left: 0; + right: 0; + z-index: 10000; + overflow: visible; +} +div.topbar .fill { background: #222; + position: absolute; + top: 0; + left: 0; + bottom: 0; + right: 0; background-color: #222222; background-repeat: repeat-x; background-image: -khtml-gradient(linear, left top, left bottom, from(#333333), to(#222222)); @@ -1102,14 +1117,8 @@ div.topbar { background-image: -webkit-linear-gradient(#333333, #222222); background-image: -o-linear-gradient(#333333, #222222); -ms-filter: "progid:DXImageTransform.Microsoft.gradient(startColorstr='#333333', endColorstr='#222222', GradientType=0)"; + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#333333', endColorstr='#222222', GradientType=0); background-image: linear-gradient(#333333, #222222); - height: 40px; - position: fixed; - top: 0; - left: 0; - right: 0; - z-index: 10000; - overflow: visible; -webkit-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.25), inset 0 -1px 0 rgba(0, 0, 0, 0.1); -moz-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.25), inset 0 -1px 0 rgba(0, 0, 0, 0.1); box-shadow: 0 1px 3px rgba(0, 0, 0, 0.25), inset 0 -1px 0 rgba(0, 0, 0, 0.1); @@ -1124,6 +1133,9 @@ div.topbar a:hover, div.topbar ul li.active a { color: #ffffff; text-decoration: none; } +div.topbar h3 { + position: relative; +} div.topbar h3 a { float: left; display: block; @@ -1362,6 +1374,7 @@ div.alert-message { background-image: -webkit-linear-gradient(transparent, rgba(0, 0, 0, 0.15)); background-image: -o-linear-gradient(transparent, rgba(0, 0, 0, 0.15)); -ms-filter: "progid:DXImageTransform.Microsoft.gradient(startColorstr='transparent', endColorstr='rgba(0, 0, 0, 0.15)', GradientType=0)"; + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='transparent', endColorstr='rgba(0, 0, 0, 0.15)', GradientType=0); background-image: linear-gradient(transparent, rgba(0, 0, 0, 0.15)); background-color: #e6e6e6; margin-bottom: 18px; diff --git a/bootstrap-1.0.0.min.css b/bootstrap-1.0.0.min.css index a783540fcd..5f1e65b26e 100644 --- a/bootstrap-1.0.0.min.css +++ b/bootstrap-1.0.0.min.css @@ -48,7 +48,7 @@ div.container-fluid div.sidebar{float:left;width:220px;} div.container-fluid div.content{min-width:700px;max-width:1180px;margin-left:240px;} a{color:#0069d6;text-decoration:none;line-height:inherit;}a:hover{color:#0050a3;text-decoration:underline;} .btn{display:inline-block;background-color:#e6e6e6;background-repeat:no-repeat;background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), color-stop(0.25, #ffffff), to(#e6e6e6));background-image:-webkit-linear-gradient(#ffffff, color-stop(0.25, #ffffff), #e6e6e6);background-image:-moz-linear-gradient(#ffffff, color-stop(#ffffff, 0.25), #e6e6e6);background-image:-ms-linear-gradient(#ffffff, color-stop(#ffffff, 0.25), #e6e6e6);background-image:-o-linear-gradient(#ffffff, color-stop(#ffffff, 0.25), #e6e6e6);background-image:linear-gradient(#ffffff, color-stop(#ffffff, 0.25), #e6e6e6);padding:4px 14px;text-shadow:0 1px 1px rgba(255, 255, 255, 0.75);color:#333333;font-size:13px;line-height:18px;border:1px solid rgba(0, 0, 0, 0.1);border-bottom-color:rgba(0, 0, 0, 0.25);-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-webkit-box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0, 0.05);-moz-box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0, 0.05);box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0, 0.05);-webkit-transition:0.1s linear all;-moz-transition:0.1s linear all;transition:0.1s linear all;}.btn:hover{background-position:0 -15px;color:#333333;text-decoration:none;} -.btn.primary{background-color:#0064cd;background-repeat:repeat-x;background-image:-khtml-gradient(linear, left top, left bottom, from(#049cdb), to(#0064cd));background-image:-moz-linear-gradient(#049cdb, #0064cd);background-image:-ms-linear-gradient(#049cdb, #0064cd);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #049cdb), color-stop(100%, #0064cd));background-image:-webkit-linear-gradient(#049cdb, #0064cd);background-image:-o-linear-gradient(#049cdb, #0064cd);-ms-filter:"progid:DXImageTransform.Microsoft.gradient(startColorstr='#049cdb', endColorstr='#0064cd', GradientType=0)";background-image:linear-gradient(#049cdb, #0064cd);color:#fff;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);}.btn.primary:hover{color:#fff;} +.btn.primary{background-color:#0064cd;background-repeat:repeat-x;background-image:-khtml-gradient(linear, left top, left bottom, from(#049cdb), to(#0064cd));background-image:-moz-linear-gradient(#049cdb, #0064cd);background-image:-ms-linear-gradient(#049cdb, #0064cd);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #049cdb), color-stop(100%, #0064cd));background-image:-webkit-linear-gradient(#049cdb, #0064cd);background-image:-o-linear-gradient(#049cdb, #0064cd);-ms-filter:"progid:DXImageTransform.Microsoft.gradient(startColorstr='#049cdb', endColorstr='#0064cd', GradientType=0)";filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#049cdb', endColorstr='#0064cd', GradientType=0);background-image:linear-gradient(#049cdb, #0064cd);color:#fff;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);}.btn.primary:hover{color:#fff;} .btn.large{font-size:16px;line-height:28px;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;} .btn.small{padding-right:9px;padding-left:9px;font-size:11px;} .btn:disabled,.btn.disabled{background-image:none;filter:alpha(opacity=65);-khtml-opacity:0.65;-moz-opacity:0.65;opacity:0.65;cursor:default;} @@ -153,9 +153,10 @@ table.zebra-striped th.orange{color:#f89406;border-bottom-color:#f89406;} table.zebra-striped th.headerSortUp.orange,table.zebra-striped th.headerSortDown.orange{background-color:#fee9cc;} table.zebra-striped th.purple{color:#7a43b6;border-bottom-color:#7a43b6;} table.zebra-striped th.headerSortUp.purple,table.zebra-striped th.headerSortDown.purple{background-color:#e2d5f0;} -div.topbar{background:#222;background-color:#222222;background-repeat:repeat-x;background-image:-khtml-gradient(linear, left top, left bottom, from(#333333), to(#222222));background-image:-moz-linear-gradient(#333333, #222222);background-image:-ms-linear-gradient(#333333, #222222);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #333333), color-stop(100%, #222222));background-image:-webkit-linear-gradient(#333333, #222222);background-image:-o-linear-gradient(#333333, #222222);-ms-filter:"progid:DXImageTransform.Microsoft.gradient(startColorstr='#333333', endColorstr='#222222', GradientType=0)";background-image:linear-gradient(#333333, #222222);height:40px;position:fixed;top:0;left:0;right:0;z-index:10000;overflow:visible;-webkit-box-shadow:0 1px 3px rgba(0, 0, 0, 0.25),inset 0 -1px 0 rgba(0, 0, 0, 0.1);-moz-box-shadow:0 1px 3px rgba(0, 0, 0, 0.25),inset 0 -1px 0 rgba(0, 0, 0, 0.1);box-shadow:0 1px 3px rgba(0, 0, 0, 0.25),inset 0 -1px 0 rgba(0, 0, 0, 0.1);}div.topbar a{color:#bfbfbf;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);} +div.topbar{height:40px;position:fixed;top:0;left:0;right:0;z-index:10000;overflow:visible;}div.topbar .fill{background:#222;position:absolute;top:0;left:0;bottom:0;right:0;background-color:#222222;background-repeat:repeat-x;background-image:-khtml-gradient(linear, left top, left bottom, from(#333333), to(#222222));background-image:-moz-linear-gradient(#333333, #222222);background-image:-ms-linear-gradient(#333333, #222222);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #333333), color-stop(100%, #222222));background-image:-webkit-linear-gradient(#333333, #222222);background-image:-o-linear-gradient(#333333, #222222);-ms-filter:"progid:DXImageTransform.Microsoft.gradient(startColorstr='#333333', endColorstr='#222222', GradientType=0)";filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#333333', endColorstr='#222222', GradientType=0);background-image:linear-gradient(#333333, #222222);-webkit-box-shadow:0 1px 3px rgba(0, 0, 0, 0.25),inset 0 -1px 0 rgba(0, 0, 0, 0.1);-moz-box-shadow:0 1px 3px rgba(0, 0, 0, 0.25),inset 0 -1px 0 rgba(0, 0, 0, 0.1);box-shadow:0 1px 3px rgba(0, 0, 0, 0.25),inset 0 -1px 0 rgba(0, 0, 0, 0.1);} +div.topbar a{color:#bfbfbf;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);} div.topbar a:hover,div.topbar ul li.active a{background-color:#333;background-color:rgba(255, 255, 255, 0.05);color:#ffffff;text-decoration:none;} -div.topbar h3 a{float:left;display:block;padding:8px 20px 12px;margin-left:-20px;color:#ffffff;font-size:20px;font-weight:200;line-height:1;} +div.topbar h3{position:relative;}div.topbar h3 a{float:left;display:block;padding:8px 20px 12px;margin-left:-20px;color:#ffffff;font-size:20px;font-weight:200;line-height:1;} div.topbar form{float:left;margin:5px 0 0 0;position:relative;filter:alpha(opacity=100);-khtml-opacity:1;-moz-opacity:1;opacity:1;}div.topbar form input{background-color:#444;background-color:rgba(255, 255, 255, 0.3);font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:normal;font-weight:13px;line-height:1;width:220px;padding:4px 9px;color:#fff;color:rgba(255, 255, 255, 0.75);border:1px solid #111;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-webkit-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1),0 1px 0px rgba(255, 255, 255, 0.25);-moz-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1),0 1px 0px rgba(255, 255, 255, 0.25);box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1),0 1px 0px rgba(255, 255, 255, 0.25);-webkit-transition:none;-moz-transition:none;transition:none;}div.topbar form input:-moz-placeholder{color:#e6e6e6;} div.topbar form input::-webkit-input-placeholder{color:#e6e6e6;} div.topbar form input:hover{background-color:#bfbfbf;background-color:rgba(255, 255, 255, 0.5);color:#fff;} @@ -175,7 +176,7 @@ div.topbar ul li ul li span{clear:both;display:block;background:rgba(0, 0, 0, 0. .hero-unit{background-color:#f5f5f5;margin-bottom:30px;padding:60px;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;}.hero-unit h1{margin-bottom:0;font-size:60px;line-height:1;letter-spacing:-1px;} .hero-unit p{font-size:18px;font-weight:200;line-height:27px;} div.page-header{margin-bottom:17px;border-bottom:1px solid #ddd;-webkit-box-shadow:0 1px 0 rgba(255, 255, 255, 0.5);-moz-box-shadow:0 1px 0 rgba(255, 255, 255, 0.5);box-shadow:0 1px 0 rgba(255, 255, 255, 0.5);}div.page-header h1{margin-bottom:8px;} -div.alert-message{background-color:rgba(0, 0, 0, 0.15);background-repeat:repeat-x;background-image:-khtml-gradient(linear, left top, left bottom, from(transparent), to(rgba(0, 0, 0, 0.15)));background-image:-moz-linear-gradient(transparent, rgba(0, 0, 0, 0.15));background-image:-ms-linear-gradient(transparent, rgba(0, 0, 0, 0.15));background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, transparent), color-stop(100%, rgba(0, 0, 0, 0.15)));background-image:-webkit-linear-gradient(transparent, rgba(0, 0, 0, 0.15));background-image:-o-linear-gradient(transparent, rgba(0, 0, 0, 0.15));-ms-filter:"progid:DXImageTransform.Microsoft.gradient(startColorstr='transparent', endColorstr='rgba(0, 0, 0, 0.15)', GradientType=0)";background-image:linear-gradient(transparent, rgba(0, 0, 0, 0.15));background-color:#e6e6e6;margin-bottom:18px;padding:8px 15px;color:#fff;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);border-bottom:1px solid rgba(0, 0, 0, 0.25);-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;}div.alert-message p{color:#fff;margin-bottom:0;}div.alert-message p+p{margin-top:5px;} +div.alert-message{background-color:rgba(0, 0, 0, 0.15);background-repeat:repeat-x;background-image:-khtml-gradient(linear, left top, left bottom, from(transparent), to(rgba(0, 0, 0, 0.15)));background-image:-moz-linear-gradient(transparent, rgba(0, 0, 0, 0.15));background-image:-ms-linear-gradient(transparent, rgba(0, 0, 0, 0.15));background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, transparent), color-stop(100%, rgba(0, 0, 0, 0.15)));background-image:-webkit-linear-gradient(transparent, rgba(0, 0, 0, 0.15));background-image:-o-linear-gradient(transparent, rgba(0, 0, 0, 0.15));-ms-filter:"progid:DXImageTransform.Microsoft.gradient(startColorstr='transparent', endColorstr='rgba(0, 0, 0, 0.15)', GradientType=0)";filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='transparent', endColorstr='rgba(0, 0, 0, 0.15)', GradientType=0);background-image:linear-gradient(transparent, rgba(0, 0, 0, 0.15));background-color:#e6e6e6;margin-bottom:18px;padding:8px 15px;color:#fff;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);border-bottom:1px solid rgba(0, 0, 0, 0.25);-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;}div.alert-message p{color:#fff;margin-bottom:0;}div.alert-message p+p{margin-top:5px;} div.alert-message.error{background-color:#e06359;} div.alert-message.warning{background-color:#ffd75a;} div.alert-message.success{background-color:#74c474;} diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index ede141ce51..2f2f096ca6 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -223,6 +223,9 @@ div.topbar-wrapper div.topbar { margin: 0 -20px; padding-left: 20px; padding-right: 20px; +} + +div.topbar-wrapper div.topbar .fill { -webkit-border-radius: 4px; -moz-border-radius: 4px; border-radius: 4px; diff --git a/docs/index.html b/docs/index.html index 7244191c94..7738b4a6e5 100644 --- a/docs/index.html +++ b/docs/index.html @@ -32,6 +32,7 @@
+

Bootstrap

    @@ -879,6 +880,7 @@

    Fixed topbar

    +

    Project Name

      diff --git a/lib/patterns.less b/lib/patterns.less index eacd71a8b5..bc9516fd64 100644 --- a/lib/patterns.less +++ b/lib/patterns.less @@ -8,8 +8,6 @@ // Topbar for Branding and Nav div.topbar { - background:#222; - #gradient > .vertical(#333, #222); height: 40px; position: fixed; top: 0; @@ -17,8 +15,19 @@ div.topbar { right: 0; z-index: 10000; overflow: visible; - @shadow: 0 1px 3px rgba(0,0,0,.25), inset 0 -1px 0 rgba(0,0,0,.1); - .box-shadow(@shadow); + + // gradient is applied to it's own element because overflow visible is not honored by ie when filter is present + .fill { + background:#222; + position:absolute; + top: 0; + left: 0; + bottom: 0; + right: 0; + #gradient > .vertical(#333, #222); + @shadow: 0 1px 3px rgba(0,0,0,.25), inset 0 -1px 0 rgba(0,0,0,.1); + .box-shadow(@shadow); + } // Links get text shadow a { @@ -36,15 +45,18 @@ div.topbar { } // Website name - h3 a { - float: left; - display: block; - padding: 8px 20px 12px; - margin-left: -20px; // negative indent to left-align the text down the page - color: @white; - font-size: 20px; - font-weight: 200; - line-height: 1; + h3 { + position:relative; + a { + float: left; + display: block; + padding: 8px 20px 12px; + margin-left: -20px; // negative indent to left-align the text down the page + color: @white; + font-size: 20px; + font-weight: 200; + line-height: 1; + } } // Search Form diff --git a/lib/preboot.less b/lib/preboot.less index 7839287b94..b90021ebe2 100644 --- a/lib/preboot.less +++ b/lib/preboot.less @@ -224,7 +224,7 @@ background-image: -webkit-linear-gradient(left, @startColor, @endColor); // Safari 5.1+, Chrome 10+ background-image: -o-linear-gradient(left, @startColor, @endColor); // Opera 11.10 -ms-filter: %("progid:DXImageTransform.Microsoft.gradient(startColorstr='%d', endColorstr='%d', GradientType=1)",@startColor,@endColor); // IE8+ - // filter: e(%("progid:DXImageTransform.Microsoft.gradient(startColorstr='%d', endColorstr='%d', GradientType=1)",@startColor,@endColor)); // IE6 & IE7 + filter: e(%("progid:DXImageTransform.Microsoft.gradient(startColorstr='%d', endColorstr='%d', GradientType=1)",@startColor,@endColor)); // IE6 & IE7 background-image: linear-gradient(left, @startColor, @endColor); // Le standard } .vertical (@startColor: #555, @endColor: #333) { @@ -237,7 +237,7 @@ background-image: -webkit-linear-gradient(@startColor, @endColor); // Safari 5.1+, Chrome 10+ background-image: -o-linear-gradient(@startColor, @endColor); // Opera 11.10 -ms-filter: %("progid:DXImageTransform.Microsoft.gradient(startColorstr='%d', endColorstr='%d', GradientType=0)",@startColor,@endColor); // IE8+ - // filter: e(%("progid:DXImageTransform.Microsoft.gradient(startColorstr='%d', endColorstr='%d', GradientType=0)",@startColor,@endColor)); // IE6 & IE7 + filter: e(%("progid:DXImageTransform.Microsoft.gradient(startColorstr='%d', endColorstr='%d', GradientType=0)",@startColor,@endColor)); // IE6 & IE7 background-image: linear-gradient(@startColor, @endColor); // The standard } .directional (@startColor: #555, @endColor: #333, @deg: 45deg) { From 2435b6417a442273f660ab368c532b2c84cb2601 Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Sun, 21 Aug 2011 12:26:51 -0700 Subject: [PATCH 12/38] give pagination nav borders in ie --- bootstrap-1.0.0.css | 2 +- lib/patterns.less | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/bootstrap-1.0.0.css b/bootstrap-1.0.0.css index 8ea22a823a..dc3eb2e1f6 100644 --- a/bootstrap-1.0.0.css +++ b/bootstrap-1.0.0.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: Sun Aug 21 12:18:33 PDT 2011 + * Date: Sun Aug 21 12:26:03 PDT 2011 */ /* Reset.less * Props to Eric Meyer (meyerweb.com) for his CSS reset file. We're using an adapted version here that cuts out some of the reset HTML elements we will never need here (i.e., dfn, samp, etc). diff --git a/lib/patterns.less b/lib/patterns.less index bc9516fd64..9e57d0e303 100644 --- a/lib/patterns.less +++ b/lib/patterns.less @@ -456,7 +456,7 @@ div.pagination { ul { float: left; margin: 0; - border: 1px solid rgba(0,0,0,.15); + border: 1px solid #ddd; .border-radius(3px); .box-shadow(0 1px 2px rgba(0,0,0,.075); li { @@ -465,7 +465,9 @@ div.pagination { float: left; padding: 0 14px; line-height: (@baseline * 2) - 2; - border-right: 1px solid rgba(0,0,0,.15); + border-right: 1px solid; + border-right-color: #ddd; + border-right-color: rgba(0,0,0,.15); text-decoration: none; } a:hover, From 6fa71861556f4f6c4b5e2b29e592ab9c118be8ef Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Sun, 21 Aug 2011 12:27:28 -0700 Subject: [PATCH 13/38] remake with border fix --- bootstrap-1.0.0.css | 8 +++++--- bootstrap-1.0.0.min.css | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/bootstrap-1.0.0.css b/bootstrap-1.0.0.css index dc3eb2e1f6..d5b91901cb 100644 --- a/bootstrap-1.0.0.css +++ b/bootstrap-1.0.0.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: Sun Aug 21 12:26:03 PDT 2011 + * Date: Sun Aug 21 12:27:18 PDT 2011 */ /* Reset.less * Props to Eric Meyer (meyerweb.com) for his CSS reset file. We're using an adapted version here that cuts out some of the reset HTML elements we will never need here (i.e., dfn, samp, etc). @@ -1544,7 +1544,7 @@ div.pagination { div.pagination ul { float: left; margin: 0; - border: 1px solid rgba(0, 0, 0, 0.15); + border: 1px solid #ddd; -webkit-border-radius: 3px; -moz-border-radius: 3px; border-radius: 3px; @@ -1559,7 +1559,9 @@ div.pagination ul li a { float: left; padding: 0 14px; line-height: 34px; - border-right: 1px solid rgba(0, 0, 0, 0.15); + border-right: 1px solid; + border-right-color: #ddd; + border-right-color: rgba(0, 0, 0, 0.15); text-decoration: none; } div.pagination ul li a:hover, div.pagination ul li.active a { diff --git a/bootstrap-1.0.0.min.css b/bootstrap-1.0.0.min.css index 5f1e65b26e..22f98ddad0 100644 --- a/bootstrap-1.0.0.min.css +++ b/bootstrap-1.0.0.min.css @@ -197,7 +197,7 @@ ul.tabs{width:100%;border-bottom:1px solid #bfbfbf;}ul.tabs li a{margin-bottom:- ul.tabs li.active a{background-color:#fff;padding:0 14px;border:1px solid #ccc;border-bottom:0;color:#808080;} ul.pills li a{margin:5px 3px 5px 0;padding:0 15px;text-shadow:0 1px 1px #fff;line-height:30px;-webkit-border-radius:15px;-moz-border-radius:15px;border-radius:15px;}ul.pills li a:hover{background:#0050a3;color:#fff;text-decoration:none;text-shadow:0 1px 1px rgba(0, 0, 0, 0.25);} ul.pills li.active a{background:#0069d6;color:#fff;text-shadow:0 1px 1px rgba(0, 0, 0, 0.25);} -div.pagination{height:36px;margin:18px 0;}div.pagination ul{float:left;margin:0;border:1px solid rgba(0, 0, 0, 0.15);-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;-webkit-box-shadow:0 1px 2px rgba(0, 0, 0, 0.075);-moz-box-shadow:0 1px 2px rgba(0, 0, 0, 0.075);box-shadow:0 1px 2px rgba(0, 0, 0, 0.075);}div.pagination ul li{display:inline;}div.pagination ul li a{float:left;padding:0 14px;line-height:34px;border-right:1px solid rgba(0, 0, 0, 0.15);text-decoration:none;} +div.pagination{height:36px;margin:18px 0;}div.pagination ul{float:left;margin:0;border:1px solid #ddd;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;-webkit-box-shadow:0 1px 2px rgba(0, 0, 0, 0.075);-moz-box-shadow:0 1px 2px rgba(0, 0, 0, 0.075);box-shadow:0 1px 2px rgba(0, 0, 0, 0.075);}div.pagination ul li{display:inline;}div.pagination ul li a{float:left;padding:0 14px;line-height:34px;border-right:1px solid;border-right-color:#ddd;border-right-color:rgba(0, 0, 0, 0.15);text-decoration:none;} div.pagination ul li a:hover,div.pagination ul li.active a{background-color:#c7eefe;} div.pagination ul li.disabled a,div.pagination ul li.disabled a:hover{background-color:none;color:#bfbfbf;} div.pagination ul li.next a,div.pagination ul li:last-child a{border:0;} From 971336c8086825e1a227bb956482708a3df0875d Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Sun, 21 Aug 2011 12:31:55 -0700 Subject: [PATCH 14/38] don't display right border for ie --- bootstrap-1.0.0.css | 3 ++- bootstrap-1.0.0.min.css | 2 +- lib/patterns.less | 1 + 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/bootstrap-1.0.0.css b/bootstrap-1.0.0.css index d5b91901cb..aa3308210c 100644 --- a/bootstrap-1.0.0.css +++ b/bootstrap-1.0.0.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: Sun Aug 21 12:27:18 PDT 2011 + * Date: Sun Aug 21 12:30:45 PDT 2011 */ /* Reset.less * Props to Eric Meyer (meyerweb.com) for his CSS reset file. We're using an adapted version here that cuts out some of the reset HTML elements we will never need here (i.e., dfn, samp, etc). @@ -1545,6 +1545,7 @@ div.pagination ul { float: left; margin: 0; border: 1px solid #ddd; + border-right-color: rgba(0, 0, 0, 0.15); -webkit-border-radius: 3px; -moz-border-radius: 3px; border-radius: 3px; diff --git a/bootstrap-1.0.0.min.css b/bootstrap-1.0.0.min.css index 22f98ddad0..c723cd651f 100644 --- a/bootstrap-1.0.0.min.css +++ b/bootstrap-1.0.0.min.css @@ -197,7 +197,7 @@ ul.tabs{width:100%;border-bottom:1px solid #bfbfbf;}ul.tabs li a{margin-bottom:- ul.tabs li.active a{background-color:#fff;padding:0 14px;border:1px solid #ccc;border-bottom:0;color:#808080;} ul.pills li a{margin:5px 3px 5px 0;padding:0 15px;text-shadow:0 1px 1px #fff;line-height:30px;-webkit-border-radius:15px;-moz-border-radius:15px;border-radius:15px;}ul.pills li a:hover{background:#0050a3;color:#fff;text-decoration:none;text-shadow:0 1px 1px rgba(0, 0, 0, 0.25);} ul.pills li.active a{background:#0069d6;color:#fff;text-shadow:0 1px 1px rgba(0, 0, 0, 0.25);} -div.pagination{height:36px;margin:18px 0;}div.pagination ul{float:left;margin:0;border:1px solid #ddd;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;-webkit-box-shadow:0 1px 2px rgba(0, 0, 0, 0.075);-moz-box-shadow:0 1px 2px rgba(0, 0, 0, 0.075);box-shadow:0 1px 2px rgba(0, 0, 0, 0.075);}div.pagination ul li{display:inline;}div.pagination ul li a{float:left;padding:0 14px;line-height:34px;border-right:1px solid;border-right-color:#ddd;border-right-color:rgba(0, 0, 0, 0.15);text-decoration:none;} +div.pagination{height:36px;margin:18px 0;}div.pagination ul{float:left;margin:0;border:1px solid #ddd;border-right-color:rgba(0, 0, 0, 0.15);-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;-webkit-box-shadow:0 1px 2px rgba(0, 0, 0, 0.075);-moz-box-shadow:0 1px 2px rgba(0, 0, 0, 0.075);box-shadow:0 1px 2px rgba(0, 0, 0, 0.075);}div.pagination ul li{display:inline;}div.pagination ul li a{float:left;padding:0 14px;line-height:34px;border-right:1px solid;border-right-color:#ddd;border-right-color:rgba(0, 0, 0, 0.15);text-decoration:none;} div.pagination ul li a:hover,div.pagination ul li.active a{background-color:#c7eefe;} div.pagination ul li.disabled a,div.pagination ul li.disabled a:hover{background-color:none;color:#bfbfbf;} div.pagination ul li.next a,div.pagination ul li:last-child a{border:0;} diff --git a/lib/patterns.less b/lib/patterns.less index 9e57d0e303..dc5f45ab02 100644 --- a/lib/patterns.less +++ b/lib/patterns.less @@ -457,6 +457,7 @@ div.pagination { float: left; margin: 0; border: 1px solid #ddd; + border-right-color: rgba(0,0,0,.15); // don't display right border for ie .border-radius(3px); .box-shadow(0 1px 2px rgba(0,0,0,.075); li { From d671d566e14a569feed87422c0b2f035f3dd9128 Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Sun, 21 Aug 2011 12:35:14 -0700 Subject: [PATCH 15/38] more ie border junk --- lib/patterns.less | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/patterns.less b/lib/patterns.less index dc5f45ab02..0e121cb31c 100644 --- a/lib/patterns.less +++ b/lib/patterns.less @@ -456,8 +456,8 @@ div.pagination { ul { float: left; margin: 0; - border: 1px solid #ddd; - border-right-color: rgba(0,0,0,.15); // don't display right border for ie + border: 1px solid; + border-color: #ddd rgba(0,0,0,.15) #ddd #ddd; .border-radius(3px); .box-shadow(0 1px 2px rgba(0,0,0,.075); li { From 5b505aaf97f9f5ccb05551ffed18eed25cbb826b Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Sun, 21 Aug 2011 12:35:42 -0700 Subject: [PATCH 16/38] remake junk --- bootstrap-1.0.0.css | 6 +++--- bootstrap-1.0.0.min.css | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/bootstrap-1.0.0.css b/bootstrap-1.0.0.css index aa3308210c..95fb641a90 100644 --- a/bootstrap-1.0.0.css +++ b/bootstrap-1.0.0.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: Sun Aug 21 12:30:45 PDT 2011 + * Date: Sun Aug 21 12:35:35 PDT 2011 */ /* Reset.less * Props to Eric Meyer (meyerweb.com) for his CSS reset file. We're using an adapted version here that cuts out some of the reset HTML elements we will never need here (i.e., dfn, samp, etc). @@ -1544,8 +1544,8 @@ div.pagination { div.pagination ul { float: left; margin: 0; - border: 1px solid #ddd; - border-right-color: rgba(0, 0, 0, 0.15); + border: 1px solid; + border-color: #dddddd rgba(0, 0, 0, 0.15) #dddddd #dddddd; -webkit-border-radius: 3px; -moz-border-radius: 3px; border-radius: 3px; diff --git a/bootstrap-1.0.0.min.css b/bootstrap-1.0.0.min.css index c723cd651f..e1e6cb7691 100644 --- a/bootstrap-1.0.0.min.css +++ b/bootstrap-1.0.0.min.css @@ -197,7 +197,7 @@ ul.tabs{width:100%;border-bottom:1px solid #bfbfbf;}ul.tabs li a{margin-bottom:- ul.tabs li.active a{background-color:#fff;padding:0 14px;border:1px solid #ccc;border-bottom:0;color:#808080;} ul.pills li a{margin:5px 3px 5px 0;padding:0 15px;text-shadow:0 1px 1px #fff;line-height:30px;-webkit-border-radius:15px;-moz-border-radius:15px;border-radius:15px;}ul.pills li a:hover{background:#0050a3;color:#fff;text-decoration:none;text-shadow:0 1px 1px rgba(0, 0, 0, 0.25);} ul.pills li.active a{background:#0069d6;color:#fff;text-shadow:0 1px 1px rgba(0, 0, 0, 0.25);} -div.pagination{height:36px;margin:18px 0;}div.pagination ul{float:left;margin:0;border:1px solid #ddd;border-right-color:rgba(0, 0, 0, 0.15);-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;-webkit-box-shadow:0 1px 2px rgba(0, 0, 0, 0.075);-moz-box-shadow:0 1px 2px rgba(0, 0, 0, 0.075);box-shadow:0 1px 2px rgba(0, 0, 0, 0.075);}div.pagination ul li{display:inline;}div.pagination ul li a{float:left;padding:0 14px;line-height:34px;border-right:1px solid;border-right-color:#ddd;border-right-color:rgba(0, 0, 0, 0.15);text-decoration:none;} +div.pagination{height:36px;margin:18px 0;}div.pagination ul{float:left;margin:0;border:1px solid;border-color:#dddddd rgba(0, 0, 0, 0.15) #dddddd #dddddd;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;-webkit-box-shadow:0 1px 2px rgba(0, 0, 0, 0.075);-moz-box-shadow:0 1px 2px rgba(0, 0, 0, 0.075);box-shadow:0 1px 2px rgba(0, 0, 0, 0.075);}div.pagination ul li{display:inline;}div.pagination ul li a{float:left;padding:0 14px;line-height:34px;border-right:1px solid;border-right-color:#ddd;border-right-color:rgba(0, 0, 0, 0.15);text-decoration:none;} div.pagination ul li a:hover,div.pagination ul li.active a{background-color:#c7eefe;} div.pagination ul li.disabled a,div.pagination ul li.disabled a:hover{background-color:none;color:#bfbfbf;} div.pagination ul li.next a,div.pagination ul li:last-child a{border:0;} From 7e67ddf78897b5cd256e28e2ccc220562827b396 Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Sun, 21 Aug 2011 12:40:47 -0700 Subject: [PATCH 17/38] another attempt at getting ie border thign working --- bootstrap-1.0.0.css | 8 +++++--- bootstrap-1.0.0.min.css | 2 +- lib/patterns.less | 6 ++++-- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/bootstrap-1.0.0.css b/bootstrap-1.0.0.css index 95fb641a90..d9de7d4dab 100644 --- a/bootstrap-1.0.0.css +++ b/bootstrap-1.0.0.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: Sun Aug 21 12:35:35 PDT 2011 + * Date: Sun Aug 21 12:40:43 PDT 2011 */ /* Reset.less * Props to Eric Meyer (meyerweb.com) for his CSS reset file. We're using an adapted version here that cuts out some of the reset HTML elements we will never need here (i.e., dfn, samp, etc). @@ -1544,8 +1544,10 @@ div.pagination { div.pagination ul { float: left; margin: 0; - border: 1px solid; - border-color: #dddddd rgba(0, 0, 0, 0.15) #dddddd #dddddd; + border: 1px solid rgba(0, 0, 0, 0.15); + border-left-color: #ddd; + border-top-color: #ddd; + border-bottom-color: #ddd; -webkit-border-radius: 3px; -moz-border-radius: 3px; border-radius: 3px; diff --git a/bootstrap-1.0.0.min.css b/bootstrap-1.0.0.min.css index e1e6cb7691..10b19969e6 100644 --- a/bootstrap-1.0.0.min.css +++ b/bootstrap-1.0.0.min.css @@ -197,7 +197,7 @@ ul.tabs{width:100%;border-bottom:1px solid #bfbfbf;}ul.tabs li a{margin-bottom:- ul.tabs li.active a{background-color:#fff;padding:0 14px;border:1px solid #ccc;border-bottom:0;color:#808080;} ul.pills li a{margin:5px 3px 5px 0;padding:0 15px;text-shadow:0 1px 1px #fff;line-height:30px;-webkit-border-radius:15px;-moz-border-radius:15px;border-radius:15px;}ul.pills li a:hover{background:#0050a3;color:#fff;text-decoration:none;text-shadow:0 1px 1px rgba(0, 0, 0, 0.25);} ul.pills li.active a{background:#0069d6;color:#fff;text-shadow:0 1px 1px rgba(0, 0, 0, 0.25);} -div.pagination{height:36px;margin:18px 0;}div.pagination ul{float:left;margin:0;border:1px solid;border-color:#dddddd rgba(0, 0, 0, 0.15) #dddddd #dddddd;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;-webkit-box-shadow:0 1px 2px rgba(0, 0, 0, 0.075);-moz-box-shadow:0 1px 2px rgba(0, 0, 0, 0.075);box-shadow:0 1px 2px rgba(0, 0, 0, 0.075);}div.pagination ul li{display:inline;}div.pagination ul li a{float:left;padding:0 14px;line-height:34px;border-right:1px solid;border-right-color:#ddd;border-right-color:rgba(0, 0, 0, 0.15);text-decoration:none;} +div.pagination{height:36px;margin:18px 0;}div.pagination ul{float:left;margin:0;border:1px solid rgba(0, 0, 0, 0.15);border-left-color:#ddd;border-top-color:#ddd;border-bottom-color:#ddd;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;-webkit-box-shadow:0 1px 2px rgba(0, 0, 0, 0.075);-moz-box-shadow:0 1px 2px rgba(0, 0, 0, 0.075);box-shadow:0 1px 2px rgba(0, 0, 0, 0.075);}div.pagination ul li{display:inline;}div.pagination ul li a{float:left;padding:0 14px;line-height:34px;border-right:1px solid;border-right-color:#ddd;border-right-color:rgba(0, 0, 0, 0.15);text-decoration:none;} div.pagination ul li a:hover,div.pagination ul li.active a{background-color:#c7eefe;} div.pagination ul li.disabled a,div.pagination ul li.disabled a:hover{background-color:none;color:#bfbfbf;} div.pagination ul li.next a,div.pagination ul li:last-child a{border:0;} diff --git a/lib/patterns.less b/lib/patterns.less index 0e121cb31c..4a9b70295c 100644 --- a/lib/patterns.less +++ b/lib/patterns.less @@ -456,8 +456,10 @@ div.pagination { ul { float: left; margin: 0; - border: 1px solid; - border-color: #ddd rgba(0,0,0,.15) #ddd #ddd; + border: 1px solid rgba(0,0,0,.15); + border-left-color: #ddd; + border-top-color: #ddd; + border-bottom-color: #ddd; .border-radius(3px); .box-shadow(0 1px 2px rgba(0,0,0,.075); li { From 8ec7566f8baae5807da86665d5ea915c5ec16ce2 Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Sun, 21 Aug 2011 12:42:43 -0700 Subject: [PATCH 18/38] rgba breaks whole def --- bootstrap-1.0.0.css | 5 +++-- bootstrap-1.0.0.min.css | 2 +- lib/patterns.less | 3 ++- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/bootstrap-1.0.0.css b/bootstrap-1.0.0.css index d9de7d4dab..31ffd62638 100644 --- a/bootstrap-1.0.0.css +++ b/bootstrap-1.0.0.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: Sun Aug 21 12:40:43 PDT 2011 + * Date: Sun Aug 21 12:42:40 PDT 2011 */ /* Reset.less * Props to Eric Meyer (meyerweb.com) for his CSS reset file. We're using an adapted version here that cuts out some of the reset HTML elements we will never need here (i.e., dfn, samp, etc). @@ -1544,7 +1544,8 @@ div.pagination { div.pagination ul { float: left; margin: 0; - border: 1px solid rgba(0, 0, 0, 0.15); + border: 1px solid; + border-right-color: rgba(0, 0, 0, 0.15); border-left-color: #ddd; border-top-color: #ddd; border-bottom-color: #ddd; diff --git a/bootstrap-1.0.0.min.css b/bootstrap-1.0.0.min.css index 10b19969e6..451ce498e8 100644 --- a/bootstrap-1.0.0.min.css +++ b/bootstrap-1.0.0.min.css @@ -197,7 +197,7 @@ ul.tabs{width:100%;border-bottom:1px solid #bfbfbf;}ul.tabs li a{margin-bottom:- ul.tabs li.active a{background-color:#fff;padding:0 14px;border:1px solid #ccc;border-bottom:0;color:#808080;} ul.pills li a{margin:5px 3px 5px 0;padding:0 15px;text-shadow:0 1px 1px #fff;line-height:30px;-webkit-border-radius:15px;-moz-border-radius:15px;border-radius:15px;}ul.pills li a:hover{background:#0050a3;color:#fff;text-decoration:none;text-shadow:0 1px 1px rgba(0, 0, 0, 0.25);} ul.pills li.active a{background:#0069d6;color:#fff;text-shadow:0 1px 1px rgba(0, 0, 0, 0.25);} -div.pagination{height:36px;margin:18px 0;}div.pagination ul{float:left;margin:0;border:1px solid rgba(0, 0, 0, 0.15);border-left-color:#ddd;border-top-color:#ddd;border-bottom-color:#ddd;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;-webkit-box-shadow:0 1px 2px rgba(0, 0, 0, 0.075);-moz-box-shadow:0 1px 2px rgba(0, 0, 0, 0.075);box-shadow:0 1px 2px rgba(0, 0, 0, 0.075);}div.pagination ul li{display:inline;}div.pagination ul li a{float:left;padding:0 14px;line-height:34px;border-right:1px solid;border-right-color:#ddd;border-right-color:rgba(0, 0, 0, 0.15);text-decoration:none;} +div.pagination{height:36px;margin:18px 0;}div.pagination ul{float:left;margin:0;border:1px solid;border-right-color:rgba(0, 0, 0, 0.15);border-left-color:#ddd;border-top-color:#ddd;border-bottom-color:#ddd;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;-webkit-box-shadow:0 1px 2px rgba(0, 0, 0, 0.075);-moz-box-shadow:0 1px 2px rgba(0, 0, 0, 0.075);box-shadow:0 1px 2px rgba(0, 0, 0, 0.075);}div.pagination ul li{display:inline;}div.pagination ul li a{float:left;padding:0 14px;line-height:34px;border-right:1px solid;border-right-color:#ddd;border-right-color:rgba(0, 0, 0, 0.15);text-decoration:none;} div.pagination ul li a:hover,div.pagination ul li.active a{background-color:#c7eefe;} div.pagination ul li.disabled a,div.pagination ul li.disabled a:hover{background-color:none;color:#bfbfbf;} div.pagination ul li.next a,div.pagination ul li:last-child a{border:0;} diff --git a/lib/patterns.less b/lib/patterns.less index 4a9b70295c..b784419d4c 100644 --- a/lib/patterns.less +++ b/lib/patterns.less @@ -456,7 +456,8 @@ div.pagination { ul { float: left; margin: 0; - border: 1px solid rgba(0,0,0,.15); + border: 1px solid; + border-right-color: rgba(0,0,0,.15); border-left-color: #ddd; border-top-color: #ddd; border-bottom-color: #ddd; From f8e9c6cf4ee0ece4c9a5fe4b9e11c553877ce85c Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Sun, 21 Aug 2011 12:48:29 -0700 Subject: [PATCH 19/38] ie hack --- bootstrap-1.0.0.css | 11 +++++------ bootstrap-1.0.0.min.css | 2 +- lib/patterns.less | 7 ++----- 3 files changed, 8 insertions(+), 12 deletions(-) diff --git a/bootstrap-1.0.0.css b/bootstrap-1.0.0.css index 31ffd62638..d2a0d7f64c 100644 --- a/bootstrap-1.0.0.css +++ b/bootstrap-1.0.0.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: Sun Aug 21 12:42:40 PDT 2011 + * Date: Sun Aug 21 12:48:25 PDT 2011 */ /* Reset.less * Props to Eric Meyer (meyerweb.com) for his CSS reset file. We're using an adapted version here that cuts out some of the reset HTML elements we will never need here (i.e., dfn, samp, etc). @@ -1544,11 +1544,10 @@ div.pagination { div.pagination ul { float: left; margin: 0; - border: 1px solid; - border-right-color: rgba(0, 0, 0, 0.15); - border-left-color: #ddd; - border-top-color: #ddd; - border-bottom-color: #ddd; + border: 1px solid #ddd; + border-right: 0\9; + /* IE8 and below don't support last child */ + -webkit-border-radius: 3px; -moz-border-radius: 3px; border-radius: 3px; diff --git a/bootstrap-1.0.0.min.css b/bootstrap-1.0.0.min.css index 451ce498e8..db523a5548 100644 --- a/bootstrap-1.0.0.min.css +++ b/bootstrap-1.0.0.min.css @@ -197,7 +197,7 @@ ul.tabs{width:100%;border-bottom:1px solid #bfbfbf;}ul.tabs li a{margin-bottom:- ul.tabs li.active a{background-color:#fff;padding:0 14px;border:1px solid #ccc;border-bottom:0;color:#808080;} ul.pills li a{margin:5px 3px 5px 0;padding:0 15px;text-shadow:0 1px 1px #fff;line-height:30px;-webkit-border-radius:15px;-moz-border-radius:15px;border-radius:15px;}ul.pills li a:hover{background:#0050a3;color:#fff;text-decoration:none;text-shadow:0 1px 1px rgba(0, 0, 0, 0.25);} ul.pills li.active a{background:#0069d6;color:#fff;text-shadow:0 1px 1px rgba(0, 0, 0, 0.25);} -div.pagination{height:36px;margin:18px 0;}div.pagination ul{float:left;margin:0;border:1px solid;border-right-color:rgba(0, 0, 0, 0.15);border-left-color:#ddd;border-top-color:#ddd;border-bottom-color:#ddd;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;-webkit-box-shadow:0 1px 2px rgba(0, 0, 0, 0.075);-moz-box-shadow:0 1px 2px rgba(0, 0, 0, 0.075);box-shadow:0 1px 2px rgba(0, 0, 0, 0.075);}div.pagination ul li{display:inline;}div.pagination ul li a{float:left;padding:0 14px;line-height:34px;border-right:1px solid;border-right-color:#ddd;border-right-color:rgba(0, 0, 0, 0.15);text-decoration:none;} +div.pagination{height:36px;margin:18px 0;}div.pagination ul{float:left;margin:0;border:1px solid #ddd;border-right:0\9;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;-webkit-box-shadow:0 1px 2px rgba(0, 0, 0, 0.075);-moz-box-shadow:0 1px 2px rgba(0, 0, 0, 0.075);box-shadow:0 1px 2px rgba(0, 0, 0, 0.075);}div.pagination ul li{display:inline;}div.pagination ul li a{float:left;padding:0 14px;line-height:34px;border-right:1px solid;border-right-color:#ddd;border-right-color:rgba(0, 0, 0, 0.15);text-decoration:none;} div.pagination ul li a:hover,div.pagination ul li.active a{background-color:#c7eefe;} div.pagination ul li.disabled a,div.pagination ul li.disabled a:hover{background-color:none;color:#bfbfbf;} div.pagination ul li.next a,div.pagination ul li:last-child a{border:0;} diff --git a/lib/patterns.less b/lib/patterns.less index b784419d4c..6ff55f1325 100644 --- a/lib/patterns.less +++ b/lib/patterns.less @@ -456,11 +456,8 @@ div.pagination { ul { float: left; margin: 0; - border: 1px solid; - border-right-color: rgba(0,0,0,.15); - border-left-color: #ddd; - border-top-color: #ddd; - border-bottom-color: #ddd; + border: 1px solid #ddd; + border-right: 0\9; /* IE8 and below don't support last child */ .border-radius(3px); .box-shadow(0 1px 2px rgba(0,0,0,.075); li { From d019c677adcc21a3df0865773431ddc0ecf0aefa Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Sun, 21 Aug 2011 13:04:09 -0700 Subject: [PATCH 20/38] no gradients on alerts for <= ie8 --- lib/patterns.less | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lib/patterns.less b/lib/patterns.less index 6ff55f1325..c9d4eec2ac 100644 --- a/lib/patterns.less +++ b/lib/patterns.less @@ -291,6 +291,8 @@ div.page-header { // One-liner alert bars div.alert-message { #gradient > .vertical(transparent, rgba(0,0,0,0.15)); + -ms-filter: "progid:DXImageTransform.Microsoft.gradient(enabled=false)"; // no gradient IE8+ + filter: "progid:DXImageTransform.Microsoft.gradient(enabled=false)"; // no gradient IE6 & IE7 background-color: @grayLighter; margin-bottom: @baseline; padding: 8px 15px; From de494200fc5a62f032828198f699f043a7fe77da Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Sun, 21 Aug 2011 13:04:36 -0700 Subject: [PATCH 21/38] remake --- bootstrap-1.0.0.css | 4 +++- bootstrap-1.0.0.min.css | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/bootstrap-1.0.0.css b/bootstrap-1.0.0.css index d2a0d7f64c..835fa9e7bd 100644 --- a/bootstrap-1.0.0.css +++ b/bootstrap-1.0.0.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: Sun Aug 21 12:48:25 PDT 2011 + * Date: Sun Aug 21 13:04:33 PDT 2011 */ /* Reset.less * Props to Eric Meyer (meyerweb.com) for his CSS reset file. We're using an adapted version here that cuts out some of the reset HTML elements we will never need here (i.e., dfn, samp, etc). @@ -1376,6 +1376,8 @@ div.alert-message { -ms-filter: "progid:DXImageTransform.Microsoft.gradient(startColorstr='transparent', endColorstr='rgba(0, 0, 0, 0.15)', GradientType=0)"; filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='transparent', endColorstr='rgba(0, 0, 0, 0.15)', GradientType=0); background-image: linear-gradient(transparent, rgba(0, 0, 0, 0.15)); + -ms-filter: "progid:DXImageTransform.Microsoft.gradient(enabled=false)"; + filter: "progid:DXImageTransform.Microsoft.gradient(enabled=false)"; background-color: #e6e6e6; margin-bottom: 18px; padding: 8px 15px; diff --git a/bootstrap-1.0.0.min.css b/bootstrap-1.0.0.min.css index db523a5548..3623097641 100644 --- a/bootstrap-1.0.0.min.css +++ b/bootstrap-1.0.0.min.css @@ -176,7 +176,7 @@ div.topbar ul li ul li span{clear:both;display:block;background:rgba(0, 0, 0, 0. .hero-unit{background-color:#f5f5f5;margin-bottom:30px;padding:60px;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;}.hero-unit h1{margin-bottom:0;font-size:60px;line-height:1;letter-spacing:-1px;} .hero-unit p{font-size:18px;font-weight:200;line-height:27px;} div.page-header{margin-bottom:17px;border-bottom:1px solid #ddd;-webkit-box-shadow:0 1px 0 rgba(255, 255, 255, 0.5);-moz-box-shadow:0 1px 0 rgba(255, 255, 255, 0.5);box-shadow:0 1px 0 rgba(255, 255, 255, 0.5);}div.page-header h1{margin-bottom:8px;} -div.alert-message{background-color:rgba(0, 0, 0, 0.15);background-repeat:repeat-x;background-image:-khtml-gradient(linear, left top, left bottom, from(transparent), to(rgba(0, 0, 0, 0.15)));background-image:-moz-linear-gradient(transparent, rgba(0, 0, 0, 0.15));background-image:-ms-linear-gradient(transparent, rgba(0, 0, 0, 0.15));background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, transparent), color-stop(100%, rgba(0, 0, 0, 0.15)));background-image:-webkit-linear-gradient(transparent, rgba(0, 0, 0, 0.15));background-image:-o-linear-gradient(transparent, rgba(0, 0, 0, 0.15));-ms-filter:"progid:DXImageTransform.Microsoft.gradient(startColorstr='transparent', endColorstr='rgba(0, 0, 0, 0.15)', GradientType=0)";filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='transparent', endColorstr='rgba(0, 0, 0, 0.15)', GradientType=0);background-image:linear-gradient(transparent, rgba(0, 0, 0, 0.15));background-color:#e6e6e6;margin-bottom:18px;padding:8px 15px;color:#fff;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);border-bottom:1px solid rgba(0, 0, 0, 0.25);-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;}div.alert-message p{color:#fff;margin-bottom:0;}div.alert-message p+p{margin-top:5px;} +div.alert-message{background-color:rgba(0, 0, 0, 0.15);background-repeat:repeat-x;background-image:-khtml-gradient(linear, left top, left bottom, from(transparent), to(rgba(0, 0, 0, 0.15)));background-image:-moz-linear-gradient(transparent, rgba(0, 0, 0, 0.15));background-image:-ms-linear-gradient(transparent, rgba(0, 0, 0, 0.15));background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, transparent), color-stop(100%, rgba(0, 0, 0, 0.15)));background-image:-webkit-linear-gradient(transparent, rgba(0, 0, 0, 0.15));background-image:-o-linear-gradient(transparent, rgba(0, 0, 0, 0.15));-ms-filter:"progid:DXImageTransform.Microsoft.gradient(startColorstr='transparent', endColorstr='rgba(0, 0, 0, 0.15)', GradientType=0)";filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='transparent', endColorstr='rgba(0, 0, 0, 0.15)', GradientType=0);background-image:linear-gradient(transparent, rgba(0, 0, 0, 0.15));-ms-filter:"progid:DXImageTransform.Microsoft.gradient(enabled=false)";filter:"progid:DXImageTransform.Microsoft.gradient(enabled=false)";background-color:#e6e6e6;margin-bottom:18px;padding:8px 15px;color:#fff;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);border-bottom:1px solid rgba(0, 0, 0, 0.25);-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;}div.alert-message p{color:#fff;margin-bottom:0;}div.alert-message p+p{margin-top:5px;} div.alert-message.error{background-color:#e06359;} div.alert-message.warning{background-color:#ffd75a;} div.alert-message.success{background-color:#74c474;} From 96af4f6acfcfb731d9772643fa8ef43ac514b02d Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Sun, 21 Aug 2011 13:22:39 -0700 Subject: [PATCH 22/38] add "shadows" for ie buttons --- bootstrap-1.0.0.css | 5 ++++- bootstrap-1.0.0.min.css | 4 ++-- lib/preboot.less | 1 + lib/scaffolding.less | 2 ++ 4 files changed, 9 insertions(+), 3 deletions(-) diff --git a/bootstrap-1.0.0.css b/bootstrap-1.0.0.css index 835fa9e7bd..39f628dfee 100644 --- a/bootstrap-1.0.0.css +++ b/bootstrap-1.0.0.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: Sun Aug 21 13:04:33 PDT 2011 + * Date: Sun Aug 21 13:22:36 PDT 2011 */ /* Reset.less * Props to Eric Meyer (meyerweb.com) for his CSS reset file. We're using an adapted version here that cuts out some of the reset HTML elements we will never need here (i.e., dfn, samp, etc). @@ -396,6 +396,7 @@ a:hover { font-size: 13px; line-height: 18px; border: 1px solid rgba(0, 0, 0, 0.1); + border-bottom-color: #ddd; border-bottom-color: rgba(0, 0, 0, 0.25); -webkit-border-radius: 4px; -moz-border-radius: 4px; @@ -426,6 +427,8 @@ a:hover { background-image: linear-gradient(#049cdb, #0064cd); color: #fff; text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); + border-bottom-color: #003f81; + border-bottom-color: rgba(0, 0, 0, 0.25); } .btn.primary:hover { color: #fff; diff --git a/bootstrap-1.0.0.min.css b/bootstrap-1.0.0.min.css index 3623097641..35203b59c5 100644 --- a/bootstrap-1.0.0.min.css +++ b/bootstrap-1.0.0.min.css @@ -47,8 +47,8 @@ div.container-fluid:after{clear:both;} div.container-fluid div.sidebar{float:left;width:220px;} div.container-fluid div.content{min-width:700px;max-width:1180px;margin-left:240px;} a{color:#0069d6;text-decoration:none;line-height:inherit;}a:hover{color:#0050a3;text-decoration:underline;} -.btn{display:inline-block;background-color:#e6e6e6;background-repeat:no-repeat;background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), color-stop(0.25, #ffffff), to(#e6e6e6));background-image:-webkit-linear-gradient(#ffffff, color-stop(0.25, #ffffff), #e6e6e6);background-image:-moz-linear-gradient(#ffffff, color-stop(#ffffff, 0.25), #e6e6e6);background-image:-ms-linear-gradient(#ffffff, color-stop(#ffffff, 0.25), #e6e6e6);background-image:-o-linear-gradient(#ffffff, color-stop(#ffffff, 0.25), #e6e6e6);background-image:linear-gradient(#ffffff, color-stop(#ffffff, 0.25), #e6e6e6);padding:4px 14px;text-shadow:0 1px 1px rgba(255, 255, 255, 0.75);color:#333333;font-size:13px;line-height:18px;border:1px solid rgba(0, 0, 0, 0.1);border-bottom-color:rgba(0, 0, 0, 0.25);-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-webkit-box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0, 0.05);-moz-box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0, 0.05);box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0, 0.05);-webkit-transition:0.1s linear all;-moz-transition:0.1s linear all;transition:0.1s linear all;}.btn:hover{background-position:0 -15px;color:#333333;text-decoration:none;} -.btn.primary{background-color:#0064cd;background-repeat:repeat-x;background-image:-khtml-gradient(linear, left top, left bottom, from(#049cdb), to(#0064cd));background-image:-moz-linear-gradient(#049cdb, #0064cd);background-image:-ms-linear-gradient(#049cdb, #0064cd);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #049cdb), color-stop(100%, #0064cd));background-image:-webkit-linear-gradient(#049cdb, #0064cd);background-image:-o-linear-gradient(#049cdb, #0064cd);-ms-filter:"progid:DXImageTransform.Microsoft.gradient(startColorstr='#049cdb', endColorstr='#0064cd', GradientType=0)";filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#049cdb', endColorstr='#0064cd', GradientType=0);background-image:linear-gradient(#049cdb, #0064cd);color:#fff;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);}.btn.primary:hover{color:#fff;} +.btn{display:inline-block;background-color:#e6e6e6;background-repeat:no-repeat;background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), color-stop(0.25, #ffffff), to(#e6e6e6));background-image:-webkit-linear-gradient(#ffffff, color-stop(0.25, #ffffff), #e6e6e6);background-image:-moz-linear-gradient(#ffffff, color-stop(#ffffff, 0.25), #e6e6e6);background-image:-ms-linear-gradient(#ffffff, color-stop(#ffffff, 0.25), #e6e6e6);background-image:-o-linear-gradient(#ffffff, color-stop(#ffffff, 0.25), #e6e6e6);background-image:linear-gradient(#ffffff, color-stop(#ffffff, 0.25), #e6e6e6);padding:4px 14px;text-shadow:0 1px 1px rgba(255, 255, 255, 0.75);color:#333333;font-size:13px;line-height:18px;border:1px solid rgba(0, 0, 0, 0.1);border-bottom-color:#ddd;border-bottom-color:rgba(0, 0, 0, 0.25);-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-webkit-box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0, 0.05);-moz-box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0, 0.05);box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0, 0.05);-webkit-transition:0.1s linear all;-moz-transition:0.1s linear all;transition:0.1s linear all;}.btn:hover{background-position:0 -15px;color:#333333;text-decoration:none;} +.btn.primary{background-color:#0064cd;background-repeat:repeat-x;background-image:-khtml-gradient(linear, left top, left bottom, from(#049cdb), to(#0064cd));background-image:-moz-linear-gradient(#049cdb, #0064cd);background-image:-ms-linear-gradient(#049cdb, #0064cd);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #049cdb), color-stop(100%, #0064cd));background-image:-webkit-linear-gradient(#049cdb, #0064cd);background-image:-o-linear-gradient(#049cdb, #0064cd);-ms-filter:"progid:DXImageTransform.Microsoft.gradient(startColorstr='#049cdb', endColorstr='#0064cd', GradientType=0)";filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#049cdb', endColorstr='#0064cd', GradientType=0);background-image:linear-gradient(#049cdb, #0064cd);color:#fff;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);border-bottom-color:#003f81;border-bottom-color:rgba(0, 0, 0, 0.25);}.btn.primary:hover{color:#fff;} .btn.large{font-size:16px;line-height:28px;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;} .btn.small{padding-right:9px;padding-left:9px;font-size:11px;} .btn:disabled,.btn.disabled{background-image:none;filter:alpha(opacity=65);-khtml-opacity:0.65;-moz-opacity:0.65;opacity:0.65;cursor:default;} diff --git a/lib/preboot.less b/lib/preboot.less index b90021ebe2..7ace1707ad 100644 --- a/lib/preboot.less +++ b/lib/preboot.less @@ -190,6 +190,7 @@ font-size: @fontSize; line-height: @baseline; border: 1px solid @borderColor; + border-bottom-color: #ddd; border-bottom-color: fadein(@borderColor, 15%); .border-radius(@borderRadius); @shadow: inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05); diff --git a/lib/scaffolding.less b/lib/scaffolding.less index 5b41b64a4b..f66e086796 100644 --- a/lib/scaffolding.less +++ b/lib/scaffolding.less @@ -101,6 +101,8 @@ a { #gradient > .vertical(@blue, @blueDark); color: #fff; text-shadow: 0 -1px 0 rgba(0,0,0,.25); + border-bottom-color: darken(@blueDark, 15%); + border-bottom-color: fadein(rgba(0,0,0,.1), 15%); &:hover { color: #fff; } From 7c45f6cc7fb5dbf0cc76d6eb6e4b42ac7fdf15c3 Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Sun, 21 Aug 2011 13:26:01 -0700 Subject: [PATCH 23/38] define button border size for ie --- bootstrap-1.0.0.css | 4 ++-- bootstrap-1.0.0.min.css | 2 +- lib/preboot.less | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/bootstrap-1.0.0.css b/bootstrap-1.0.0.css index 39f628dfee..f349be291e 100644 --- a/bootstrap-1.0.0.css +++ b/bootstrap-1.0.0.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: Sun Aug 21 13:22:36 PDT 2011 + * Date: Sun Aug 21 13:25:57 PDT 2011 */ /* Reset.less * Props to Eric Meyer (meyerweb.com) for his CSS reset file. We're using an adapted version here that cuts out some of the reset HTML elements we will never need here (i.e., dfn, samp, etc). @@ -396,7 +396,7 @@ a:hover { font-size: 13px; line-height: 18px; border: 1px solid rgba(0, 0, 0, 0.1); - border-bottom-color: #ddd; + border-bottom: 1px solid #ddd; border-bottom-color: rgba(0, 0, 0, 0.25); -webkit-border-radius: 4px; -moz-border-radius: 4px; diff --git a/bootstrap-1.0.0.min.css b/bootstrap-1.0.0.min.css index 35203b59c5..3fa273ec89 100644 --- a/bootstrap-1.0.0.min.css +++ b/bootstrap-1.0.0.min.css @@ -47,7 +47,7 @@ div.container-fluid:after{clear:both;} div.container-fluid div.sidebar{float:left;width:220px;} div.container-fluid div.content{min-width:700px;max-width:1180px;margin-left:240px;} a{color:#0069d6;text-decoration:none;line-height:inherit;}a:hover{color:#0050a3;text-decoration:underline;} -.btn{display:inline-block;background-color:#e6e6e6;background-repeat:no-repeat;background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), color-stop(0.25, #ffffff), to(#e6e6e6));background-image:-webkit-linear-gradient(#ffffff, color-stop(0.25, #ffffff), #e6e6e6);background-image:-moz-linear-gradient(#ffffff, color-stop(#ffffff, 0.25), #e6e6e6);background-image:-ms-linear-gradient(#ffffff, color-stop(#ffffff, 0.25), #e6e6e6);background-image:-o-linear-gradient(#ffffff, color-stop(#ffffff, 0.25), #e6e6e6);background-image:linear-gradient(#ffffff, color-stop(#ffffff, 0.25), #e6e6e6);padding:4px 14px;text-shadow:0 1px 1px rgba(255, 255, 255, 0.75);color:#333333;font-size:13px;line-height:18px;border:1px solid rgba(0, 0, 0, 0.1);border-bottom-color:#ddd;border-bottom-color:rgba(0, 0, 0, 0.25);-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-webkit-box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0, 0.05);-moz-box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0, 0.05);box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0, 0.05);-webkit-transition:0.1s linear all;-moz-transition:0.1s linear all;transition:0.1s linear all;}.btn:hover{background-position:0 -15px;color:#333333;text-decoration:none;} +.btn{display:inline-block;background-color:#e6e6e6;background-repeat:no-repeat;background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), color-stop(0.25, #ffffff), to(#e6e6e6));background-image:-webkit-linear-gradient(#ffffff, color-stop(0.25, #ffffff), #e6e6e6);background-image:-moz-linear-gradient(#ffffff, color-stop(#ffffff, 0.25), #e6e6e6);background-image:-ms-linear-gradient(#ffffff, color-stop(#ffffff, 0.25), #e6e6e6);background-image:-o-linear-gradient(#ffffff, color-stop(#ffffff, 0.25), #e6e6e6);background-image:linear-gradient(#ffffff, color-stop(#ffffff, 0.25), #e6e6e6);padding:4px 14px;text-shadow:0 1px 1px rgba(255, 255, 255, 0.75);color:#333333;font-size:13px;line-height:18px;border:1px solid rgba(0, 0, 0, 0.1);border-bottom:1px solid #ddd;border-bottom-color:rgba(0, 0, 0, 0.25);-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-webkit-box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0, 0.05);-moz-box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0, 0.05);box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0, 0.05);-webkit-transition:0.1s linear all;-moz-transition:0.1s linear all;transition:0.1s linear all;}.btn:hover{background-position:0 -15px;color:#333333;text-decoration:none;} .btn.primary{background-color:#0064cd;background-repeat:repeat-x;background-image:-khtml-gradient(linear, left top, left bottom, from(#049cdb), to(#0064cd));background-image:-moz-linear-gradient(#049cdb, #0064cd);background-image:-ms-linear-gradient(#049cdb, #0064cd);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #049cdb), color-stop(100%, #0064cd));background-image:-webkit-linear-gradient(#049cdb, #0064cd);background-image:-o-linear-gradient(#049cdb, #0064cd);-ms-filter:"progid:DXImageTransform.Microsoft.gradient(startColorstr='#049cdb', endColorstr='#0064cd', GradientType=0)";filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#049cdb', endColorstr='#0064cd', GradientType=0);background-image:linear-gradient(#049cdb, #0064cd);color:#fff;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);border-bottom-color:#003f81;border-bottom-color:rgba(0, 0, 0, 0.25);}.btn.primary:hover{color:#fff;} .btn.large{font-size:16px;line-height:28px;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;} .btn.small{padding-right:9px;padding-left:9px;font-size:11px;} diff --git a/lib/preboot.less b/lib/preboot.less index 7ace1707ad..99e2b82233 100644 --- a/lib/preboot.less +++ b/lib/preboot.less @@ -190,7 +190,7 @@ font-size: @fontSize; line-height: @baseline; border: 1px solid @borderColor; - border-bottom-color: #ddd; + border-bottom: 1px solid #ddd; border-bottom-color: fadein(@borderColor, 15%); .border-radius(@borderRadius); @shadow: inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05); From 0ca33aa1ba665fe82fe1f1a5863b62fb4b27ca71 Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Sun, 21 Aug 2011 13:27:17 -0700 Subject: [PATCH 24/38] darken shadow for ie --- bootstrap-1.0.0.css | 4 ++-- bootstrap-1.0.0.min.css | 2 +- lib/preboot.less | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/bootstrap-1.0.0.css b/bootstrap-1.0.0.css index f349be291e..0124f3002e 100644 --- a/bootstrap-1.0.0.css +++ b/bootstrap-1.0.0.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: Sun Aug 21 13:25:57 PDT 2011 + * Date: Sun Aug 21 13:27:14 PDT 2011 */ /* Reset.less * Props to Eric Meyer (meyerweb.com) for his CSS reset file. We're using an adapted version here that cuts out some of the reset HTML elements we will never need here (i.e., dfn, samp, etc). @@ -396,7 +396,7 @@ a:hover { font-size: 13px; line-height: 18px; border: 1px solid rgba(0, 0, 0, 0.1); - border-bottom: 1px solid #ddd; + border-bottom: 1px solid #ccc; border-bottom-color: rgba(0, 0, 0, 0.25); -webkit-border-radius: 4px; -moz-border-radius: 4px; diff --git a/bootstrap-1.0.0.min.css b/bootstrap-1.0.0.min.css index 3fa273ec89..ff072c6329 100644 --- a/bootstrap-1.0.0.min.css +++ b/bootstrap-1.0.0.min.css @@ -47,7 +47,7 @@ div.container-fluid:after{clear:both;} div.container-fluid div.sidebar{float:left;width:220px;} div.container-fluid div.content{min-width:700px;max-width:1180px;margin-left:240px;} a{color:#0069d6;text-decoration:none;line-height:inherit;}a:hover{color:#0050a3;text-decoration:underline;} -.btn{display:inline-block;background-color:#e6e6e6;background-repeat:no-repeat;background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), color-stop(0.25, #ffffff), to(#e6e6e6));background-image:-webkit-linear-gradient(#ffffff, color-stop(0.25, #ffffff), #e6e6e6);background-image:-moz-linear-gradient(#ffffff, color-stop(#ffffff, 0.25), #e6e6e6);background-image:-ms-linear-gradient(#ffffff, color-stop(#ffffff, 0.25), #e6e6e6);background-image:-o-linear-gradient(#ffffff, color-stop(#ffffff, 0.25), #e6e6e6);background-image:linear-gradient(#ffffff, color-stop(#ffffff, 0.25), #e6e6e6);padding:4px 14px;text-shadow:0 1px 1px rgba(255, 255, 255, 0.75);color:#333333;font-size:13px;line-height:18px;border:1px solid rgba(0, 0, 0, 0.1);border-bottom:1px solid #ddd;border-bottom-color:rgba(0, 0, 0, 0.25);-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-webkit-box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0, 0.05);-moz-box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0, 0.05);box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0, 0.05);-webkit-transition:0.1s linear all;-moz-transition:0.1s linear all;transition:0.1s linear all;}.btn:hover{background-position:0 -15px;color:#333333;text-decoration:none;} +.btn{display:inline-block;background-color:#e6e6e6;background-repeat:no-repeat;background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), color-stop(0.25, #ffffff), to(#e6e6e6));background-image:-webkit-linear-gradient(#ffffff, color-stop(0.25, #ffffff), #e6e6e6);background-image:-moz-linear-gradient(#ffffff, color-stop(#ffffff, 0.25), #e6e6e6);background-image:-ms-linear-gradient(#ffffff, color-stop(#ffffff, 0.25), #e6e6e6);background-image:-o-linear-gradient(#ffffff, color-stop(#ffffff, 0.25), #e6e6e6);background-image:linear-gradient(#ffffff, color-stop(#ffffff, 0.25), #e6e6e6);padding:4px 14px;text-shadow:0 1px 1px rgba(255, 255, 255, 0.75);color:#333333;font-size:13px;line-height:18px;border:1px solid rgba(0, 0, 0, 0.1);border-bottom:1px solid #ccc;border-bottom-color:rgba(0, 0, 0, 0.25);-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-webkit-box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0, 0.05);-moz-box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0, 0.05);box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0, 0.05);-webkit-transition:0.1s linear all;-moz-transition:0.1s linear all;transition:0.1s linear all;}.btn:hover{background-position:0 -15px;color:#333333;text-decoration:none;} .btn.primary{background-color:#0064cd;background-repeat:repeat-x;background-image:-khtml-gradient(linear, left top, left bottom, from(#049cdb), to(#0064cd));background-image:-moz-linear-gradient(#049cdb, #0064cd);background-image:-ms-linear-gradient(#049cdb, #0064cd);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #049cdb), color-stop(100%, #0064cd));background-image:-webkit-linear-gradient(#049cdb, #0064cd);background-image:-o-linear-gradient(#049cdb, #0064cd);-ms-filter:"progid:DXImageTransform.Microsoft.gradient(startColorstr='#049cdb', endColorstr='#0064cd', GradientType=0)";filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#049cdb', endColorstr='#0064cd', GradientType=0);background-image:linear-gradient(#049cdb, #0064cd);color:#fff;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);border-bottom-color:#003f81;border-bottom-color:rgba(0, 0, 0, 0.25);}.btn.primary:hover{color:#fff;} .btn.large{font-size:16px;line-height:28px;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;} .btn.small{padding-right:9px;padding-left:9px;font-size:11px;} diff --git a/lib/preboot.less b/lib/preboot.less index 99e2b82233..9c3da46b1b 100644 --- a/lib/preboot.less +++ b/lib/preboot.less @@ -190,7 +190,7 @@ font-size: @fontSize; line-height: @baseline; border: 1px solid @borderColor; - border-bottom: 1px solid #ddd; + border-bottom: 1px solid #ccc; border-bottom-color: fadein(@borderColor, 15%); .border-radius(@borderRadius); @shadow: inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05); From 22dbf9d8e4fc5568d9d49b40d1c1020fbab064c9 Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Sun, 21 Aug 2011 13:36:06 -0700 Subject: [PATCH 25/38] fix up the modals for ie8 --- bootstrap-1.0.0.css | 6 +++--- bootstrap-1.0.0.min.css | 4 ++-- docs/index.html | 4 ++-- lib/patterns.less | 4 ++-- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/bootstrap-1.0.0.css b/bootstrap-1.0.0.css index 0124f3002e..1c25e55f0a 100644 --- a/bootstrap-1.0.0.css +++ b/bootstrap-1.0.0.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: Sun Aug 21 13:27:14 PDT 2011 + * Date: Sun Aug 21 13:35:51 PDT 2011 */ /* Reset.less * Props to Eric Meyer (meyerweb.com) for his CSS reset file. We're using an adapted version here that cuts out some of the reset HTML elements we will never need here (i.e., dfn, samp, etc). @@ -1613,7 +1613,7 @@ div.modal { width: 560px; margin: -280px 0 0 -250px; background-color: #ffffff; - border: 1px solid rgba(0, 0, 0, 0.3); + border: 1px solid #555; -webkit-border-radius: 6px; -moz-border-radius: 6px; border-radius: 6px; @@ -1768,7 +1768,7 @@ div.twipsy .twipsy-arrow { height: 0; } .popover .inner { - background: rgba(0, 0, 0, 0.8); + background: #333; padding: 3px; overflow: hidden; width: 280px; diff --git a/bootstrap-1.0.0.min.css b/bootstrap-1.0.0.min.css index ff072c6329..b9914b4370 100644 --- a/bootstrap-1.0.0.min.css +++ b/bootstrap-1.0.0.min.css @@ -203,7 +203,7 @@ div.pagination ul li.disabled a,div.pagination ul li.disabled a:hover{background div.pagination ul li.next a,div.pagination ul li:last-child a{border:0;} .well{background-color:#f5f5f5;margin-bottom:20px;padding:19px;min-height:20px;border:1px solid #eee;border:1px solid rgba(0, 0, 0, 0.05);-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-webkit-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.05);-moz-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.05);box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.05);} div.modal-backdrop{background-color:rgba(0, 0, 0, 0.5);position:fixed;top:0;left:0;right:0;bottom:0;z-index:1000;} -div.modal{position:fixed;top:50%;left:50%;z-index:2000;width:560px;margin:-280px 0 0 -250px;background-color:#ffffff;border:1px solid rgba(0, 0, 0, 0.3);-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;-webkit-box-shadow:0 3px 7px rgba(0, 0, 0, 0.3);-moz-box-shadow:0 3px 7px rgba(0, 0, 0, 0.3);box-shadow:0 3px 7px rgba(0, 0, 0, 0.3);-webkit-background-clip:padding;-moz-background-clip:padding;background-clip:padding;}div.modal .modal-header{border-bottom:1px solid #eee;padding:5px 20px;}div.modal .modal-header a.close{position:absolute;right:10px;top:10px;color:#999;line-height:10px;font-size:18px;} +div.modal{position:fixed;top:50%;left:50%;z-index:2000;width:560px;margin:-280px 0 0 -250px;background-color:#ffffff;border:1px solid #555;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;-webkit-box-shadow:0 3px 7px rgba(0, 0, 0, 0.3);-moz-box-shadow:0 3px 7px rgba(0, 0, 0, 0.3);box-shadow:0 3px 7px rgba(0, 0, 0, 0.3);-webkit-background-clip:padding;-moz-background-clip:padding;background-clip:padding;}div.modal .modal-header{border-bottom:1px solid #eee;padding:5px 20px;}div.modal .modal-header a.close{position:absolute;right:10px;top:10px;color:#999;line-height:10px;font-size:18px;} div.modal .modal-body{padding:20px;} div.modal .modal-footer{background-color:#f5f5f5;padding:14px 20px 15px;border-top:1px solid #ddd;-webkit-border-radius:0 0 6px 6px;-moz-border-radius:0 0 6px 6px;border-radius:0 0 6px 6px;-webkit-box-shadow:inset 0 1px 0 #ffffff;-moz-box-shadow:inset 0 1px 0 #ffffff;box-shadow:inset 0 1px 0 #ffffff;zoom:1;}div.modal .modal-footer:before,div.modal .modal-footer:after{display:table;content:"";} div.modal .modal-footer:after{clear:both;} @@ -219,6 +219,6 @@ div.twipsy .twipsy-arrow{position:absolute;width:0;height:0;} .popover.below .arrow{top:0;left:50%;margin-left:-5px;border-left:5px solid transparent;border-right:5px solid transparent;border-bottom:5px solid #000000;} .popover.left .arrow{top:50%;right:0;margin-top:-5px;border-top:5px solid transparent;border-bottom:5px solid transparent;border-left:5px solid #000000;} .popover .arrow{position:absolute;width:0;height:0;} -.popover .inner{background:rgba(0, 0, 0, 0.8);padding:3px;overflow:hidden;width:280px;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;-webkit-box-shadow:0 3px 7px rgba(0, 0, 0, 0.3);-moz-box-shadow:0 3px 7px rgba(0, 0, 0, 0.3);box-shadow:0 3px 7px rgba(0, 0, 0, 0.3);} +.popover .inner{background:#333;padding:3px;overflow:hidden;width:280px;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;-webkit-box-shadow:0 3px 7px rgba(0, 0, 0, 0.3);-moz-box-shadow:0 3px 7px rgba(0, 0, 0, 0.3);box-shadow:0 3px 7px rgba(0, 0, 0, 0.3);} .popover .title{background:#f5f5f5;padding:9px 15px;line-height:1;-webkit-border-radius:3px 3px 0 0;-moz-border-radius:3px 3px 0 0;border-radius:3px 3px 0 0;border-bottom:1px solid #eee;} .popover .content{background-color:#ffffff;padding:14px;-webkit-border-radius:0 0 3px 3px;-moz-border-radius:0 0 3px 3px;border-radius:0 0 3px 3px;-webkit-background-clip:padding;-moz-background-clip:padding;background-clip:padding;}.popover .content p,.popover .content ul,.popover .content ol{margin-bottom:0;} diff --git a/docs/index.html b/docs/index.html index 7738b4a6e5..135483a83b 100644 --- a/docs/index.html +++ b/docs/index.html @@ -1101,7 +1101,7 @@

      Modals—dialogs or lightboxes—are great for contextual actions in situations where it’s important that the background context be maintained.

    -
    +
    @@ -1169,7 +1169,7 @@ Lorem ipsum dolar sit amet illo error ipsum verita
    - +
    diff --git a/lib/patterns.less b/lib/patterns.less index c9d4eec2ac..056d468f58 100644 --- a/lib/patterns.less +++ b/lib/patterns.less @@ -526,7 +526,7 @@ div.modal { width: 560px; margin: -280px 0 0 -250px; background-color: @white; - border: 1px solid rgba(0,0,0,.3); + border: 1px solid #555; .border-radius(6px); .box-shadow(0 3px 7px rgba(0,0,0,0.3)); .background-clip(padding); @@ -650,7 +650,7 @@ div.twipsy { height: 0; } .inner { - background: rgba(0,0,0,.8); + background: #333; padding: 3px; overflow: hidden; width: 280px; From 2aeed35f24ad1ba3fa07c4d76fa3664dda91508a Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 21 Aug 2011 17:30:45 -0700 Subject: [PATCH 26/38] pull filter gradients out completely because IE can't render them correctly in half of all instances and they are performance problems with them; tweak alert message styles, particularly close button; --- bootstrap-1.0.0.css | 98 +++++++++++++++++++++++------------------ bootstrap-1.0.0.min.css | 17 ++++--- docs/index.html | 2 +- lib/patterns.less | 35 +++++++-------- lib/preboot.less | 4 -- 5 files changed, 80 insertions(+), 76 deletions(-) diff --git a/bootstrap-1.0.0.css b/bootstrap-1.0.0.css index a2ba3c38f4..ae1c8b3550 100644 --- a/bootstrap-1.0.0.css +++ b/bootstrap-1.0.0.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 Aug 20 18:40:26 PDT 2011 + * Date: Sun Aug 21 17:28:43 PDT 2011 */ /* Reset.less * Props to Eric Meyer (meyerweb.com) for his CSS reset file. We're using an adapted version here that cuts out some of the reset HTML elements we will never need here (i.e., dfn, samp, etc). @@ -421,8 +421,6 @@ a:hover { background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #049cdb), color-stop(100%, #0064cd)); background-image: -webkit-linear-gradient(#049cdb, #0064cd); background-image: -o-linear-gradient(#049cdb, #0064cd); - -ms-filter: "progid:DXImageTransform.Microsoft.gradient(startColorstr='#049cdb', endColorstr='#0064cd', GradientType=0)"; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#049cdb', endColorstr='#0064cd', GradientType=0); background-image: linear-gradient(#049cdb, #0064cd); color: #fff; text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); @@ -1101,8 +1099,6 @@ div.topbar { background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #333333), color-stop(100%, #222222)); background-image: -webkit-linear-gradient(#333333, #222222); background-image: -o-linear-gradient(#333333, #222222); - -ms-filter: "progid:DXImageTransform.Microsoft.gradient(startColorstr='#333333', endColorstr='#222222', GradientType=0)"; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#333333', endColorstr='#222222', GradientType=0); background-image: linear-gradient(#333333, #222222); height: 40px; position: fixed; @@ -1353,23 +1349,12 @@ div.page-header h1 { margin-bottom: 8px; } div.alert-message { - background-color: rgba(0, 0, 0, 0.15); - background-repeat: repeat-x; - background-image: -khtml-gradient(linear, left top, left bottom, from(transparent), to(rgba(0, 0, 0, 0.15))); - background-image: -moz-linear-gradient(transparent, rgba(0, 0, 0, 0.15)); - background-image: -ms-linear-gradient(transparent, rgba(0, 0, 0, 0.15)); - background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, transparent), color-stop(100%, rgba(0, 0, 0, 0.15))); - background-image: -webkit-linear-gradient(transparent, rgba(0, 0, 0, 0.15)); - background-image: -o-linear-gradient(transparent, rgba(0, 0, 0, 0.15)); - -ms-filter: "progid:DXImageTransform.Microsoft.gradient(startColorstr='transparent', endColorstr='rgba(0, 0, 0, 0.15)', GradientType=0)"; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='transparent', endColorstr='rgba(0, 0, 0, 0.15)', GradientType=0); - background-image: linear-gradient(transparent, rgba(0, 0, 0, 0.15)); background-color: #e6e6e6; margin-bottom: 18px; padding: 8px 15px; color: #fff; - text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); - border-bottom: 1px solid rgba(0, 0, 0, 0.25); + text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.3); + border-bottom: 1px solid rgba(0, 0, 0, 0.3); -webkit-border-radius: 4px; -moz-border-radius: 4px; border-radius: 4px; @@ -1382,38 +1367,71 @@ div.alert-message p + p { margin-top: 5px; } div.alert-message.error { - background-color: #e06359; + background-color: #d83a2e; + background-repeat: repeat-x; + background-image: -khtml-gradient(linear, left top, left bottom, from(#e4776f), to(#d83a2e)); + background-image: -moz-linear-gradient(#e4776f, #d83a2e); + background-image: -ms-linear-gradient(#e4776f, #d83a2e); + background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #e4776f), color-stop(100%, #d83a2e)); + background-image: -webkit-linear-gradient(#e4776f, #d83a2e); + background-image: -o-linear-gradient(#e4776f, #d83a2e); + background-image: linear-gradient(#e4776f, #d83a2e); + border-bottom-color: #b32b21; } div.alert-message.warning { - background-color: #ffd75a; + background-color: #ffd040; + background-repeat: repeat-x; + background-image: -khtml-gradient(linear, left top, left bottom, from(#ffe38d), to(#ffd040)); + background-image: -moz-linear-gradient(#ffe38d, #ffd040); + background-image: -ms-linear-gradient(#ffe38d, #ffd040); + background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #ffe38d), color-stop(100%, #ffd040)); + background-image: -webkit-linear-gradient(#ffe38d, #ffd040); + background-image: -o-linear-gradient(#ffe38d, #ffd040); + background-image: linear-gradient(#ffe38d, #ffd040); + border-bottom-color: #ffc40d; } div.alert-message.success { - background-color: #74c474; + background-color: #62bc62; + background-repeat: repeat-x; + background-image: -khtml-gradient(linear, left top, left bottom, from(#97d397), to(#62bc62)); + background-image: -moz-linear-gradient(#97d397, #62bc62); + background-image: -ms-linear-gradient(#97d397, #62bc62); + background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #97d397), color-stop(100%, #62bc62)); + background-image: -webkit-linear-gradient(#97d397, #62bc62); + background-image: -o-linear-gradient(#97d397, #62bc62); + background-image: linear-gradient(#97d397, #62bc62); + border-bottom-color: #46a546; } div.alert-message.info { - background-color: #30c0fb; + background-color: #04aef4; + background-repeat: repeat-x; + background-image: -khtml-gradient(linear, left top, left bottom, from(#62cffc), to(#04aef4)); + background-image: -moz-linear-gradient(#62cffc, #04aef4); + background-image: -ms-linear-gradient(#62cffc, #04aef4); + background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #62cffc), color-stop(100%, #04aef4)); + background-image: -webkit-linear-gradient(#62cffc, #04aef4); + background-image: -o-linear-gradient(#62cffc, #04aef4); + background-image: linear-gradient(#62cffc, #04aef4); + border-bottom-color: #049cdb; } -div.alert-message a.close { +div.alert-message .close { float: right; margin-top: -2px; - color: #fff; + color: #000; font-size: 20px; font-weight: bold; - text-shadow: 0 1px 0 rgba(0, 0, 0, 0.5); - filter: alpha(opacity=50); - -khtml-opacity: 0.5; - -moz-opacity: 0.5; - opacity: 0.5; - -webkit-border-radius: 3px; - -moz-border-radius: 3px; - border-radius: 3px; + text-shadow: 0 1px 0 #ffffff; + filter: alpha(opacity=20); + -khtml-opacity: 0.2; + -moz-opacity: 0.2; + opacity: 0.2; } -div.alert-message a.close:hover { +div.alert-message .close:hover { text-decoration: none; - filter: alpha(opacity=50); - -khtml-opacity: 0.5; - -moz-opacity: 0.5; - opacity: 0.5; + filter: alpha(opacity=40); + -khtml-opacity: 0.4; + -moz-opacity: 0.4; + opacity: 0.4; } div.block-message { margin-bottom: 18px; @@ -1437,12 +1455,6 @@ div.block-message ul { div.block-message strong { display: block; } -div.block-message a.close { - display: block; - color: #404040; - color: rgba(0, 0, 0, 0.5); - text-shadow: 0 1px 1px rgba(255, 255, 255, 0.75); -} div.block-message.error { background: #f8dcda; border: 1px solid #f4c8c5; diff --git a/bootstrap-1.0.0.min.css b/bootstrap-1.0.0.min.css index 6b0b218310..d23cb5b087 100644 --- a/bootstrap-1.0.0.min.css +++ b/bootstrap-1.0.0.min.css @@ -48,7 +48,7 @@ div.container-fluid div.sidebar{float:left;width:220px;} div.container-fluid div.content{min-width:700px;max-width:1180px;margin-left:240px;} a{color:#0069d6;text-decoration:none;line-height:inherit;}a:hover{color:#0050a3;text-decoration:underline;} .btn{display:inline-block;background-color:#e6e6e6;background-repeat:no-repeat;background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), color-stop(0.25, #ffffff), to(#e6e6e6));background-image:-webkit-linear-gradient(#ffffff, color-stop(0.25, #ffffff), #e6e6e6);background-image:-moz-linear-gradient(#ffffff, color-stop(#ffffff, 0.25), #e6e6e6);background-image:-ms-linear-gradient(#ffffff, color-stop(#ffffff, 0.25), #e6e6e6);background-image:-o-linear-gradient(#ffffff, color-stop(#ffffff, 0.25), #e6e6e6);background-image:linear-gradient(#ffffff, color-stop(#ffffff, 0.25), #e6e6e6);padding:4px 14px;text-shadow:0 1px 1px rgba(255, 255, 255, 0.75);color:#333333;font-size:13px;line-height:18px;border:1px solid rgba(0, 0, 0, 0.1);border-bottom-color:rgba(0, 0, 0, 0.25);-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-webkit-box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0, 0.05);-moz-box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0, 0.05);box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0, 0.05);-webkit-transition:0.1s linear all;-moz-transition:0.1s linear all;transition:0.1s linear all;}.btn:hover{background-position:0 -15px;color:#333333;text-decoration:none;} -.btn.primary{background-color:#0064cd;background-repeat:repeat-x;background-image:-khtml-gradient(linear, left top, left bottom, from(#049cdb), to(#0064cd));background-image:-moz-linear-gradient(#049cdb, #0064cd);background-image:-ms-linear-gradient(#049cdb, #0064cd);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #049cdb), color-stop(100%, #0064cd));background-image:-webkit-linear-gradient(#049cdb, #0064cd);background-image:-o-linear-gradient(#049cdb, #0064cd);-ms-filter:"progid:DXImageTransform.Microsoft.gradient(startColorstr='#049cdb', endColorstr='#0064cd', GradientType=0)";filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#049cdb', endColorstr='#0064cd', GradientType=0);background-image:linear-gradient(#049cdb, #0064cd);color:#fff;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);}.btn.primary:hover{color:#fff;} +.btn.primary{background-color:#0064cd;background-repeat:repeat-x;background-image:-khtml-gradient(linear, left top, left bottom, from(#049cdb), to(#0064cd));background-image:-moz-linear-gradient(#049cdb, #0064cd);background-image:-ms-linear-gradient(#049cdb, #0064cd);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #049cdb), color-stop(100%, #0064cd));background-image:-webkit-linear-gradient(#049cdb, #0064cd);background-image:-o-linear-gradient(#049cdb, #0064cd);background-image:linear-gradient(#049cdb, #0064cd);color:#fff;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);}.btn.primary:hover{color:#fff;} .btn.large{font-size:16px;line-height:28px;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;} .btn.small{padding-right:9px;padding-left:9px;font-size:11px;} .btn:disabled,.btn.disabled{background-image:none;filter:alpha(opacity=65);-khtml-opacity:0.65;-moz-opacity:0.65;opacity:0.65;cursor:default;} @@ -153,7 +153,7 @@ table.zebra-striped th.orange{color:#f89406;border-bottom-color:#f89406;} table.zebra-striped th.headerSortUp.orange,table.zebra-striped th.headerSortDown.orange{background-color:#fee9cc;} table.zebra-striped th.purple{color:#7a43b6;border-bottom-color:#7a43b6;} table.zebra-striped th.headerSortUp.purple,table.zebra-striped th.headerSortDown.purple{background-color:#e2d5f0;} -div.topbar{background-color:#222222;background-repeat:repeat-x;background-image:-khtml-gradient(linear, left top, left bottom, from(#333333), to(#222222));background-image:-moz-linear-gradient(#333333, #222222);background-image:-ms-linear-gradient(#333333, #222222);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #333333), color-stop(100%, #222222));background-image:-webkit-linear-gradient(#333333, #222222);background-image:-o-linear-gradient(#333333, #222222);-ms-filter:"progid:DXImageTransform.Microsoft.gradient(startColorstr='#333333', endColorstr='#222222', GradientType=0)";filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#333333', endColorstr='#222222', GradientType=0);background-image:linear-gradient(#333333, #222222);height:40px;position:fixed;top:0;left:0;right:0;z-index:10000;overflow:visible;-webkit-box-shadow:0 1px 3px rgba(0, 0, 0, 0.25),inset 0 -1px 0 rgba(0, 0, 0, 0.1);-moz-box-shadow:0 1px 3px rgba(0, 0, 0, 0.25),inset 0 -1px 0 rgba(0, 0, 0, 0.1);box-shadow:0 1px 3px rgba(0, 0, 0, 0.25),inset 0 -1px 0 rgba(0, 0, 0, 0.1);}div.topbar a{color:#bfbfbf;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);} +div.topbar{background-color:#222222;background-repeat:repeat-x;background-image:-khtml-gradient(linear, left top, left bottom, from(#333333), to(#222222));background-image:-moz-linear-gradient(#333333, #222222);background-image:-ms-linear-gradient(#333333, #222222);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #333333), color-stop(100%, #222222));background-image:-webkit-linear-gradient(#333333, #222222);background-image:-o-linear-gradient(#333333, #222222);background-image:linear-gradient(#333333, #222222);height:40px;position:fixed;top:0;left:0;right:0;z-index:10000;overflow:visible;-webkit-box-shadow:0 1px 3px rgba(0, 0, 0, 0.25),inset 0 -1px 0 rgba(0, 0, 0, 0.1);-moz-box-shadow:0 1px 3px rgba(0, 0, 0, 0.25),inset 0 -1px 0 rgba(0, 0, 0, 0.1);box-shadow:0 1px 3px rgba(0, 0, 0, 0.25),inset 0 -1px 0 rgba(0, 0, 0, 0.1);}div.topbar a{color:#bfbfbf;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);} div.topbar a:hover,div.topbar ul li.active a{background-color:#333;background-color:rgba(255, 255, 255, 0.05);color:#ffffff;text-decoration:none;} div.topbar h3 a{float:left;display:block;padding:8px 20px 12px;margin-left:-20px;color:#ffffff;font-size:20px;font-weight:200;line-height:1;} div.topbar form{float:left;margin:5px 0 0 0;position:relative;filter:alpha(opacity=100);-khtml-opacity:1;-moz-opacity:1;opacity:1;}div.topbar form input{background-color:#bfbfbf;background-color:rgba(255, 255, 255, 0.3);font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:normal;font-weight:13px;line-height:1;width:220px;padding:4px 9px;color:#fff;color:rgba(255, 255, 255, 0.75);border:1px solid #111;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-webkit-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1),0 1px 0px rgba(255, 255, 255, 0.25);-moz-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1),0 1px 0px rgba(255, 255, 255, 0.25);box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1),0 1px 0px rgba(255, 255, 255, 0.25);-webkit-transition:none;-moz-transition:none;transition:none;}div.topbar form input:-moz-placeholder{color:#e6e6e6;} @@ -175,16 +175,15 @@ div.topbar ul li ul li span{clear:both;display:block;background:rgba(0, 0, 0, 0. .hero-unit{background-color:#f5f5f5;margin-bottom:30px;padding:60px;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;}.hero-unit h1{margin-bottom:0;font-size:60px;line-height:1;letter-spacing:-1px;} .hero-unit p{font-size:18px;font-weight:200;line-height:27px;} div.page-header{margin-bottom:17px;border-bottom:1px solid #ddd;-webkit-box-shadow:0 1px 0 rgba(255, 255, 255, 0.5);-moz-box-shadow:0 1px 0 rgba(255, 255, 255, 0.5);box-shadow:0 1px 0 rgba(255, 255, 255, 0.5);}div.page-header h1{margin-bottom:8px;} -div.alert-message{background-color:rgba(0, 0, 0, 0.15);background-repeat:repeat-x;background-image:-khtml-gradient(linear, left top, left bottom, from(transparent), to(rgba(0, 0, 0, 0.15)));background-image:-moz-linear-gradient(transparent, rgba(0, 0, 0, 0.15));background-image:-ms-linear-gradient(transparent, rgba(0, 0, 0, 0.15));background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, transparent), color-stop(100%, rgba(0, 0, 0, 0.15)));background-image:-webkit-linear-gradient(transparent, rgba(0, 0, 0, 0.15));background-image:-o-linear-gradient(transparent, rgba(0, 0, 0, 0.15));-ms-filter:"progid:DXImageTransform.Microsoft.gradient(startColorstr='transparent', endColorstr='rgba(0, 0, 0, 0.15)', GradientType=0)";filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='transparent', endColorstr='rgba(0, 0, 0, 0.15)', GradientType=0);background-image:linear-gradient(transparent, rgba(0, 0, 0, 0.15));background-color:#e6e6e6;margin-bottom:18px;padding:8px 15px;color:#fff;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);border-bottom:1px solid rgba(0, 0, 0, 0.25);-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;}div.alert-message p{color:#fff;margin-bottom:0;}div.alert-message p+p{margin-top:5px;} -div.alert-message.error{background-color:#e06359;} -div.alert-message.warning{background-color:#ffd75a;} -div.alert-message.success{background-color:#74c474;} -div.alert-message.info{background-color:#30c0fb;} -div.alert-message a.close{float:right;margin-top:-2px;color:#fff;font-size:20px;font-weight:bold;text-shadow:0 1px 0 rgba(0, 0, 0, 0.5);filter:alpha(opacity=50);-khtml-opacity:0.5;-moz-opacity:0.5;opacity:0.5;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;}div.alert-message a.close:hover{text-decoration:none;filter:alpha(opacity=50);-khtml-opacity:0.5;-moz-opacity:0.5;opacity:0.5;} +div.alert-message{background-color:#e6e6e6;margin-bottom:18px;padding:8px 15px;color:#fff;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.3);border-bottom:1px solid rgba(0, 0, 0, 0.3);-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;}div.alert-message p{color:#fff;margin-bottom:0;}div.alert-message p+p{margin-top:5px;} +div.alert-message.error{background-color:#d83a2e;background-repeat:repeat-x;background-image:-khtml-gradient(linear, left top, left bottom, from(#e4776f), to(#d83a2e));background-image:-moz-linear-gradient(#e4776f, #d83a2e);background-image:-ms-linear-gradient(#e4776f, #d83a2e);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #e4776f), color-stop(100%, #d83a2e));background-image:-webkit-linear-gradient(#e4776f, #d83a2e);background-image:-o-linear-gradient(#e4776f, #d83a2e);background-image:linear-gradient(#e4776f, #d83a2e);border-bottom-color:#b32b21;} +div.alert-message.warning{background-color:#ffd040;background-repeat:repeat-x;background-image:-khtml-gradient(linear, left top, left bottom, from(#ffe38d), to(#ffd040));background-image:-moz-linear-gradient(#ffe38d, #ffd040);background-image:-ms-linear-gradient(#ffe38d, #ffd040);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #ffe38d), color-stop(100%, #ffd040));background-image:-webkit-linear-gradient(#ffe38d, #ffd040);background-image:-o-linear-gradient(#ffe38d, #ffd040);background-image:linear-gradient(#ffe38d, #ffd040);border-bottom-color:#ffc40d;} +div.alert-message.success{background-color:#62bc62;background-repeat:repeat-x;background-image:-khtml-gradient(linear, left top, left bottom, from(#97d397), to(#62bc62));background-image:-moz-linear-gradient(#97d397, #62bc62);background-image:-ms-linear-gradient(#97d397, #62bc62);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #97d397), color-stop(100%, #62bc62));background-image:-webkit-linear-gradient(#97d397, #62bc62);background-image:-o-linear-gradient(#97d397, #62bc62);background-image:linear-gradient(#97d397, #62bc62);border-bottom-color:#46a546;} +div.alert-message.info{background-color:#04aef4;background-repeat:repeat-x;background-image:-khtml-gradient(linear, left top, left bottom, from(#62cffc), to(#04aef4));background-image:-moz-linear-gradient(#62cffc, #04aef4);background-image:-ms-linear-gradient(#62cffc, #04aef4);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #62cffc), color-stop(100%, #04aef4));background-image:-webkit-linear-gradient(#62cffc, #04aef4);background-image:-o-linear-gradient(#62cffc, #04aef4);background-image:linear-gradient(#62cffc, #04aef4);border-bottom-color:#049cdb;} +div.alert-message .close{float:right;margin-top:-2px;color:#000;font-size:20px;font-weight:bold;text-shadow:0 1px 0 #ffffff;filter:alpha(opacity=20);-khtml-opacity:0.2;-moz-opacity:0.2;opacity:0.2;}div.alert-message .close:hover{text-decoration:none;filter:alpha(opacity=40);-khtml-opacity:0.4;-moz-opacity:0.4;opacity:0.4;} div.block-message{margin-bottom:18px;padding:14px;color:#404040;color:rgba(0, 0, 0, 0.8);text-shadow:0 1px 0 rgba(255, 255, 255, 0.25);-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;}div.block-message p{color:#404040;color:rgba(0, 0, 0, 0.8);margin-right:30px;margin-bottom:0;} div.block-message ul{margin-bottom:0;} div.block-message strong{display:block;} -div.block-message a.close{display:block;color:#404040;color:rgba(0, 0, 0, 0.5);text-shadow:0 1px 1px rgba(255, 255, 255, 0.75);} div.block-message.error{background:#f8dcda;border:1px solid #f4c8c5;} div.block-message.warning{background:#fff0c0;border:1px solid #ffe38d;} div.block-message.success{background:#dff1df;border:1px solid #bbe2bb;} diff --git a/docs/index.html b/docs/index.html index 7244191c94..18be5f1588 100644 --- a/docs/index.html +++ b/docs/index.html @@ -1167,7 +1167,7 @@ Lorem ipsum dolar sit amet illo error ipsum verita
- + diff --git a/lib/patterns.less b/lib/patterns.less index eeb0107abd..229218eb64 100644 --- a/lib/patterns.less +++ b/lib/patterns.less @@ -276,13 +276,13 @@ div.page-header { // One-liner alert bars div.alert-message { - #gradient > .vertical(transparent, rgba(0,0,0,0.15)); +// #gradient > .vertical(rgba(0,0,0,.01), rgba(0,0,0,0.15)); background-color: @grayLighter; margin-bottom: @baseline; padding: 8px 15px; color: #fff; - text-shadow: 0 -1px 0 rgba(0,0,0,.25); - border-bottom: 1px solid rgba(0,0,0,.25); + text-shadow: 0 -1px 0 rgba(0,0,0,.3); + border-bottom: 1px solid rgba(0,0,0,.3); .border-radius(4px); p { color: #fff; @@ -292,29 +292,32 @@ div.alert-message { } } &.error { - background-color: lighten(@red, 25%); + #gradient > .vertical(lighten(@red, 30%), lighten(@red, 15%)); + border-bottom-color: lighten(@red, 5%); } &.warning { - background-color: lighten(@yellow, 15%); + #gradient > .vertical(lighten(@yellow, 25%), lighten(@yellow, 10%)); + border-bottom-color: @yellow; } &.success { - background-color: lighten(@green, 15%); + #gradient > .vertical(lighten(@green, 25%), lighten(@green, 10%)); + border-bottom-color: @green; } &.info { - background-color: lighten(@blue, 15%); + #gradient > .vertical(lighten(@blue, 25%), lighten(@blue, 5%)); + border-bottom-color: @blue; } - a.close { + .close { float: right; margin-top: -2px; - color: #fff; + color: #000; font-size: 20px; font-weight: bold; - text-shadow: 0 1px 0 rgba(0,0,0,.5); - .opacity(50); - .border-radius(3px); + text-shadow: 0 1px 0 rgba(255,255,255,1); + .opacity(20); &:hover { text-decoration: none; - .opacity(50); + .opacity(40); } } } @@ -339,12 +342,6 @@ div.block-message { strong { display: block; } - a.close { - display: block; - color: @grayDark; - color: rgba(0,0,0,.5); - text-shadow: 0 1px 1px rgba(255,255,255,.75); - } &.error { background: lighten(@red, 55%); border: 1px solid lighten(@red, 50%); diff --git a/lib/preboot.less b/lib/preboot.less index b90021ebe2..40dae2cced 100644 --- a/lib/preboot.less +++ b/lib/preboot.less @@ -223,8 +223,6 @@ background-image: -webkit-gradient(linear, left top, right top, color-stop(0%, @startColor), color-stop(100%, @endColor)); // Safari 4+, Chrome 2+ background-image: -webkit-linear-gradient(left, @startColor, @endColor); // Safari 5.1+, Chrome 10+ background-image: -o-linear-gradient(left, @startColor, @endColor); // Opera 11.10 - -ms-filter: %("progid:DXImageTransform.Microsoft.gradient(startColorstr='%d', endColorstr='%d', GradientType=1)",@startColor,@endColor); // IE8+ - filter: e(%("progid:DXImageTransform.Microsoft.gradient(startColorstr='%d', endColorstr='%d', GradientType=1)",@startColor,@endColor)); // IE6 & IE7 background-image: linear-gradient(left, @startColor, @endColor); // Le standard } .vertical (@startColor: #555, @endColor: #333) { @@ -236,8 +234,6 @@ background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, @startColor), color-stop(100%, @endColor)); // Safari 4+, Chrome 2+ background-image: -webkit-linear-gradient(@startColor, @endColor); // Safari 5.1+, Chrome 10+ background-image: -o-linear-gradient(@startColor, @endColor); // Opera 11.10 - -ms-filter: %("progid:DXImageTransform.Microsoft.gradient(startColorstr='%d', endColorstr='%d', GradientType=0)",@startColor,@endColor); // IE8+ - filter: e(%("progid:DXImageTransform.Microsoft.gradient(startColorstr='%d', endColorstr='%d', GradientType=0)",@startColor,@endColor)); // IE6 & IE7 background-image: linear-gradient(@startColor, @endColor); // The standard } .directional (@startColor: #555, @endColor: #333, @deg: 45deg) { From e1e4ceee3f72d0892bf84aa7a1c7f1bdb719032e Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Sun, 21 Aug 2011 18:07:47 -0700 Subject: [PATCH 27/38] fix disabled button for ie 8 and below --- bootstrap-1.0.0.css | 12 ++++++++++-- bootstrap-1.0.0.min.css | 3 ++- docs/index.html | 5 +++-- lib/scaffolding.less | 8 +++++++- 4 files changed, 22 insertions(+), 6 deletions(-) diff --git a/bootstrap-1.0.0.css b/bootstrap-1.0.0.css index 1c25e55f0a..5244c6f137 100644 --- a/bootstrap-1.0.0.css +++ b/bootstrap-1.0.0.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: Sun Aug 21 13:35:51 PDT 2011 + * Date: Sun Aug 21 18:07:44 PDT 2011 */ /* Reset.less * Props to Eric Meyer (meyerweb.com) for his CSS reset file. We're using an adapted version here that cuts out some of the reset HTML elements we will never need here (i.e., dfn, samp, etc). @@ -445,7 +445,15 @@ a:hover { padding-left: 9px; font-size: 11px; } -.btn:disabled, .btn.disabled { +.btn.disabled { + background-image: none; + filter: alpha(opacity=65); + -khtml-opacity: 0.65; + -moz-opacity: 0.65; + opacity: 0.65; + cursor: default; +} +.btn:disabled { background-image: none; filter: alpha(opacity=65); -khtml-opacity: 0.65; diff --git a/bootstrap-1.0.0.min.css b/bootstrap-1.0.0.min.css index b9914b4370..9dcfcc970a 100644 --- a/bootstrap-1.0.0.min.css +++ b/bootstrap-1.0.0.min.css @@ -51,7 +51,8 @@ a{color:#0069d6;text-decoration:none;line-height:inherit;}a:hover{color:#0050a3; .btn.primary{background-color:#0064cd;background-repeat:repeat-x;background-image:-khtml-gradient(linear, left top, left bottom, from(#049cdb), to(#0064cd));background-image:-moz-linear-gradient(#049cdb, #0064cd);background-image:-ms-linear-gradient(#049cdb, #0064cd);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #049cdb), color-stop(100%, #0064cd));background-image:-webkit-linear-gradient(#049cdb, #0064cd);background-image:-o-linear-gradient(#049cdb, #0064cd);-ms-filter:"progid:DXImageTransform.Microsoft.gradient(startColorstr='#049cdb', endColorstr='#0064cd', GradientType=0)";filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#049cdb', endColorstr='#0064cd', GradientType=0);background-image:linear-gradient(#049cdb, #0064cd);color:#fff;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);border-bottom-color:#003f81;border-bottom-color:rgba(0, 0, 0, 0.25);}.btn.primary:hover{color:#fff;} .btn.large{font-size:16px;line-height:28px;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;} .btn.small{padding-right:9px;padding-left:9px;font-size:11px;} -.btn:disabled,.btn.disabled{background-image:none;filter:alpha(opacity=65);-khtml-opacity:0.65;-moz-opacity:0.65;opacity:0.65;cursor:default;} +.btn.disabled{background-image:none;filter:alpha(opacity=65);-khtml-opacity:0.65;-moz-opacity:0.65;opacity:0.65;cursor:default;} +.btn:disabled{background-image:none;filter:alpha(opacity=65);-khtml-opacity:0.65;-moz-opacity:0.65;opacity:0.65;cursor:default;} .btn:active{-webkit-box-shadow:inset 0 3px 7px rgba(0, 0, 0, 0.1),0 1px 2px rgba(0, 0, 0, 0.05);-moz-box-shadow:inset 0 3px 7px rgba(0, 0, 0, 0.1),0 1px 2px rgba(0, 0, 0, 0.05);box-shadow:inset 0 3px 7px rgba(0, 0, 0, 0.1),0 1px 2px rgba(0, 0, 0, 0.05);} button.btn::-moz-focus-inner,input[type=submit].btn::-moz-focus-inner{padding:0;border:0;} p{font-size:13px;font-weight:normal;line-height:18px;margin-bottom:9px;}p small{font-size:11px;color:#bfbfbf;} diff --git a/docs/index.html b/docs/index.html index 135483a83b..a9351d8610 100644 --- a/docs/index.html +++ b/docs/index.html @@ -857,6 +857,7 @@

Disabled state

For buttons that are not active or are disabled by the app for one reason or another, use the disabled state. That’s .disabled for links and :disabled for <button> elements.

+

Note: If you're developing for older browsers like IE8 or below -- you're going to want to use the .disabled class for <button> elements as well.

Links

Primary action @@ -864,8 +865,8 @@

Buttons

- - + +
diff --git a/lib/scaffolding.less b/lib/scaffolding.less index f66e086796..b1f846a38b 100644 --- a/lib/scaffolding.less +++ b/lib/scaffolding.less @@ -117,12 +117,18 @@ a { padding-left: 9px; font-size: 11px; } - &:disabled, &.disabled { background-image: none; .opacity(65); cursor: default; } + + // this can't be included with the .disabled def because IE8 and below will drop it ;_; + &:disabled { + background-image: none; + .opacity(65); + cursor: default; + } &:active { @shadow: inset 0 3px 7px rgba(0,0,0,.1), 0 1px 2px rgba(0,0,0,.05); .box-shadow(@shadow); From 48c3c6f1b67b1f2a2f2ea499cef65bdfd27dc21d Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Sun, 21 Aug 2011 18:14:53 -0700 Subject: [PATCH 28/38] make topbar .fill wrap --- bootstrap-1.0.0.css | 7 +--- bootstrap-1.0.0.min.css | 2 +- docs/assets/css/docs.css | 4 +- docs/index.html | 80 ++++++++++++++++++++-------------------- lib/patterns.less | 5 --- 5 files changed, 45 insertions(+), 53 deletions(-) diff --git a/bootstrap-1.0.0.css b/bootstrap-1.0.0.css index 5244c6f137..05e4da01f7 100644 --- a/bootstrap-1.0.0.css +++ b/bootstrap-1.0.0.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: Sun Aug 21 18:07:44 PDT 2011 + * Date: Sun Aug 21 18:14:49 PDT 2011 */ /* Reset.less * Props to Eric Meyer (meyerweb.com) for his CSS reset file. We're using an adapted version here that cuts out some of the reset HTML elements we will never need here (i.e., dfn, samp, etc). @@ -1114,11 +1114,6 @@ div.topbar { } div.topbar .fill { background: #222; - position: absolute; - top: 0; - left: 0; - bottom: 0; - right: 0; background-color: #222222; background-repeat: repeat-x; background-image: -khtml-gradient(linear, left top, left bottom, from(#333333), to(#222222)); diff --git a/bootstrap-1.0.0.min.css b/bootstrap-1.0.0.min.css index 9dcfcc970a..14a1a176ee 100644 --- a/bootstrap-1.0.0.min.css +++ b/bootstrap-1.0.0.min.css @@ -154,7 +154,7 @@ table.zebra-striped th.orange{color:#f89406;border-bottom-color:#f89406;} table.zebra-striped th.headerSortUp.orange,table.zebra-striped th.headerSortDown.orange{background-color:#fee9cc;} table.zebra-striped th.purple{color:#7a43b6;border-bottom-color:#7a43b6;} table.zebra-striped th.headerSortUp.purple,table.zebra-striped th.headerSortDown.purple{background-color:#e2d5f0;} -div.topbar{height:40px;position:fixed;top:0;left:0;right:0;z-index:10000;overflow:visible;}div.topbar .fill{background:#222;position:absolute;top:0;left:0;bottom:0;right:0;background-color:#222222;background-repeat:repeat-x;background-image:-khtml-gradient(linear, left top, left bottom, from(#333333), to(#222222));background-image:-moz-linear-gradient(#333333, #222222);background-image:-ms-linear-gradient(#333333, #222222);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #333333), color-stop(100%, #222222));background-image:-webkit-linear-gradient(#333333, #222222);background-image:-o-linear-gradient(#333333, #222222);-ms-filter:"progid:DXImageTransform.Microsoft.gradient(startColorstr='#333333', endColorstr='#222222', GradientType=0)";filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#333333', endColorstr='#222222', GradientType=0);background-image:linear-gradient(#333333, #222222);-webkit-box-shadow:0 1px 3px rgba(0, 0, 0, 0.25),inset 0 -1px 0 rgba(0, 0, 0, 0.1);-moz-box-shadow:0 1px 3px rgba(0, 0, 0, 0.25),inset 0 -1px 0 rgba(0, 0, 0, 0.1);box-shadow:0 1px 3px rgba(0, 0, 0, 0.25),inset 0 -1px 0 rgba(0, 0, 0, 0.1);} +div.topbar{height:40px;position:fixed;top:0;left:0;right:0;z-index:10000;overflow:visible;}div.topbar .fill{background:#222;background-color:#222222;background-repeat:repeat-x;background-image:-khtml-gradient(linear, left top, left bottom, from(#333333), to(#222222));background-image:-moz-linear-gradient(#333333, #222222);background-image:-ms-linear-gradient(#333333, #222222);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #333333), color-stop(100%, #222222));background-image:-webkit-linear-gradient(#333333, #222222);background-image:-o-linear-gradient(#333333, #222222);-ms-filter:"progid:DXImageTransform.Microsoft.gradient(startColorstr='#333333', endColorstr='#222222', GradientType=0)";filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#333333', endColorstr='#222222', GradientType=0);background-image:linear-gradient(#333333, #222222);-webkit-box-shadow:0 1px 3px rgba(0, 0, 0, 0.25),inset 0 -1px 0 rgba(0, 0, 0, 0.1);-moz-box-shadow:0 1px 3px rgba(0, 0, 0, 0.25),inset 0 -1px 0 rgba(0, 0, 0, 0.1);box-shadow:0 1px 3px rgba(0, 0, 0, 0.25),inset 0 -1px 0 rgba(0, 0, 0, 0.1);} div.topbar a{color:#bfbfbf;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);} div.topbar a:hover,div.topbar ul li.active a{background-color:#333;background-color:rgba(255, 255, 255, 0.05);color:#ffffff;text-decoration:none;} div.topbar h3{position:relative;}div.topbar h3 a{float:left;display:block;padding:8px 20px 12px;margin-left:-20px;color:#ffffff;font-size:20px;font-weight:200;line-height:1;} diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index 2f2f096ca6..bae49064a7 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -221,11 +221,11 @@ div.topbar-wrapper { div.topbar-wrapper div.topbar { position: absolute; margin: 0 -20px; - padding-left: 20px; - padding-right: 20px; } div.topbar-wrapper div.topbar .fill { + padding-left: 20px; + padding-right: 20px; -webkit-border-radius: 4px; -moz-border-radius: 4px; border-radius: 4px; diff --git a/docs/index.html b/docs/index.html index a9351d8610..b9fffce971 100644 --- a/docs/index.html +++ b/docs/index.html @@ -32,22 +32,23 @@
-
-
-

Bootstrap

- +
+
+

Bootstrap

+ +
@@ -881,29 +882,30 @@

Fixed topbar

-
-
-

Project Name

- -
- -
- +
+
+

Project Name

+ +
+ +
+ +
diff --git a/lib/patterns.less b/lib/patterns.less index 056d468f58..d49393e219 100644 --- a/lib/patterns.less +++ b/lib/patterns.less @@ -19,11 +19,6 @@ div.topbar { // gradient is applied to it's own element because overflow visible is not honored by ie when filter is present .fill { background:#222; - position:absolute; - top: 0; - left: 0; - bottom: 0; - right: 0; #gradient > .vertical(#333, #222); @shadow: 0 1px 3px rgba(0,0,0,.25), inset 0 -1px 0 rgba(0,0,0,.1); .box-shadow(@shadow); From c3143b47294df75eb830fb9156f9eef8fbaa956b Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Sun, 21 Aug 2011 19:49:31 -0700 Subject: [PATCH 29/38] Fix for alert box gradients in IE7/8 --- bootstrap-1.0.0.css | 6 +++--- bootstrap-1.0.0.min.css | 2 +- lib/patterns.less | 7 +++++-- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/bootstrap-1.0.0.css b/bootstrap-1.0.0.css index 05e4da01f7..31668772e9 100644 --- a/bootstrap-1.0.0.css +++ b/bootstrap-1.0.0.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: Sun Aug 21 18:14:49 PDT 2011 + * Date: Sun Aug 21 19:46:16 PDT 2011 */ /* Reset.less * Props to Eric Meyer (meyerweb.com) for his CSS reset file. We're using an adapted version here that cuts out some of the reset HTML elements we will never need here (i.e., dfn, samp, etc). @@ -1382,8 +1382,8 @@ div.alert-message { -ms-filter: "progid:DXImageTransform.Microsoft.gradient(startColorstr='transparent', endColorstr='rgba(0, 0, 0, 0.15)', GradientType=0)"; filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='transparent', endColorstr='rgba(0, 0, 0, 0.15)', GradientType=0); background-image: linear-gradient(transparent, rgba(0, 0, 0, 0.15)); - -ms-filter: "progid:DXImageTransform.Microsoft.gradient(enabled=false)"; - filter: "progid:DXImageTransform.Microsoft.gradient(enabled=false)"; + -ms-filter: "progid:DXImageTransform.Microsoft.gradient(startColorstr='#00000000', endColorstr='#15000000')"; + filter: "progid:DXImageTransform.Microsoft.gradient(startColorstr='#00000000', endColorstr='#15000000')"; background-color: #e6e6e6; margin-bottom: 18px; padding: 8px 15px; diff --git a/bootstrap-1.0.0.min.css b/bootstrap-1.0.0.min.css index 14a1a176ee..8fe16f527a 100644 --- a/bootstrap-1.0.0.min.css +++ b/bootstrap-1.0.0.min.css @@ -177,7 +177,7 @@ div.topbar ul li ul li span{clear:both;display:block;background:rgba(0, 0, 0, 0. .hero-unit{background-color:#f5f5f5;margin-bottom:30px;padding:60px;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;}.hero-unit h1{margin-bottom:0;font-size:60px;line-height:1;letter-spacing:-1px;} .hero-unit p{font-size:18px;font-weight:200;line-height:27px;} div.page-header{margin-bottom:17px;border-bottom:1px solid #ddd;-webkit-box-shadow:0 1px 0 rgba(255, 255, 255, 0.5);-moz-box-shadow:0 1px 0 rgba(255, 255, 255, 0.5);box-shadow:0 1px 0 rgba(255, 255, 255, 0.5);}div.page-header h1{margin-bottom:8px;} -div.alert-message{background-color:rgba(0, 0, 0, 0.15);background-repeat:repeat-x;background-image:-khtml-gradient(linear, left top, left bottom, from(transparent), to(rgba(0, 0, 0, 0.15)));background-image:-moz-linear-gradient(transparent, rgba(0, 0, 0, 0.15));background-image:-ms-linear-gradient(transparent, rgba(0, 0, 0, 0.15));background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, transparent), color-stop(100%, rgba(0, 0, 0, 0.15)));background-image:-webkit-linear-gradient(transparent, rgba(0, 0, 0, 0.15));background-image:-o-linear-gradient(transparent, rgba(0, 0, 0, 0.15));-ms-filter:"progid:DXImageTransform.Microsoft.gradient(startColorstr='transparent', endColorstr='rgba(0, 0, 0, 0.15)', GradientType=0)";filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='transparent', endColorstr='rgba(0, 0, 0, 0.15)', GradientType=0);background-image:linear-gradient(transparent, rgba(0, 0, 0, 0.15));-ms-filter:"progid:DXImageTransform.Microsoft.gradient(enabled=false)";filter:"progid:DXImageTransform.Microsoft.gradient(enabled=false)";background-color:#e6e6e6;margin-bottom:18px;padding:8px 15px;color:#fff;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);border-bottom:1px solid rgba(0, 0, 0, 0.25);-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;}div.alert-message p{color:#fff;margin-bottom:0;}div.alert-message p+p{margin-top:5px;} +div.alert-message{background-color:rgba(0, 0, 0, 0.15);background-repeat:repeat-x;background-image:-khtml-gradient(linear, left top, left bottom, from(transparent), to(rgba(0, 0, 0, 0.15)));background-image:-moz-linear-gradient(transparent, rgba(0, 0, 0, 0.15));background-image:-ms-linear-gradient(transparent, rgba(0, 0, 0, 0.15));background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, transparent), color-stop(100%, rgba(0, 0, 0, 0.15)));background-image:-webkit-linear-gradient(transparent, rgba(0, 0, 0, 0.15));background-image:-o-linear-gradient(transparent, rgba(0, 0, 0, 0.15));-ms-filter:"progid:DXImageTransform.Microsoft.gradient(startColorstr='transparent', endColorstr='rgba(0, 0, 0, 0.15)', GradientType=0)";filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='transparent', endColorstr='rgba(0, 0, 0, 0.15)', GradientType=0);background-image:linear-gradient(transparent, rgba(0, 0, 0, 0.15));-ms-filter:"progid:DXImageTransform.Microsoft.gradient(startColorstr='#00000000', endColorstr='#15000000')";filter:"progid:DXImageTransform.Microsoft.gradient(startColorstr='#00000000', endColorstr='#15000000')";background-color:#e6e6e6;margin-bottom:18px;padding:8px 15px;color:#fff;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);border-bottom:1px solid rgba(0, 0, 0, 0.25);-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;}div.alert-message p{color:#fff;margin-bottom:0;}div.alert-message p+p{margin-top:5px;} div.alert-message.error{background-color:#e06359;} div.alert-message.warning{background-color:#ffd75a;} div.alert-message.success{background-color:#74c474;} diff --git a/lib/patterns.less b/lib/patterns.less index d49393e219..cb89710f6e 100644 --- a/lib/patterns.less +++ b/lib/patterns.less @@ -285,9 +285,12 @@ div.page-header { // One-liner alert bars div.alert-message { + + // TODO: Ask cloudhead how to do this fany filter elegantly. Less eval is returning strings with quotes ;_; #gradient > .vertical(transparent, rgba(0,0,0,0.15)); - -ms-filter: "progid:DXImageTransform.Microsoft.gradient(enabled=false)"; // no gradient IE8+ - filter: "progid:DXImageTransform.Microsoft.gradient(enabled=false)"; // no gradient IE6 & IE7 + -ms-filter: "progid:DXImageTransform.Microsoft.gradient(startColorstr='#00000000', endColorstr='#15000000')"; + filter: "progid:DXImageTransform.Microsoft.gradient(startColorstr='#00000000', endColorstr='#15000000')"; + background-color: @grayLighter; margin-bottom: @baseline; padding: 8px 15px; From f17b2633adb016ef58423c083d2a377368fc51c7 Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Sun, 21 Aug 2011 19:56:43 -0700 Subject: [PATCH 30/38] fix btn borders ie7/ie8 --- bootstrap-1.0.0.css | 8 ++++---- bootstrap-1.0.0.min.css | 2 +- docs/index.html | 12 ++++++++---- lib/patterns.less | 3 +-- lib/preboot.less | 7 ++++--- 5 files changed, 18 insertions(+), 14 deletions(-) diff --git a/bootstrap-1.0.0.css b/bootstrap-1.0.0.css index 31668772e9..220af6d325 100644 --- a/bootstrap-1.0.0.css +++ b/bootstrap-1.0.0.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: Sun Aug 21 19:46:16 PDT 2011 + * Date: Sun Aug 21 19:56:38 PDT 2011 */ /* Reset.less * Props to Eric Meyer (meyerweb.com) for his CSS reset file. We're using an adapted version here that cuts out some of the reset HTML elements we will never need here (i.e., dfn, samp, etc). @@ -395,9 +395,9 @@ a:hover { color: #333333; font-size: 13px; line-height: 18px; - border: 1px solid rgba(0, 0, 0, 0.1); - border-bottom: 1px solid #ccc; - border-bottom-color: rgba(0, 0, 0, 0.25); + border: 1px solid; + border-color: #ccc #ccc #bbb; + border-color: borderColor borderColor rgba(0, 0, 0, 0.25); -webkit-border-radius: 4px; -moz-border-radius: 4px; border-radius: 4px; diff --git a/bootstrap-1.0.0.min.css b/bootstrap-1.0.0.min.css index 8fe16f527a..9200528c5a 100644 --- a/bootstrap-1.0.0.min.css +++ b/bootstrap-1.0.0.min.css @@ -47,7 +47,7 @@ div.container-fluid:after{clear:both;} div.container-fluid div.sidebar{float:left;width:220px;} div.container-fluid div.content{min-width:700px;max-width:1180px;margin-left:240px;} a{color:#0069d6;text-decoration:none;line-height:inherit;}a:hover{color:#0050a3;text-decoration:underline;} -.btn{display:inline-block;background-color:#e6e6e6;background-repeat:no-repeat;background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), color-stop(0.25, #ffffff), to(#e6e6e6));background-image:-webkit-linear-gradient(#ffffff, color-stop(0.25, #ffffff), #e6e6e6);background-image:-moz-linear-gradient(#ffffff, color-stop(#ffffff, 0.25), #e6e6e6);background-image:-ms-linear-gradient(#ffffff, color-stop(#ffffff, 0.25), #e6e6e6);background-image:-o-linear-gradient(#ffffff, color-stop(#ffffff, 0.25), #e6e6e6);background-image:linear-gradient(#ffffff, color-stop(#ffffff, 0.25), #e6e6e6);padding:4px 14px;text-shadow:0 1px 1px rgba(255, 255, 255, 0.75);color:#333333;font-size:13px;line-height:18px;border:1px solid rgba(0, 0, 0, 0.1);border-bottom:1px solid #ccc;border-bottom-color:rgba(0, 0, 0, 0.25);-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-webkit-box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0, 0.05);-moz-box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0, 0.05);box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0, 0.05);-webkit-transition:0.1s linear all;-moz-transition:0.1s linear all;transition:0.1s linear all;}.btn:hover{background-position:0 -15px;color:#333333;text-decoration:none;} +.btn{display:inline-block;background-color:#e6e6e6;background-repeat:no-repeat;background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), color-stop(0.25, #ffffff), to(#e6e6e6));background-image:-webkit-linear-gradient(#ffffff, color-stop(0.25, #ffffff), #e6e6e6);background-image:-moz-linear-gradient(#ffffff, color-stop(#ffffff, 0.25), #e6e6e6);background-image:-ms-linear-gradient(#ffffff, color-stop(#ffffff, 0.25), #e6e6e6);background-image:-o-linear-gradient(#ffffff, color-stop(#ffffff, 0.25), #e6e6e6);background-image:linear-gradient(#ffffff, color-stop(#ffffff, 0.25), #e6e6e6);padding:4px 14px;text-shadow:0 1px 1px rgba(255, 255, 255, 0.75);color:#333333;font-size:13px;line-height:18px;border:1px solid;border-color:#ccc #ccc #bbb;border-color:borderColor borderColor rgba(0, 0, 0, 0.25);-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-webkit-box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0, 0.05);-moz-box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0, 0.05);box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0, 0.05);-webkit-transition:0.1s linear all;-moz-transition:0.1s linear all;transition:0.1s linear all;}.btn:hover{background-position:0 -15px;color:#333333;text-decoration:none;} .btn.primary{background-color:#0064cd;background-repeat:repeat-x;background-image:-khtml-gradient(linear, left top, left bottom, from(#049cdb), to(#0064cd));background-image:-moz-linear-gradient(#049cdb, #0064cd);background-image:-ms-linear-gradient(#049cdb, #0064cd);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #049cdb), color-stop(100%, #0064cd));background-image:-webkit-linear-gradient(#049cdb, #0064cd);background-image:-o-linear-gradient(#049cdb, #0064cd);-ms-filter:"progid:DXImageTransform.Microsoft.gradient(startColorstr='#049cdb', endColorstr='#0064cd', GradientType=0)";filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#049cdb', endColorstr='#0064cd', GradientType=0);background-image:linear-gradient(#049cdb, #0064cd);color:#fff;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);border-bottom-color:#003f81;border-bottom-color:rgba(0, 0, 0, 0.25);}.btn.primary:hover{color:#fff;} .btn.large{font-size:16px;line-height:28px;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;} .btn.small{padding-right:9px;padding-left:9px;font-size:11px;} diff --git a/docs/index.html b/docs/index.html index b9fffce971..686115684e 100644 --- a/docs/index.html +++ b/docs/index.html @@ -843,8 +843,10 @@

Example buttons

Button styles can be applied to anything with the .btn applied. Typically you’ll want to apply these to only <a>, <button>, and select <input> elements. Here’s how it looks:

- - +
+ + +

Alternate sizes

Fancy larger or smaller buttons? Have at it!

@@ -866,8 +868,10 @@

Buttons

- - +
+ + +
diff --git a/lib/patterns.less b/lib/patterns.less index cb89710f6e..e920122407 100644 --- a/lib/patterns.less +++ b/lib/patterns.less @@ -286,11 +286,10 @@ div.page-header { // One-liner alert bars div.alert-message { - // TODO: Ask cloudhead how to do this fany filter elegantly. Less eval is returning strings with quotes ;_; + // TODO: Ask cloudhead how to do this fancy filter elegantly. Less eval is returning strings with quotes ;_; #gradient > .vertical(transparent, rgba(0,0,0,0.15)); -ms-filter: "progid:DXImageTransform.Microsoft.gradient(startColorstr='#00000000', endColorstr='#15000000')"; filter: "progid:DXImageTransform.Microsoft.gradient(startColorstr='#00000000', endColorstr='#15000000')"; - background-color: @grayLighter; margin-bottom: @baseline; padding: 8px 15px; diff --git a/lib/preboot.less b/lib/preboot.less index 9c3da46b1b..e02182eca1 100644 --- a/lib/preboot.less +++ b/lib/preboot.less @@ -189,9 +189,10 @@ color: @textColor; font-size: @fontSize; line-height: @baseline; - border: 1px solid @borderColor; - border-bottom: 1px solid #ccc; - border-bottom-color: fadein(@borderColor, 15%); + border: 1px solid; + border-color: #ccc #ccc #bbb; + border-color: borderColor borderColor fadein(@borderColor, 15%); + .border-radius(@borderRadius); @shadow: inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05); .box-shadow(@shadow); From 60fc4eb7b9e7c5d881a40615b63c9dda724815b4 Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Sun, 21 Aug 2011 19:59:43 -0700 Subject: [PATCH 31/38] touch up less --- bootstrap-1.0.0.css | 6 +++--- bootstrap-1.0.0.min.css | 2 +- lib/preboot.less | 1 - lib/scaffolding.less | 4 ++-- 4 files changed, 6 insertions(+), 7 deletions(-) diff --git a/bootstrap-1.0.0.css b/bootstrap-1.0.0.css index 220af6d325..ed1f3a20c7 100644 --- a/bootstrap-1.0.0.css +++ b/bootstrap-1.0.0.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: Sun Aug 21 19:56:38 PDT 2011 + * Date: Sun Aug 21 19:59:40 PDT 2011 */ /* Reset.less * Props to Eric Meyer (meyerweb.com) for his CSS reset file. We're using an adapted version here that cuts out some of the reset HTML elements we will never need here (i.e., dfn, samp, etc). @@ -427,8 +427,8 @@ a:hover { background-image: linear-gradient(#049cdb, #0064cd); color: #fff; text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); - border-bottom-color: #003f81; - border-bottom-color: rgba(0, 0, 0, 0.25); + border-color: #0064cd #0064cd #003f81; + border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); } .btn.primary:hover { color: #fff; diff --git a/bootstrap-1.0.0.min.css b/bootstrap-1.0.0.min.css index 9200528c5a..598725b0a8 100644 --- a/bootstrap-1.0.0.min.css +++ b/bootstrap-1.0.0.min.css @@ -48,7 +48,7 @@ div.container-fluid div.sidebar{float:left;width:220px;} div.container-fluid div.content{min-width:700px;max-width:1180px;margin-left:240px;} a{color:#0069d6;text-decoration:none;line-height:inherit;}a:hover{color:#0050a3;text-decoration:underline;} .btn{display:inline-block;background-color:#e6e6e6;background-repeat:no-repeat;background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), color-stop(0.25, #ffffff), to(#e6e6e6));background-image:-webkit-linear-gradient(#ffffff, color-stop(0.25, #ffffff), #e6e6e6);background-image:-moz-linear-gradient(#ffffff, color-stop(#ffffff, 0.25), #e6e6e6);background-image:-ms-linear-gradient(#ffffff, color-stop(#ffffff, 0.25), #e6e6e6);background-image:-o-linear-gradient(#ffffff, color-stop(#ffffff, 0.25), #e6e6e6);background-image:linear-gradient(#ffffff, color-stop(#ffffff, 0.25), #e6e6e6);padding:4px 14px;text-shadow:0 1px 1px rgba(255, 255, 255, 0.75);color:#333333;font-size:13px;line-height:18px;border:1px solid;border-color:#ccc #ccc #bbb;border-color:borderColor borderColor rgba(0, 0, 0, 0.25);-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-webkit-box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0, 0.05);-moz-box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0, 0.05);box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0, 0.05);-webkit-transition:0.1s linear all;-moz-transition:0.1s linear all;transition:0.1s linear all;}.btn:hover{background-position:0 -15px;color:#333333;text-decoration:none;} -.btn.primary{background-color:#0064cd;background-repeat:repeat-x;background-image:-khtml-gradient(linear, left top, left bottom, from(#049cdb), to(#0064cd));background-image:-moz-linear-gradient(#049cdb, #0064cd);background-image:-ms-linear-gradient(#049cdb, #0064cd);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #049cdb), color-stop(100%, #0064cd));background-image:-webkit-linear-gradient(#049cdb, #0064cd);background-image:-o-linear-gradient(#049cdb, #0064cd);-ms-filter:"progid:DXImageTransform.Microsoft.gradient(startColorstr='#049cdb', endColorstr='#0064cd', GradientType=0)";filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#049cdb', endColorstr='#0064cd', GradientType=0);background-image:linear-gradient(#049cdb, #0064cd);color:#fff;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);border-bottom-color:#003f81;border-bottom-color:rgba(0, 0, 0, 0.25);}.btn.primary:hover{color:#fff;} +.btn.primary{background-color:#0064cd;background-repeat:repeat-x;background-image:-khtml-gradient(linear, left top, left bottom, from(#049cdb), to(#0064cd));background-image:-moz-linear-gradient(#049cdb, #0064cd);background-image:-ms-linear-gradient(#049cdb, #0064cd);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #049cdb), color-stop(100%, #0064cd));background-image:-webkit-linear-gradient(#049cdb, #0064cd);background-image:-o-linear-gradient(#049cdb, #0064cd);-ms-filter:"progid:DXImageTransform.Microsoft.gradient(startColorstr='#049cdb', endColorstr='#0064cd', GradientType=0)";filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#049cdb', endColorstr='#0064cd', GradientType=0);background-image:linear-gradient(#049cdb, #0064cd);color:#fff;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);border-color:#0064cd #0064cd #003f81;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);}.btn.primary:hover{color:#fff;} .btn.large{font-size:16px;line-height:28px;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;} .btn.small{padding-right:9px;padding-left:9px;font-size:11px;} .btn.disabled{background-image:none;filter:alpha(opacity=65);-khtml-opacity:0.65;-moz-opacity:0.65;opacity:0.65;cursor:default;} diff --git a/lib/preboot.less b/lib/preboot.less index e02182eca1..20ded0547c 100644 --- a/lib/preboot.less +++ b/lib/preboot.less @@ -192,7 +192,6 @@ border: 1px solid; border-color: #ccc #ccc #bbb; border-color: borderColor borderColor fadein(@borderColor, 15%); - .border-radius(@borderRadius); @shadow: inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05); .box-shadow(@shadow); diff --git a/lib/scaffolding.less b/lib/scaffolding.less index b1f846a38b..864aea52fc 100644 --- a/lib/scaffolding.less +++ b/lib/scaffolding.less @@ -101,8 +101,8 @@ a { #gradient > .vertical(@blue, @blueDark); color: #fff; text-shadow: 0 -1px 0 rgba(0,0,0,.25); - border-bottom-color: darken(@blueDark, 15%); - border-bottom-color: fadein(rgba(0,0,0,.1), 15%); + border-color: @blueDark @blueDark darken(@blueDark, 15%); + border-color: rgba(0,0,0,.1) rgba(0,0,0,.1) fadein(rgba(0,0,0,.1), 15%); &:hover { color: #fff; } From 80e0e9c41309f0ac525aa6f67bccb91916637351 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 21 Aug 2011 20:03:12 -0700 Subject: [PATCH 32/38] updated list html, tweaks to patterns --- docs/index.html | 76 ++++++++++++++++++++--------------------------- lib/patterns.less | 25 ++++++++-------- 2 files changed, 45 insertions(+), 56 deletions(-) diff --git a/docs/index.html b/docs/index.html index 18be5f1588..efcf19746a 100644 --- a/docs/index.html +++ b/docs/index.html @@ -359,64 +359,54 @@

Unordered <ul>

    -
  • Jeremy Bixby
    • -
  • Robert Dezure
    • -
  • Josh Washington
    • -
  • Anton Capresi
    • -
  • My Team Mates +
  • Lorem ipsum dolor sit amet
    • +
  • Consectetur adipiscing elit
    • +
  • Integer molestie lorem at massa
    • +
  • Facilisis in pretium nisl aliquet
    • +
  • Nulla volutpat aliquam velit
      -
    • George Castanza
      • -
    • Jerry Seinfeld
      • -
    • Cosmo Kramer
      • -
    • Elaine Bennis
      • -
    • Newman
      • +
    • Phasellus iaculis neque
      • +
    • Purus sodales ultricies
      • +
    • Vestibulum laoreet porttitor sem
      • +
    • Ac tristique libero volutpat at
    • -
  • John Jacob
    • -
  • Paul Pierce
    • -
  • Kevin Garnett
    • +
  • Faucibus porta lacus fringilla vel
    • +
  • Aenean sit amet erat nunc
    • +
  • Eget porttitor lorem

Unstyled <ul.unstyled>

    -
  • Jeremy Bixby
    • -
  • Robert Dezure
    • -
  • Josh Washington
    • -
  • Anton Capresi
    • -
  • My Team Mates +
  • Lorem ipsum dolor sit amet
    • +
  • Consectetur adipiscing elit
    • +
  • Integer molestie lorem at massa
    • +
  • Facilisis in pretium nisl aliquet
    • +
  • Nulla volutpat aliquam velit
      -
    • George Castanza
      • -
    • Jerry Seinfeld
      • -
    • Cosmo Kramer
      • -
    • Elaine Bennis
      • -
    • Newman
      • +
    • Phasellus iaculis neque
      • +
    • Purus sodales ultricies
      • +
    • Vestibulum laoreet porttitor sem
      • +
    • Ac tristique libero volutpat at
    • -
  • John Jacob
    • -
  • Paul Pierce
    • -
  • Kevin Garnett
    • +
  • Faucibus porta lacus fringilla vel
    • +
  • Aenean sit amet erat nunc
    • +
  • Eget porttitor lorem

Ordered <ol>

    -
  1. Jeremy Bixby
    2. -
  2. Robert Dezure
    3. -
  3. Josh Washington
    4. -
  4. Anton Capresi
    5. -
  5. My Team Mates -
      -
    1. George Castanza
      2. -
    2. Jerry Seinfeld
      3. -
    3. Cosmo Kramer
      4. -
    4. Elaine Bennis
      5. -
    5. Newman
      6. -
    -
    6. -
  6. John Jacob
    7. -
  7. Paul Pierce
    8. -
  8. Kevin Garnett
    9. +
  9. Lorem ipsum dolor sit amet
    10. +
  10. Consectetur adipiscing elit
    11. +
  11. Integer molestie lorem at massa
    12. +
  12. Facilisis in pretium nisl aliquet
    13. +
  13. Nulla volutpat aliquam velit
    14. +
  14. Faucibus porta lacus fringilla vel
    15. +
  15. Aenean sit amet erat nunc
    16. +
  16. Eget porttitor lorem
@@ -1172,8 +1162,6 @@ Lorem ipsum dolar sit amet illo error ipsum verita
- - diff --git a/lib/patterns.less b/lib/patterns.less index 229218eb64..6506287a2f 100644 --- a/lib/patterns.less +++ b/lib/patterns.less @@ -261,7 +261,7 @@ div.topbar { // PAGE HEADERS // ------------ -div.page-header { +.page-header { margin-bottom: @baseline - 1; border-bottom: 1px solid #ddd; .box-shadow(0 1px 0 rgba(255,255,255,.5)); @@ -275,8 +275,7 @@ div.page-header { // ------------ // One-liner alert bars -div.alert-message { -// #gradient > .vertical(rgba(0,0,0,.01), rgba(0,0,0,0.15)); +.alert-message { background-color: @grayLighter; margin-bottom: @baseline; padding: 8px 15px; @@ -323,7 +322,7 @@ div.alert-message { } // Block-level Alerts -div.block-message { +.block-message { margin-bottom: @baseline; padding: 14px; color: @grayDark; @@ -365,8 +364,8 @@ div.block-message { // ---------- // Common tab and pill styles -ul.tabs, -ul.pills { +.tabs, +.pills { margin: 0 0 20px; padding: 0; .clearfix(); @@ -380,7 +379,7 @@ ul.pills { } // Basic Tabs -ul.tabs { +.tabs { width: 100%; border-bottom: 1px solid @grayLight; li { @@ -406,7 +405,7 @@ ul.tabs { } // Basic pill nav -ul.pills { +.pills { li { a { margin: 5px 3px 5px 0; @@ -433,12 +432,13 @@ ul.pills { // PAGINATION // ---------- -div.pagination { +.pagination { height: @baseline * 2; margin: @baseline 0; ul { float: left; margin: 0; + border: 1px solid #ddd; border: 1px solid rgba(0,0,0,.15); .border-radius(3px); .box-shadow(0 1px 2px rgba(0,0,0,.075); @@ -448,6 +448,7 @@ div.pagination { float: left; padding: 0 14px; line-height: (@baseline * 2) - 2; + border-right: 1px solid #ddd; border-right: 1px solid rgba(0,0,0,.15); text-decoration: none; } @@ -487,7 +488,7 @@ div.pagination { // MODALS // ------ -div.modal-backdrop { +.modal-backdrop { background-color: rgba(0,0,0,.5); position: fixed; top: 0; @@ -496,7 +497,7 @@ div.modal-backdrop { bottom: 0; z-index: 1000; } -div.modal { +.modal { position: fixed; top: 50%; left: 50%; @@ -579,7 +580,7 @@ div.modal { // TWIPSY // ------ -div.twipsy { +.twipsy { display: block; position: absolute; visibility: visible; From c705521e08c9d673222b23aaca7ca465433cc245 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 21 Aug 2011 20:07:15 -0700 Subject: [PATCH 33/38] rebuild and updated tables to remove tags from selectors --- bootstrap-1.0.0.css | 163 ++++++++++++++++++++-------------------- bootstrap-1.0.0.min.css | 115 ++++++++++++++-------------- lib/tables.less | 64 ++++++++-------- 3 files changed, 168 insertions(+), 174 deletions(-) diff --git a/bootstrap-1.0.0.css b/bootstrap-1.0.0.css index ae1c8b3550..27890cf205 100644 --- a/bootstrap-1.0.0.css +++ b/bootstrap-1.0.0.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: Sun Aug 21 17:28:43 PDT 2011 + * Date: Sun Aug 21 20:06:59 PDT 2011 */ /* Reset.less * Props to Eric Meyer (meyerweb.com) for his CSS reset file. We're using an adapted version here that cuts out some of the reset HTML elements we will never need here (i.e., dfn, samp, etc). @@ -978,13 +978,13 @@ table { width: 100%; margin-bottom: 18px; padding: 0; - text-align: left; border-collapse: separate; font-size: 13px; } table th, table td { padding: 10px 10px 9px; line-height: 13.5px; + text-align: left; vertical-align: middle; border-bottom: 1px solid #ddd; } @@ -993,16 +993,16 @@ table th { font-weight: bold; border-bottom-width: 2px; } -table.zebra-striped tbody tr:nth-child(odd) td { +.zebra-striped tbody tr:nth-child(odd) td { background-color: #f9f9f9; } -table.zebra-striped tbody tr:hover td { +.zebra-striped tbody tr:hover td { background-color: #f5f5f5; } -table.zebra-striped th.header { +.zebra-striped .header { cursor: pointer; } -table.zebra-striped th.header:after { +.zebra-striped .header:after { content: ""; float: right; margin-top: 7px; @@ -1011,27 +1011,24 @@ table.zebra-striped th.header:after { border-color: #000 transparent; visibility: hidden; } -table.zebra-striped th.headerSortUp, table.zebra-striped th.headerSortDown { +.zebra-striped .headerSortUp, .zebra-striped .headerSortDown { background-color: rgba(141, 192, 219, 0.25); text-shadow: 0 1px 1px rgba(255, 255, 255, 0.75); -webkit-border-radius: 3px 3px 0 0; -moz-border-radius: 3px 3px 0 0; border-radius: 3px 3px 0 0; } -table.zebra-striped th.header:hover:after { +.zebra-striped .header:hover:after { visibility: visible; } -table.zebra-striped th.actions:hover { - background-image: none; -} -table.zebra-striped th.headerSortDown:after, table.zebra-striped th.headerSortDown:hover:after { +.zebra-striped .headerSortDown:after, .zebra-striped .headerSortDown:hover:after { visibility: visible; filter: alpha(opacity=60); -khtml-opacity: 0.6; -moz-opacity: 0.6; opacity: 0.6; } -table.zebra-striped th.headerSortUp:after { +.zebra-striped .headerSortUp:after { border-bottom: none; border-left: 4px solid transparent; border-right: 4px solid transparent; @@ -1045,46 +1042,46 @@ table.zebra-striped th.headerSortUp:after { -moz-opacity: 0.6; opacity: 0.6; } -table.zebra-striped th.blue { +table .blue { color: #049cdb; border-bottom-color: #049cdb; } -table.zebra-striped th.headerSortUp.blue, table.zebra-striped th.headerSortDown.blue { +table .headerSortUp.blue, table .headerSortDown.blue { background-color: #ade6fe; } -table.zebra-striped th.green { +table .green { color: #46a546; border-bottom-color: #46a546; } -table.zebra-striped th.headerSortUp.green, table.zebra-striped th.headerSortDown.green { +table .headerSortUp.green, table .headerSortDown.green { background-color: #cdeacd; } -table.zebra-striped th.red { +table .red { color: #9d261d; border-bottom-color: #9d261d; } -table.zebra-striped th.headerSortUp.red, table.zebra-striped th.headerSortDown.red { +table .headerSortUp.red, table .headerSortDown.red { background-color: #f4c8c5; } -table.zebra-striped th.yellow { +table .yellow { color: #ffc40d; border-bottom-color: #ffc40d; } -table.zebra-striped th.headerSortUp.yellow, table.zebra-striped th.headerSortDown.yellow { +table .headerSortUp.yellow, table .headerSortDown.yellow { background-color: #fff6d9; } -table.zebra-striped th.orange { +table .orange { color: #f89406; border-bottom-color: #f89406; } -table.zebra-striped th.headerSortUp.orange, table.zebra-striped th.headerSortDown.orange { +table .headerSortUp.orange, table .headerSortDown.orange { background-color: #fee9cc; } -table.zebra-striped th.purple { +table .purple { color: #7a43b6; border-bottom-color: #7a43b6; } -table.zebra-striped th.headerSortUp.purple, table.zebra-striped th.headerSortDown.purple { +table .headerSortUp.purple, table .headerSortDown.purple { background-color: #e2d5f0; } /* Patterns.less @@ -1338,17 +1335,17 @@ div.topbar ul li ul li span { font-weight: 200; line-height: 27px; } -div.page-header { +.page-header { margin-bottom: 17px; border-bottom: 1px solid #ddd; -webkit-box-shadow: 0 1px 0 rgba(255, 255, 255, 0.5); -moz-box-shadow: 0 1px 0 rgba(255, 255, 255, 0.5); box-shadow: 0 1px 0 rgba(255, 255, 255, 0.5); } -div.page-header h1 { +.page-header h1 { margin-bottom: 8px; } -div.alert-message { +.alert-message { background-color: #e6e6e6; margin-bottom: 18px; padding: 8px 15px; @@ -1359,14 +1356,14 @@ div.alert-message { -moz-border-radius: 4px; border-radius: 4px; } -div.alert-message p { +.alert-message p { color: #fff; margin-bottom: 0; } -div.alert-message p + p { +.alert-message p + p { margin-top: 5px; } -div.alert-message.error { +.alert-message.error { background-color: #d83a2e; background-repeat: repeat-x; background-image: -khtml-gradient(linear, left top, left bottom, from(#e4776f), to(#d83a2e)); @@ -1378,7 +1375,7 @@ div.alert-message.error { background-image: linear-gradient(#e4776f, #d83a2e); border-bottom-color: #b32b21; } -div.alert-message.warning { +.alert-message.warning { background-color: #ffd040; background-repeat: repeat-x; background-image: -khtml-gradient(linear, left top, left bottom, from(#ffe38d), to(#ffd040)); @@ -1390,7 +1387,7 @@ div.alert-message.warning { background-image: linear-gradient(#ffe38d, #ffd040); border-bottom-color: #ffc40d; } -div.alert-message.success { +.alert-message.success { background-color: #62bc62; background-repeat: repeat-x; background-image: -khtml-gradient(linear, left top, left bottom, from(#97d397), to(#62bc62)); @@ -1402,7 +1399,7 @@ div.alert-message.success { background-image: linear-gradient(#97d397, #62bc62); border-bottom-color: #46a546; } -div.alert-message.info { +.alert-message.info { background-color: #04aef4; background-repeat: repeat-x; background-image: -khtml-gradient(linear, left top, left bottom, from(#62cffc), to(#04aef4)); @@ -1414,7 +1411,7 @@ div.alert-message.info { background-image: linear-gradient(#62cffc, #04aef4); border-bottom-color: #049cdb; } -div.alert-message .close { +.alert-message .close { float: right; margin-top: -2px; color: #000; @@ -1426,14 +1423,14 @@ div.alert-message .close { -moz-opacity: 0.2; opacity: 0.2; } -div.alert-message .close:hover { +.alert-message .close:hover { text-decoration: none; filter: alpha(opacity=40); -khtml-opacity: 0.4; -moz-opacity: 0.4; opacity: 0.4; } -div.block-message { +.block-message { margin-bottom: 18px; padding: 14px; color: #404040; @@ -1443,61 +1440,61 @@ div.block-message { -moz-border-radius: 6px; border-radius: 6px; } -div.block-message p { +.block-message p { color: #404040; color: rgba(0, 0, 0, 0.8); margin-right: 30px; margin-bottom: 0; } -div.block-message ul { +.block-message ul { margin-bottom: 0; } -div.block-message strong { +.block-message strong { display: block; } -div.block-message.error { +.block-message.error { background: #f8dcda; border: 1px solid #f4c8c5; } -div.block-message.warning { +.block-message.warning { background: #fff0c0; border: 1px solid #ffe38d; } -div.block-message.success { +.block-message.success { background: #dff1df; border: 1px solid #bbe2bb; } -div.block-message.info { +.block-message.info { background: #c7eefe; border: 1px solid #ade6fe; } -ul.tabs, ul.pills { +.tabs, .pills { margin: 0 0 20px; padding: 0; zoom: 1; } -ul.tabs:before, -ul.pills:before, -ul.tabs:after, -ul.pills:after { +.tabs:before, +.pills:before, +.tabs:after, +.pills:after { display: table; content: ""; } -ul.tabs:after, ul.pills:after { +.tabs:after, .pills:after { clear: both; } -ul.tabs li, ul.pills li { +.tabs li, .pills li { display: inline; } -ul.tabs li a, ul.pills li a { +.tabs li a, .pills li a { float: left; width: auto; } -ul.tabs { +.tabs { width: 100%; border-bottom: 1px solid #bfbfbf; } -ul.tabs li a { +.tabs li a { margin-bottom: -1px; margin-right: 2px; padding: 0 15px; @@ -1506,18 +1503,18 @@ ul.tabs li a { -moz-border-radius: 3px 3px 0 0; border-radius: 3px 3px 0 0; } -ul.tabs li a:hover { +.tabs li a:hover { background-color: #e6e6e6; border-bottom: 1px solid #bfbfbf; } -ul.tabs li.active a { +.tabs li.active a { background-color: #fff; padding: 0 14px; border: 1px solid #ccc; border-bottom: 0; color: #808080; } -ul.pills li a { +.pills li a { margin: 5px 3px 5px 0; padding: 0 15px; text-shadow: 0 1px 1px #fff; @@ -1526,24 +1523,25 @@ ul.pills li a { -moz-border-radius: 15px; border-radius: 15px; } -ul.pills li a:hover { +.pills li a:hover { background: #0050a3; color: #fff; text-decoration: none; text-shadow: 0 1px 1px rgba(0, 0, 0, 0.25); } -ul.pills li.active a { +.pills li.active a { background: #0069d6; color: #fff; text-shadow: 0 1px 1px rgba(0, 0, 0, 0.25); } -div.pagination { +.pagination { height: 36px; margin: 18px 0; } -div.pagination ul { +.pagination ul { float: left; margin: 0; + border: 1px solid #ddd; border: 1px solid rgba(0, 0, 0, 0.15); -webkit-border-radius: 3px; -moz-border-radius: 3px; @@ -1552,24 +1550,25 @@ div.pagination ul { -moz-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.075); box-shadow: 0 1px 2px rgba(0, 0, 0, 0.075); } -div.pagination ul li { +.pagination ul li { display: inline; } -div.pagination ul li a { +.pagination ul li a { float: left; padding: 0 14px; line-height: 34px; + border-right: 1px solid #ddd; border-right: 1px solid rgba(0, 0, 0, 0.15); text-decoration: none; } -div.pagination ul li a:hover, div.pagination ul li.active a { +.pagination ul li a:hover, .pagination ul li.active a { background-color: #c7eefe; } -div.pagination ul li.disabled a, div.pagination ul li.disabled a:hover { +.pagination ul li.disabled a, .pagination ul li.disabled a:hover { background-color: none; color: #bfbfbf; } -div.pagination ul li.next a, div.pagination ul li:last-child a { +.pagination ul li.next a, .pagination ul li:last-child a { border: 0; } .well { @@ -1586,7 +1585,7 @@ div.pagination ul li.next a, div.pagination ul li:last-child a { -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.05); box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.05); } -div.modal-backdrop { +.modal-backdrop { background-color: rgba(0, 0, 0, 0.5); position: fixed; top: 0; @@ -1595,7 +1594,7 @@ div.modal-backdrop { bottom: 0; z-index: 1000; } -div.modal { +.modal { position: fixed; top: 50%; left: 50%; @@ -1614,11 +1613,11 @@ div.modal { -moz-background-clip: padding; background-clip: padding; } -div.modal .modal-header { +.modal .modal-header { border-bottom: 1px solid #eee; padding: 5px 20px; } -div.modal .modal-header a.close { +.modal .modal-header a.close { position: absolute; right: 10px; top: 10px; @@ -1626,10 +1625,10 @@ div.modal .modal-header a.close { line-height: 10px; font-size: 18px; } -div.modal .modal-body { +.modal .modal-body { padding: 20px; } -div.modal .modal-footer { +.modal .modal-footer { background-color: #f5f5f5; padding: 14px 20px 15px; border-top: 1px solid #ddd; @@ -1641,18 +1640,18 @@ div.modal .modal-footer { box-shadow: inset 0 1px 0 #ffffff; zoom: 1; } -div.modal .modal-footer:before, div.modal .modal-footer:after { +.modal .modal-footer:before, .modal .modal-footer:after { display: table; content: ""; } -div.modal .modal-footer:after { +.modal .modal-footer:after { clear: both; } -div.modal .modal-footer .btn { +.modal .modal-footer .btn { float: right; margin-left: 10px; } -div.twipsy { +.twipsy { display: block; position: absolute; visibility: visible; @@ -1664,7 +1663,7 @@ div.twipsy { -moz-opacity: 0.8; opacity: 0.8; } -div.twipsy.above .twipsy-arrow { +.twipsy.above .twipsy-arrow { bottom: 0; left: 50%; margin-left: -5px; @@ -1672,7 +1671,7 @@ div.twipsy.above .twipsy-arrow { border-right: 5px solid transparent; border-top: 5px solid #000000; } -div.twipsy.left .twipsy-arrow { +.twipsy.left .twipsy-arrow { top: 50%; right: 0; margin-top: -5px; @@ -1680,7 +1679,7 @@ div.twipsy.left .twipsy-arrow { border-bottom: 5px solid transparent; border-left: 5px solid #000000; } -div.twipsy.below .twipsy-arrow { +.twipsy.below .twipsy-arrow { top: 0; left: 50%; margin-left: -5px; @@ -1688,7 +1687,7 @@ div.twipsy.below .twipsy-arrow { border-right: 5px solid transparent; border-bottom: 5px solid #000000; } -div.twipsy.right .twipsy-arrow { +.twipsy.right .twipsy-arrow { top: 50%; left: 0; margin-top: -5px; @@ -1696,7 +1695,7 @@ div.twipsy.right .twipsy-arrow { border-bottom: 5px solid transparent; border-right: 5px solid #000000; } -div.twipsy .twipsy-inner { +.twipsy .twipsy-inner { padding: 3px 8px; background-color: #000; color: white; @@ -1707,7 +1706,7 @@ div.twipsy .twipsy-inner { -moz-border-radius: 4px; border-radius: 4px; } -div.twipsy .twipsy-arrow { +.twipsy .twipsy-arrow { position: absolute; width: 0; height: 0; diff --git a/bootstrap-1.0.0.min.css b/bootstrap-1.0.0.min.css index d23cb5b087..8dcabc6551 100644 --- a/bootstrap-1.0.0.min.css +++ b/bootstrap-1.0.0.min.css @@ -131,28 +131,27 @@ form.form-stacked label{display:block;float:none;width:auto;font-weight:bold;tex form.form-stacked div.clearfix{margin-bottom:9px;}form.form-stacked div.clearfix div.input{margin-left:0;} form.form-stacked ul.inputs-list{margin-bottom:0;}form.form-stacked ul.inputs-list li{padding-top:0;}form.form-stacked ul.inputs-list li label{font-weight:normal;padding-top:0;} form.form-stacked div.actions{margin-left:-20px;padding-left:20px;} -table{width:100%;margin-bottom:18px;padding:0;text-align:left;border-collapse:separate;font-size:13px;}table th,table td{padding:10px 10px 9px;line-height:13.5px;vertical-align:middle;border-bottom:1px solid #ddd;} +table{width:100%;margin-bottom:18px;padding:0;border-collapse:separate;font-size:13px;}table th,table td{padding:10px 10px 9px;line-height:13.5px;text-align:left;vertical-align:middle;border-bottom:1px solid #ddd;} table th{padding-top:9px;font-weight:bold;border-bottom-width:2px;} -table.zebra-striped tbody tr:nth-child(odd) td{background-color:#f9f9f9;} -table.zebra-striped tbody tr:hover td{background-color:#f5f5f5;} -table.zebra-striped th.header{cursor:pointer;}table.zebra-striped th.header:after{content:"";float:right;margin-top:7px;border-width:0 4px 4px;border-style:solid;border-color:#000 transparent;visibility:hidden;} -table.zebra-striped th.headerSortUp,table.zebra-striped th.headerSortDown{background-color:rgba(141, 192, 219, 0.25);text-shadow:0 1px 1px rgba(255, 255, 255, 0.75);-webkit-border-radius:3px 3px 0 0;-moz-border-radius:3px 3px 0 0;border-radius:3px 3px 0 0;} -table.zebra-striped th.header:hover:after{visibility:visible;} -table.zebra-striped th.actions:hover{background-image:none;} -table.zebra-striped th.headerSortDown:after,table.zebra-striped th.headerSortDown:hover:after{visibility:visible;filter:alpha(opacity=60);-khtml-opacity:0.6;-moz-opacity:0.6;opacity:0.6;} -table.zebra-striped th.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);-khtml-opacity:0.6;-moz-opacity:0.6;opacity:0.6;} -table.zebra-striped th.blue{color:#049cdb;border-bottom-color:#049cdb;} -table.zebra-striped th.headerSortUp.blue,table.zebra-striped th.headerSortDown.blue{background-color:#ade6fe;} -table.zebra-striped th.green{color:#46a546;border-bottom-color:#46a546;} -table.zebra-striped th.headerSortUp.green,table.zebra-striped th.headerSortDown.green{background-color:#cdeacd;} -table.zebra-striped th.red{color:#9d261d;border-bottom-color:#9d261d;} -table.zebra-striped th.headerSortUp.red,table.zebra-striped th.headerSortDown.red{background-color:#f4c8c5;} -table.zebra-striped th.yellow{color:#ffc40d;border-bottom-color:#ffc40d;} -table.zebra-striped th.headerSortUp.yellow,table.zebra-striped th.headerSortDown.yellow{background-color:#fff6d9;} -table.zebra-striped th.orange{color:#f89406;border-bottom-color:#f89406;} -table.zebra-striped th.headerSortUp.orange,table.zebra-striped th.headerSortDown.orange{background-color:#fee9cc;} -table.zebra-striped th.purple{color:#7a43b6;border-bottom-color:#7a43b6;} -table.zebra-striped th.headerSortUp.purple,table.zebra-striped th.headerSortDown.purple{background-color:#e2d5f0;} +.zebra-striped tbody tr:nth-child(odd) td{background-color:#f9f9f9;} +.zebra-striped tbody tr:hover td{background-color:#f5f5f5;} +.zebra-striped .header{cursor:pointer;}.zebra-striped .header:after{content:"";float:right;margin-top:7px;border-width:0 4px 4px;border-style:solid;border-color:#000 transparent;visibility:hidden;} +.zebra-striped .headerSortUp,.zebra-striped .headerSortDown{background-color:rgba(141, 192, 219, 0.25);text-shadow:0 1px 1px rgba(255, 255, 255, 0.75);-webkit-border-radius:3px 3px 0 0;-moz-border-radius:3px 3px 0 0;border-radius:3px 3px 0 0;} +.zebra-striped .header:hover:after{visibility:visible;} +.zebra-striped .headerSortDown:after,.zebra-striped .headerSortDown:hover:after{visibility:visible;filter:alpha(opacity=60);-khtml-opacity:0.6;-moz-opacity:0.6;opacity:0.6;} +.zebra-striped .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);-khtml-opacity:0.6;-moz-opacity:0.6;opacity:0.6;} +table .blue{color:#049cdb;border-bottom-color:#049cdb;} +table .headerSortUp.blue,table .headerSortDown.blue{background-color:#ade6fe;} +table .green{color:#46a546;border-bottom-color:#46a546;} +table .headerSortUp.green,table .headerSortDown.green{background-color:#cdeacd;} +table .red{color:#9d261d;border-bottom-color:#9d261d;} +table .headerSortUp.red,table .headerSortDown.red{background-color:#f4c8c5;} +table .yellow{color:#ffc40d;border-bottom-color:#ffc40d;} +table .headerSortUp.yellow,table .headerSortDown.yellow{background-color:#fff6d9;} +table .orange{color:#f89406;border-bottom-color:#f89406;} +table .headerSortUp.orange,table .headerSortDown.orange{background-color:#fee9cc;} +table .purple{color:#7a43b6;border-bottom-color:#7a43b6;} +table .headerSortUp.purple,table .headerSortDown.purple{background-color:#e2d5f0;} div.topbar{background-color:#222222;background-repeat:repeat-x;background-image:-khtml-gradient(linear, left top, left bottom, from(#333333), to(#222222));background-image:-moz-linear-gradient(#333333, #222222);background-image:-ms-linear-gradient(#333333, #222222);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #333333), color-stop(100%, #222222));background-image:-webkit-linear-gradient(#333333, #222222);background-image:-o-linear-gradient(#333333, #222222);background-image:linear-gradient(#333333, #222222);height:40px;position:fixed;top:0;left:0;right:0;z-index:10000;overflow:visible;-webkit-box-shadow:0 1px 3px rgba(0, 0, 0, 0.25),inset 0 -1px 0 rgba(0, 0, 0, 0.1);-moz-box-shadow:0 1px 3px rgba(0, 0, 0, 0.25),inset 0 -1px 0 rgba(0, 0, 0, 0.1);box-shadow:0 1px 3px rgba(0, 0, 0, 0.25),inset 0 -1px 0 rgba(0, 0, 0, 0.1);}div.topbar a{color:#bfbfbf;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);} div.topbar a:hover,div.topbar ul li.active a{background-color:#333;background-color:rgba(255, 255, 255, 0.05);color:#ffffff;text-decoration:none;} div.topbar h3 a{float:left;display:block;padding:8px 20px 12px;margin-left:-20px;color:#ffffff;font-size:20px;font-weight:200;line-height:1;} @@ -174,44 +173,44 @@ div.topbar ul li ul li.divider{height:1px;overflow:hidden;background:rgba(0, 0, div.topbar ul li ul li span{clear:both;display:block;background:rgba(0, 0, 0, 0.2);padding:6px 15px;cursor:default;color:#808080;border-top:1px solid rgba(0, 0, 0, 0.2);} .hero-unit{background-color:#f5f5f5;margin-bottom:30px;padding:60px;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;}.hero-unit h1{margin-bottom:0;font-size:60px;line-height:1;letter-spacing:-1px;} .hero-unit p{font-size:18px;font-weight:200;line-height:27px;} -div.page-header{margin-bottom:17px;border-bottom:1px solid #ddd;-webkit-box-shadow:0 1px 0 rgba(255, 255, 255, 0.5);-moz-box-shadow:0 1px 0 rgba(255, 255, 255, 0.5);box-shadow:0 1px 0 rgba(255, 255, 255, 0.5);}div.page-header h1{margin-bottom:8px;} -div.alert-message{background-color:#e6e6e6;margin-bottom:18px;padding:8px 15px;color:#fff;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.3);border-bottom:1px solid rgba(0, 0, 0, 0.3);-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;}div.alert-message p{color:#fff;margin-bottom:0;}div.alert-message p+p{margin-top:5px;} -div.alert-message.error{background-color:#d83a2e;background-repeat:repeat-x;background-image:-khtml-gradient(linear, left top, left bottom, from(#e4776f), to(#d83a2e));background-image:-moz-linear-gradient(#e4776f, #d83a2e);background-image:-ms-linear-gradient(#e4776f, #d83a2e);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #e4776f), color-stop(100%, #d83a2e));background-image:-webkit-linear-gradient(#e4776f, #d83a2e);background-image:-o-linear-gradient(#e4776f, #d83a2e);background-image:linear-gradient(#e4776f, #d83a2e);border-bottom-color:#b32b21;} -div.alert-message.warning{background-color:#ffd040;background-repeat:repeat-x;background-image:-khtml-gradient(linear, left top, left bottom, from(#ffe38d), to(#ffd040));background-image:-moz-linear-gradient(#ffe38d, #ffd040);background-image:-ms-linear-gradient(#ffe38d, #ffd040);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #ffe38d), color-stop(100%, #ffd040));background-image:-webkit-linear-gradient(#ffe38d, #ffd040);background-image:-o-linear-gradient(#ffe38d, #ffd040);background-image:linear-gradient(#ffe38d, #ffd040);border-bottom-color:#ffc40d;} -div.alert-message.success{background-color:#62bc62;background-repeat:repeat-x;background-image:-khtml-gradient(linear, left top, left bottom, from(#97d397), to(#62bc62));background-image:-moz-linear-gradient(#97d397, #62bc62);background-image:-ms-linear-gradient(#97d397, #62bc62);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #97d397), color-stop(100%, #62bc62));background-image:-webkit-linear-gradient(#97d397, #62bc62);background-image:-o-linear-gradient(#97d397, #62bc62);background-image:linear-gradient(#97d397, #62bc62);border-bottom-color:#46a546;} -div.alert-message.info{background-color:#04aef4;background-repeat:repeat-x;background-image:-khtml-gradient(linear, left top, left bottom, from(#62cffc), to(#04aef4));background-image:-moz-linear-gradient(#62cffc, #04aef4);background-image:-ms-linear-gradient(#62cffc, #04aef4);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #62cffc), color-stop(100%, #04aef4));background-image:-webkit-linear-gradient(#62cffc, #04aef4);background-image:-o-linear-gradient(#62cffc, #04aef4);background-image:linear-gradient(#62cffc, #04aef4);border-bottom-color:#049cdb;} -div.alert-message .close{float:right;margin-top:-2px;color:#000;font-size:20px;font-weight:bold;text-shadow:0 1px 0 #ffffff;filter:alpha(opacity=20);-khtml-opacity:0.2;-moz-opacity:0.2;opacity:0.2;}div.alert-message .close:hover{text-decoration:none;filter:alpha(opacity=40);-khtml-opacity:0.4;-moz-opacity:0.4;opacity:0.4;} -div.block-message{margin-bottom:18px;padding:14px;color:#404040;color:rgba(0, 0, 0, 0.8);text-shadow:0 1px 0 rgba(255, 255, 255, 0.25);-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;}div.block-message p{color:#404040;color:rgba(0, 0, 0, 0.8);margin-right:30px;margin-bottom:0;} -div.block-message ul{margin-bottom:0;} -div.block-message strong{display:block;} -div.block-message.error{background:#f8dcda;border:1px solid #f4c8c5;} -div.block-message.warning{background:#fff0c0;border:1px solid #ffe38d;} -div.block-message.success{background:#dff1df;border:1px solid #bbe2bb;} -div.block-message.info{background:#c7eefe;border:1px solid #ade6fe;} -ul.tabs,ul.pills{margin:0 0 20px;padding:0;zoom:1;}ul.tabs:before,ul.pills:before,ul.tabs:after,ul.pills:after{display:table;content:"";} -ul.tabs:after,ul.pills:after{clear:both;} -ul.tabs li,ul.pills li{display:inline;}ul.tabs li a,ul.pills li a{float:left;width:auto;} -ul.tabs{width:100%;border-bottom:1px solid #bfbfbf;}ul.tabs li a{margin-bottom:-1px;margin-right:2px;padding:0 15px;line-height:35px;-webkit-border-radius:3px 3px 0 0;-moz-border-radius:3px 3px 0 0;border-radius:3px 3px 0 0;}ul.tabs li a:hover{background-color:#e6e6e6;border-bottom:1px solid #bfbfbf;} -ul.tabs li.active a{background-color:#fff;padding:0 14px;border:1px solid #ccc;border-bottom:0;color:#808080;} -ul.pills li a{margin:5px 3px 5px 0;padding:0 15px;text-shadow:0 1px 1px #fff;line-height:30px;-webkit-border-radius:15px;-moz-border-radius:15px;border-radius:15px;}ul.pills li a:hover{background:#0050a3;color:#fff;text-decoration:none;text-shadow:0 1px 1px rgba(0, 0, 0, 0.25);} -ul.pills li.active a{background:#0069d6;color:#fff;text-shadow:0 1px 1px rgba(0, 0, 0, 0.25);} -div.pagination{height:36px;margin:18px 0;}div.pagination ul{float:left;margin:0;border:1px solid rgba(0, 0, 0, 0.15);-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;-webkit-box-shadow:0 1px 2px rgba(0, 0, 0, 0.075);-moz-box-shadow:0 1px 2px rgba(0, 0, 0, 0.075);box-shadow:0 1px 2px rgba(0, 0, 0, 0.075);}div.pagination ul li{display:inline;}div.pagination ul li a{float:left;padding:0 14px;line-height:34px;border-right:1px solid rgba(0, 0, 0, 0.15);text-decoration:none;} -div.pagination ul li a:hover,div.pagination ul li.active a{background-color:#c7eefe;} -div.pagination ul li.disabled a,div.pagination ul li.disabled a:hover{background-color:none;color:#bfbfbf;} -div.pagination ul li.next a,div.pagination ul li:last-child a{border:0;} +.page-header{margin-bottom:17px;border-bottom:1px solid #ddd;-webkit-box-shadow:0 1px 0 rgba(255, 255, 255, 0.5);-moz-box-shadow:0 1px 0 rgba(255, 255, 255, 0.5);box-shadow:0 1px 0 rgba(255, 255, 255, 0.5);}.page-header h1{margin-bottom:8px;} +.alert-message{background-color:#e6e6e6;margin-bottom:18px;padding:8px 15px;color:#fff;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.3);border-bottom:1px solid rgba(0, 0, 0, 0.3);-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;}.alert-message p{color:#fff;margin-bottom:0;}.alert-message p+p{margin-top:5px;} +.alert-message.error{background-color:#d83a2e;background-repeat:repeat-x;background-image:-khtml-gradient(linear, left top, left bottom, from(#e4776f), to(#d83a2e));background-image:-moz-linear-gradient(#e4776f, #d83a2e);background-image:-ms-linear-gradient(#e4776f, #d83a2e);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #e4776f), color-stop(100%, #d83a2e));background-image:-webkit-linear-gradient(#e4776f, #d83a2e);background-image:-o-linear-gradient(#e4776f, #d83a2e);background-image:linear-gradient(#e4776f, #d83a2e);border-bottom-color:#b32b21;} +.alert-message.warning{background-color:#ffd040;background-repeat:repeat-x;background-image:-khtml-gradient(linear, left top, left bottom, from(#ffe38d), to(#ffd040));background-image:-moz-linear-gradient(#ffe38d, #ffd040);background-image:-ms-linear-gradient(#ffe38d, #ffd040);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #ffe38d), color-stop(100%, #ffd040));background-image:-webkit-linear-gradient(#ffe38d, #ffd040);background-image:-o-linear-gradient(#ffe38d, #ffd040);background-image:linear-gradient(#ffe38d, #ffd040);border-bottom-color:#ffc40d;} +.alert-message.success{background-color:#62bc62;background-repeat:repeat-x;background-image:-khtml-gradient(linear, left top, left bottom, from(#97d397), to(#62bc62));background-image:-moz-linear-gradient(#97d397, #62bc62);background-image:-ms-linear-gradient(#97d397, #62bc62);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #97d397), color-stop(100%, #62bc62));background-image:-webkit-linear-gradient(#97d397, #62bc62);background-image:-o-linear-gradient(#97d397, #62bc62);background-image:linear-gradient(#97d397, #62bc62);border-bottom-color:#46a546;} +.alert-message.info{background-color:#04aef4;background-repeat:repeat-x;background-image:-khtml-gradient(linear, left top, left bottom, from(#62cffc), to(#04aef4));background-image:-moz-linear-gradient(#62cffc, #04aef4);background-image:-ms-linear-gradient(#62cffc, #04aef4);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #62cffc), color-stop(100%, #04aef4));background-image:-webkit-linear-gradient(#62cffc, #04aef4);background-image:-o-linear-gradient(#62cffc, #04aef4);background-image:linear-gradient(#62cffc, #04aef4);border-bottom-color:#049cdb;} +.alert-message .close{float:right;margin-top:-2px;color:#000;font-size:20px;font-weight:bold;text-shadow:0 1px 0 #ffffff;filter:alpha(opacity=20);-khtml-opacity:0.2;-moz-opacity:0.2;opacity:0.2;}.alert-message .close:hover{text-decoration:none;filter:alpha(opacity=40);-khtml-opacity:0.4;-moz-opacity:0.4;opacity:0.4;} +.block-message{margin-bottom:18px;padding:14px;color:#404040;color:rgba(0, 0, 0, 0.8);text-shadow:0 1px 0 rgba(255, 255, 255, 0.25);-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;}.block-message p{color:#404040;color:rgba(0, 0, 0, 0.8);margin-right:30px;margin-bottom:0;} +.block-message ul{margin-bottom:0;} +.block-message strong{display:block;} +.block-message.error{background:#f8dcda;border:1px solid #f4c8c5;} +.block-message.warning{background:#fff0c0;border:1px solid #ffe38d;} +.block-message.success{background:#dff1df;border:1px solid #bbe2bb;} +.block-message.info{background:#c7eefe;border:1px solid #ade6fe;} +.tabs,.pills{margin:0 0 20px;padding:0;zoom:1;}.tabs:before,.pills:before,.tabs:after,.pills:after{display:table;content:"";} +.tabs:after,.pills:after{clear:both;} +.tabs li,.pills li{display:inline;}.tabs li a,.pills li a{float:left;width:auto;} +.tabs{width:100%;border-bottom:1px solid #bfbfbf;}.tabs li a{margin-bottom:-1px;margin-right:2px;padding:0 15px;line-height:35px;-webkit-border-radius:3px 3px 0 0;-moz-border-radius:3px 3px 0 0;border-radius:3px 3px 0 0;}.tabs li a:hover{background-color:#e6e6e6;border-bottom:1px solid #bfbfbf;} +.tabs li.active a{background-color:#fff;padding:0 14px;border:1px solid #ccc;border-bottom:0;color:#808080;} +.pills li a{margin:5px 3px 5px 0;padding:0 15px;text-shadow:0 1px 1px #fff;line-height:30px;-webkit-border-radius:15px;-moz-border-radius:15px;border-radius:15px;}.pills li a:hover{background:#0050a3;color:#fff;text-decoration:none;text-shadow:0 1px 1px rgba(0, 0, 0, 0.25);} +.pills li.active a{background:#0069d6;color:#fff;text-shadow:0 1px 1px rgba(0, 0, 0, 0.25);} +.pagination{height:36px;margin:18px 0;}.pagination ul{float:left;margin:0;border:1px solid #ddd;border:1px solid rgba(0, 0, 0, 0.15);-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;-webkit-box-shadow:0 1px 2px rgba(0, 0, 0, 0.075);-moz-box-shadow:0 1px 2px rgba(0, 0, 0, 0.075);box-shadow:0 1px 2px rgba(0, 0, 0, 0.075);}.pagination ul li{display:inline;}.pagination ul li a{float:left;padding:0 14px;line-height:34px;border-right:1px solid #ddd;border-right:1px solid rgba(0, 0, 0, 0.15);text-decoration:none;} +.pagination ul li a:hover,.pagination ul li.active a{background-color:#c7eefe;} +.pagination ul li.disabled a,.pagination ul li.disabled a:hover{background-color:none;color:#bfbfbf;} +.pagination ul li.next a,.pagination ul li:last-child a{border:0;} .well{background-color:#f5f5f5;margin-bottom:20px;padding:19px;min-height:20px;border:1px solid #eee;border:1px solid rgba(0, 0, 0, 0.05);-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-webkit-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.05);-moz-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.05);box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.05);} -div.modal-backdrop{background-color:rgba(0, 0, 0, 0.5);position:fixed;top:0;left:0;right:0;bottom:0;z-index:1000;} -div.modal{position:fixed;top:50%;left:50%;z-index:2000;width:560px;margin:-280px 0 0 -250px;background-color:#ffffff;border:1px solid rgba(0, 0, 0, 0.3);-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;-webkit-box-shadow:0 3px 7px rgba(0, 0, 0, 0.3);-moz-box-shadow:0 3px 7px rgba(0, 0, 0, 0.3);box-shadow:0 3px 7px rgba(0, 0, 0, 0.3);-webkit-background-clip:padding;-moz-background-clip:padding;background-clip:padding;}div.modal .modal-header{border-bottom:1px solid #eee;padding:5px 20px;}div.modal .modal-header a.close{position:absolute;right:10px;top:10px;color:#999;line-height:10px;font-size:18px;} -div.modal .modal-body{padding:20px;} -div.modal .modal-footer{background-color:#f5f5f5;padding:14px 20px 15px;border-top:1px solid #ddd;-webkit-border-radius:0 0 6px 6px;-moz-border-radius:0 0 6px 6px;border-radius:0 0 6px 6px;-webkit-box-shadow:inset 0 1px 0 #ffffff;-moz-box-shadow:inset 0 1px 0 #ffffff;box-shadow:inset 0 1px 0 #ffffff;zoom:1;}div.modal .modal-footer:before,div.modal .modal-footer:after{display:table;content:"";} -div.modal .modal-footer:after{clear:both;} -div.modal .modal-footer .btn{float:right;margin-left:10px;} -div.twipsy{display:block;position:absolute;visibility:visible;padding:5px;font-size:11px;z-index:1000;filter:alpha(opacity=80);-khtml-opacity:0.8;-moz-opacity:0.8;opacity:0.8;}div.twipsy.above .twipsy-arrow{bottom:0;left:50%;margin-left:-5px;border-left:5px solid transparent;border-right:5px solid transparent;border-top:5px solid #000000;} -div.twipsy.left .twipsy-arrow{top:50%;right:0;margin-top:-5px;border-top:5px solid transparent;border-bottom:5px solid transparent;border-left:5px solid #000000;} -div.twipsy.below .twipsy-arrow{top:0;left:50%;margin-left:-5px;border-left:5px solid transparent;border-right:5px solid transparent;border-bottom:5px solid #000000;} -div.twipsy.right .twipsy-arrow{top:50%;left:0;margin-top:-5px;border-top:5px solid transparent;border-bottom:5px solid transparent;border-right:5px solid #000000;} -div.twipsy .twipsy-inner{padding:3px 8px;background-color:#000;color:white;text-align:center;max-width:200px;text-decoration:none;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;} -div.twipsy .twipsy-arrow{position:absolute;width:0;height:0;} +.modal-backdrop{background-color:rgba(0, 0, 0, 0.5);position:fixed;top:0;left:0;right:0;bottom:0;z-index:1000;} +.modal{position:fixed;top:50%;left:50%;z-index:2000;width:560px;margin:-280px 0 0 -250px;background-color:#ffffff;border:1px solid rgba(0, 0, 0, 0.3);-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;-webkit-box-shadow:0 3px 7px rgba(0, 0, 0, 0.3);-moz-box-shadow:0 3px 7px rgba(0, 0, 0, 0.3);box-shadow:0 3px 7px rgba(0, 0, 0, 0.3);-webkit-background-clip:padding;-moz-background-clip:padding;background-clip:padding;}.modal .modal-header{border-bottom:1px solid #eee;padding:5px 20px;}.modal .modal-header a.close{position:absolute;right:10px;top:10px;color:#999;line-height:10px;font-size:18px;} +.modal .modal-body{padding:20px;} +.modal .modal-footer{background-color:#f5f5f5;padding:14px 20px 15px;border-top:1px solid #ddd;-webkit-border-radius:0 0 6px 6px;-moz-border-radius:0 0 6px 6px;border-radius:0 0 6px 6px;-webkit-box-shadow:inset 0 1px 0 #ffffff;-moz-box-shadow:inset 0 1px 0 #ffffff;box-shadow:inset 0 1px 0 #ffffff;zoom:1;}.modal .modal-footer:before,.modal .modal-footer:after{display:table;content:"";} +.modal .modal-footer:after{clear:both;} +.modal .modal-footer .btn{float:right;margin-left:10px;} +.twipsy{display:block;position:absolute;visibility:visible;padding:5px;font-size:11px;z-index:1000;filter:alpha(opacity=80);-khtml-opacity:0.8;-moz-opacity:0.8;opacity:0.8;}.twipsy.above .twipsy-arrow{bottom:0;left:50%;margin-left:-5px;border-left:5px solid transparent;border-right:5px solid transparent;border-top:5px solid #000000;} +.twipsy.left .twipsy-arrow{top:50%;right:0;margin-top:-5px;border-top:5px solid transparent;border-bottom:5px solid transparent;border-left:5px solid #000000;} +.twipsy.below .twipsy-arrow{top:0;left:50%;margin-left:-5px;border-left:5px solid transparent;border-right:5px solid transparent;border-bottom:5px solid #000000;} +.twipsy.right .twipsy-arrow{top:50%;left:0;margin-top:-5px;border-top:5px solid transparent;border-bottom:5px solid transparent;border-right:5px solid #000000;} +.twipsy .twipsy-inner{padding:3px 8px;background-color:#000;color:white;text-align:center;max-width:200px;text-decoration:none;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;} +.twipsy .twipsy-arrow{position:absolute;width:0;height:0;} .popover{position:absolute;top:0;left:0;z-index:1000;padding:5px;display:none;}.popover.above .arrow{bottom:0;left:50%;margin-left:-5px;border-left:5px solid transparent;border-right:5px solid transparent;border-top:5px solid #000000;} .popover.right .arrow{top:50%;left:0;margin-top:-5px;border-top:5px solid transparent;border-bottom:5px solid transparent;border-right:5px solid #000000;} .popover.below .arrow{top:0;left:50%;margin-left:-5px;border-left:5px solid transparent;border-right:5px solid transparent;border-bottom:5px solid #000000;} diff --git a/lib/tables.less b/lib/tables.less index 4c65141a3e..d1af37de81 100644 --- a/lib/tables.less +++ b/lib/tables.less @@ -11,12 +11,12 @@ table { width: 100%; margin-bottom: @baseline; padding: 0; - text-align: left; border-collapse: separate; font-size: 13px; th, td { padding: 10px 10px 9px; line-height: @baseline * .75; + text-align: left; vertical-align: middle; border-bottom: 1px solid #ddd; } @@ -32,7 +32,7 @@ table { // -------------- // Default zebra-stripe styles (alternating gray and transparent backgrounds) -table.zebra-striped { +.zebra-striped { tbody { tr:nth-child(odd) td { background-color: #f9f9f9; @@ -43,7 +43,7 @@ table.zebra-striped { } // Tablesorting styles w/ jQuery plugin - th.header { + .header { cursor: pointer; &:after { content: ""; @@ -55,36 +55,29 @@ table.zebra-striped { visibility: hidden; } } - // Style the sorted column headers (THs) - th.headerSortUp, - th.headerSortDown { + .headerSortUp, + .headerSortDown { background-color: rgba(141,192,219,.25); text-shadow: 0 1px 1px rgba(255,255,255,.75); .border-radius(3px 3px 0 0); } - // Style the ascending (reverse alphabetical) column header - th.header:hover { + .header:hover { &:after { visibility:visible; } } - th.actions:hover { - background-image: none; - } - // Style the descending (alphabetical) column header - th.headerSortDown, - th.headerSortDown:hover { + .headerSortDown, + .headerSortDown:hover { &:after { visibility:visible; .opacity(60); } } - // Style the ascending (reverse alphabetical) column header - th.headerSortUp { + .headerSortUp { &:after { border-bottom: none; border-left: 4px solid transparent; @@ -95,58 +88,61 @@ table.zebra-striped { .opacity(60); } } +} +table { // Blue Table Headings - th.blue { + .blue { color: @blue; border-bottom-color: @blue; } - th.headerSortUp.blue, th.headerSortDown.blue { + .headerSortUp.blue, + .headerSortDown.blue { background-color: lighten(@blue, 40%); } - // Green Table Headings - th.green { + .green { color: @green; border-bottom-color: @green; } - th.headerSortUp.green, th.headerSortDown.green { // backround color is 20% of border color + .headerSortUp.green, + .headerSortDown.green { background-color: lighten(@green, 40%); } - // Red Table Headings - th.red { + .red { color: @red; border-bottom-color: @red; } - th.headerSortUp.red, th.headerSortDown.red { + .headerSortUp.red, + .headerSortDown.red { background-color: lighten(@red, 50%); } - // Yellow Table Headings - th.yellow { + .yellow { color: @yellow; border-bottom-color: @yellow; } - th.headerSortUp.yellow, th.headerSortDown.yellow { + .headerSortUp.yellow, + .headerSortDown.yellow { background-color: lighten(@yellow, 40%); } - // Orange Table Headings - th.orange { + .orange { color: @orange; border-bottom-color: @orange; } - th.headerSortUp.orange, th.headerSortDown.orange { + .headerSortUp.orange, + .headerSortDown.orange { background-color: lighten(@orange, 40%); } - // Purple Table Headings - th.purple { + .purple { color: @purple; border-bottom-color: @purple; } - th.headerSortUp.purple, th.headerSortDown.purple { + .headerSortUp.purple, + .headerSortDown.purple { background-color: lighten(@purple, 40%); } -} +} \ No newline at end of file From 12efeccdf74b61b61b8d784b55fa857eb409b8b9 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 21 Aug 2011 20:12:18 -0700 Subject: [PATCH 34/38] tweak pagination styles to include better border and box shadow --- bootstrap-1.0.0.css | 21 +++++++++++---------- bootstrap-1.0.0.min.css | 6 +++--- lib/patterns.less | 7 ++++--- 3 files changed, 18 insertions(+), 16 deletions(-) diff --git a/bootstrap-1.0.0.css b/bootstrap-1.0.0.css index 27890cf205..a20a193252 100644 --- a/bootstrap-1.0.0.css +++ b/bootstrap-1.0.0.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: Sun Aug 21 20:06:59 PDT 2011 + * Date: Sun Aug 21 20:11:55 PDT 2011 */ /* Reset.less * Props to Eric Meyer (meyerweb.com) for his CSS reset file. We're using an adapted version here that cuts out some of the reset HTML elements we will never need here (i.e., dfn, samp, etc). @@ -1546,9 +1546,9 @@ div.topbar ul li ul li span { -webkit-border-radius: 3px; -moz-border-radius: 3px; border-radius: 3px; - -webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.075); - -moz-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.075); - box-shadow: 0 1px 2px rgba(0, 0, 0, 0.075); + -webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05); + -moz-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05); + box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05); } .pagination ul li { display: inline; @@ -1602,6 +1602,7 @@ div.topbar ul li ul li span { width: 560px; margin: -280px 0 0 -250px; background-color: #ffffff; + border: 1px solid #999; border: 1px solid rgba(0, 0, 0, 0.3); -webkit-border-radius: 6px; -moz-border-radius: 6px; @@ -1609,9 +1610,9 @@ div.topbar ul li ul li span { -webkit-box-shadow: 0 3px 7px rgba(0, 0, 0, 0.3); -moz-box-shadow: 0 3px 7px rgba(0, 0, 0, 0.3); box-shadow: 0 3px 7px rgba(0, 0, 0, 0.3); - -webkit-background-clip: padding; - -moz-background-clip: padding; - background-clip: padding; + -webkit-background-clip: padding-box; + -moz-background-clip: padding-box; + background-clip: padding-box; } .modal .modal-header { border-bottom: 1px solid #eee; @@ -1783,9 +1784,9 @@ div.topbar ul li ul li span { -webkit-border-radius: 0 0 3px 3px; -moz-border-radius: 0 0 3px 3px; border-radius: 0 0 3px 3px; - -webkit-background-clip: padding; - -moz-background-clip: padding; - background-clip: padding; + -webkit-background-clip: padding-box; + -moz-background-clip: padding-box; + background-clip: padding-box; } .popover .content p, .popover .content ul, .popover .content ol { margin-bottom: 0; diff --git a/bootstrap-1.0.0.min.css b/bootstrap-1.0.0.min.css index 8dcabc6551..97a1aa7f68 100644 --- a/bootstrap-1.0.0.min.css +++ b/bootstrap-1.0.0.min.css @@ -194,13 +194,13 @@ div.topbar ul li ul li span{clear:both;display:block;background:rgba(0, 0, 0, 0. .tabs li.active a{background-color:#fff;padding:0 14px;border:1px solid #ccc;border-bottom:0;color:#808080;} .pills li a{margin:5px 3px 5px 0;padding:0 15px;text-shadow:0 1px 1px #fff;line-height:30px;-webkit-border-radius:15px;-moz-border-radius:15px;border-radius:15px;}.pills li a:hover{background:#0050a3;color:#fff;text-decoration:none;text-shadow:0 1px 1px rgba(0, 0, 0, 0.25);} .pills li.active a{background:#0069d6;color:#fff;text-shadow:0 1px 1px rgba(0, 0, 0, 0.25);} -.pagination{height:36px;margin:18px 0;}.pagination ul{float:left;margin:0;border:1px solid #ddd;border:1px solid rgba(0, 0, 0, 0.15);-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;-webkit-box-shadow:0 1px 2px rgba(0, 0, 0, 0.075);-moz-box-shadow:0 1px 2px rgba(0, 0, 0, 0.075);box-shadow:0 1px 2px rgba(0, 0, 0, 0.075);}.pagination ul li{display:inline;}.pagination ul li a{float:left;padding:0 14px;line-height:34px;border-right:1px solid #ddd;border-right:1px solid rgba(0, 0, 0, 0.15);text-decoration:none;} +.pagination{height:36px;margin:18px 0;}.pagination ul{float:left;margin:0;border:1px solid #ddd;border:1px solid rgba(0, 0, 0, 0.15);-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;-webkit-box-shadow:0 1px 2px rgba(0, 0, 0, 0.05);-moz-box-shadow:0 1px 2px rgba(0, 0, 0, 0.05);box-shadow:0 1px 2px rgba(0, 0, 0, 0.05);}.pagination ul li{display:inline;}.pagination ul li a{float:left;padding:0 14px;line-height:34px;border-right:1px solid #ddd;border-right:1px solid rgba(0, 0, 0, 0.15);text-decoration:none;} .pagination ul li a:hover,.pagination ul li.active a{background-color:#c7eefe;} .pagination ul li.disabled a,.pagination ul li.disabled a:hover{background-color:none;color:#bfbfbf;} .pagination ul li.next a,.pagination ul li:last-child a{border:0;} .well{background-color:#f5f5f5;margin-bottom:20px;padding:19px;min-height:20px;border:1px solid #eee;border:1px solid rgba(0, 0, 0, 0.05);-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-webkit-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.05);-moz-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.05);box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.05);} .modal-backdrop{background-color:rgba(0, 0, 0, 0.5);position:fixed;top:0;left:0;right:0;bottom:0;z-index:1000;} -.modal{position:fixed;top:50%;left:50%;z-index:2000;width:560px;margin:-280px 0 0 -250px;background-color:#ffffff;border:1px solid rgba(0, 0, 0, 0.3);-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;-webkit-box-shadow:0 3px 7px rgba(0, 0, 0, 0.3);-moz-box-shadow:0 3px 7px rgba(0, 0, 0, 0.3);box-shadow:0 3px 7px rgba(0, 0, 0, 0.3);-webkit-background-clip:padding;-moz-background-clip:padding;background-clip:padding;}.modal .modal-header{border-bottom:1px solid #eee;padding:5px 20px;}.modal .modal-header a.close{position:absolute;right:10px;top:10px;color:#999;line-height:10px;font-size:18px;} +.modal{position:fixed;top:50%;left:50%;z-index:2000;width:560px;margin:-280px 0 0 -250px;background-color:#ffffff;border:1px solid #999;border:1px solid rgba(0, 0, 0, 0.3);-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;-webkit-box-shadow:0 3px 7px rgba(0, 0, 0, 0.3);-moz-box-shadow:0 3px 7px rgba(0, 0, 0, 0.3);box-shadow:0 3px 7px rgba(0, 0, 0, 0.3);-webkit-background-clip:padding-box;-moz-background-clip:padding-box;background-clip:padding-box;}.modal .modal-header{border-bottom:1px solid #eee;padding:5px 20px;}.modal .modal-header a.close{position:absolute;right:10px;top:10px;color:#999;line-height:10px;font-size:18px;} .modal .modal-body{padding:20px;} .modal .modal-footer{background-color:#f5f5f5;padding:14px 20px 15px;border-top:1px solid #ddd;-webkit-border-radius:0 0 6px 6px;-moz-border-radius:0 0 6px 6px;border-radius:0 0 6px 6px;-webkit-box-shadow:inset 0 1px 0 #ffffff;-moz-box-shadow:inset 0 1px 0 #ffffff;box-shadow:inset 0 1px 0 #ffffff;zoom:1;}.modal .modal-footer:before,.modal .modal-footer:after{display:table;content:"";} .modal .modal-footer:after{clear:both;} @@ -218,4 +218,4 @@ div.topbar ul li ul li span{clear:both;display:block;background:rgba(0, 0, 0, 0. .popover .arrow{position:absolute;width:0;height:0;} .popover .inner{background:rgba(0, 0, 0, 0.8);padding:3px;overflow:hidden;width:280px;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;-webkit-box-shadow:0 3px 7px rgba(0, 0, 0, 0.3);-moz-box-shadow:0 3px 7px rgba(0, 0, 0, 0.3);box-shadow:0 3px 7px rgba(0, 0, 0, 0.3);} .popover .title{background:#f5f5f5;padding:9px 15px;line-height:1;-webkit-border-radius:3px 3px 0 0;-moz-border-radius:3px 3px 0 0;border-radius:3px 3px 0 0;border-bottom:1px solid #eee;} -.popover .content{background-color:#ffffff;padding:14px;-webkit-border-radius:0 0 3px 3px;-moz-border-radius:0 0 3px 3px;border-radius:0 0 3px 3px;-webkit-background-clip:padding;-moz-background-clip:padding;background-clip:padding;}.popover .content p,.popover .content ul,.popover .content ol{margin-bottom:0;} +.popover .content{background-color:#ffffff;padding:14px;-webkit-border-radius:0 0 3px 3px;-moz-border-radius:0 0 3px 3px;border-radius:0 0 3px 3px;-webkit-background-clip:padding-box;-moz-background-clip:padding-box;background-clip:padding-box;}.popover .content p,.popover .content ul,.popover .content ol{margin-bottom:0;} diff --git a/lib/patterns.less b/lib/patterns.less index 6506287a2f..fbe3df3eaf 100644 --- a/lib/patterns.less +++ b/lib/patterns.less @@ -441,7 +441,7 @@ div.topbar { border: 1px solid #ddd; border: 1px solid rgba(0,0,0,.15); .border-radius(3px); - .box-shadow(0 1px 2px rgba(0,0,0,.075); + .box-shadow(0 1px 2px rgba(0,0,0,.05); li { display: inline; a { @@ -505,10 +505,11 @@ div.topbar { width: 560px; margin: -280px 0 0 -250px; background-color: @white; + border: 1px solid #999; border: 1px solid rgba(0,0,0,.3); .border-radius(6px); .box-shadow(0 3px 7px rgba(0,0,0,0.3)); - .background-clip(padding); + .background-clip(padding-box); .modal-header { border-bottom: 1px solid #eee; padding: 5px 20px; @@ -647,7 +648,7 @@ div.topbar { background-color: @white; padding: 14px; .border-radius(0 0 3px 3px); - .background-clip(padding); + .background-clip(padding-box); p, ul, ol { margin-bottom: 0; } From 59aea3bafd6bba4928e6ba561f54a11feb596d32 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 21 Aug 2011 20:17:10 -0700 Subject: [PATCH 35/38] give popovers and modals border colors you can see in IE8 and down --- bootstrap-1.0.0.css | 7 ++++--- bootstrap-1.0.0.min.css | 4 ++-- lib/patterns.less | 5 +++-- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/bootstrap-1.0.0.css b/bootstrap-1.0.0.css index a20a193252..c446aef1b6 100644 --- a/bootstrap-1.0.0.css +++ b/bootstrap-1.0.0.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: Sun Aug 21 20:11:55 PDT 2011 + * Date: Sun Aug 21 20:16:18 PDT 2011 */ /* Reset.less * Props to Eric Meyer (meyerweb.com) for his CSS reset file. We're using an adapted version here that cuts out some of the reset HTML elements we will never need here (i.e., dfn, samp, etc). @@ -1758,7 +1758,8 @@ div.topbar ul li ul li span { height: 0; } .popover .inner { - background: rgba(0, 0, 0, 0.8); + background-color: #333; + background-color: rgba(0, 0, 0, 0.8); padding: 3px; overflow: hidden; width: 280px; @@ -1770,7 +1771,7 @@ div.topbar ul li ul li span { box-shadow: 0 3px 7px rgba(0, 0, 0, 0.3); } .popover .title { - background: #f5f5f5; + background-color: #f5f5f5; padding: 9px 15px; line-height: 1; -webkit-border-radius: 3px 3px 0 0; diff --git a/bootstrap-1.0.0.min.css b/bootstrap-1.0.0.min.css index 97a1aa7f68..1fce25139f 100644 --- a/bootstrap-1.0.0.min.css +++ b/bootstrap-1.0.0.min.css @@ -216,6 +216,6 @@ div.topbar ul li ul li span{clear:both;display:block;background:rgba(0, 0, 0, 0. .popover.below .arrow{top:0;left:50%;margin-left:-5px;border-left:5px solid transparent;border-right:5px solid transparent;border-bottom:5px solid #000000;} .popover.left .arrow{top:50%;right:0;margin-top:-5px;border-top:5px solid transparent;border-bottom:5px solid transparent;border-left:5px solid #000000;} .popover .arrow{position:absolute;width:0;height:0;} -.popover .inner{background:rgba(0, 0, 0, 0.8);padding:3px;overflow:hidden;width:280px;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;-webkit-box-shadow:0 3px 7px rgba(0, 0, 0, 0.3);-moz-box-shadow:0 3px 7px rgba(0, 0, 0, 0.3);box-shadow:0 3px 7px rgba(0, 0, 0, 0.3);} -.popover .title{background:#f5f5f5;padding:9px 15px;line-height:1;-webkit-border-radius:3px 3px 0 0;-moz-border-radius:3px 3px 0 0;border-radius:3px 3px 0 0;border-bottom:1px solid #eee;} +.popover .inner{background-color:#333;background-color:rgba(0, 0, 0, 0.8);padding:3px;overflow:hidden;width:280px;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;-webkit-box-shadow:0 3px 7px rgba(0, 0, 0, 0.3);-moz-box-shadow:0 3px 7px rgba(0, 0, 0, 0.3);box-shadow:0 3px 7px rgba(0, 0, 0, 0.3);} +.popover .title{background-color:#f5f5f5;padding:9px 15px;line-height:1;-webkit-border-radius:3px 3px 0 0;-moz-border-radius:3px 3px 0 0;border-radius:3px 3px 0 0;border-bottom:1px solid #eee;} .popover .content{background-color:#ffffff;padding:14px;-webkit-border-radius:0 0 3px 3px;-moz-border-radius:0 0 3px 3px;border-radius:0 0 3px 3px;-webkit-background-clip:padding-box;-moz-background-clip:padding-box;background-clip:padding-box;}.popover .content p,.popover .content ul,.popover .content ol{margin-bottom:0;} diff --git a/lib/patterns.less b/lib/patterns.less index fbe3df3eaf..1f8f289631 100644 --- a/lib/patterns.less +++ b/lib/patterns.less @@ -630,7 +630,8 @@ div.topbar { height: 0; } .inner { - background: rgba(0,0,0,.8); + background-color: #333; + background-color: rgba(0,0,0,.8); padding: 3px; overflow: hidden; width: 280px; @@ -638,7 +639,7 @@ div.topbar { .box-shadow(0 3px 7px rgba(0,0,0,0.3)); } .title { - background: #f5f5f5; + background-color: #f5f5f5; padding: 9px 15px; line-height: 1; .border-radius(3px 3px 0 0); From 842ad01fce710c50dc9c0174ab790f91e66c46b1 Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Sun, 21 Aug 2011 20:21:59 -0700 Subject: [PATCH 36/38] fix color for alert blocks in ie6-7 --- bootstrap-1.0.0.css | 8 +++++++- bootstrap-1.0.0.min.css | 2 +- lib/patterns.less | 2 ++ 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/bootstrap-1.0.0.css b/bootstrap-1.0.0.css index ed1f3a20c7..f3487612ca 100644 --- a/bootstrap-1.0.0.css +++ b/bootstrap-1.0.0.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: Sun Aug 21 19:59:40 PDT 2011 + * Date: Sun Aug 21 20:21:55 PDT 2011 */ /* Reset.less * Props to Eric Meyer (meyerweb.com) for his CSS reset file. We're using an adapted version here that cuts out some of the reset HTML elements we will never need here (i.e., dfn, samp, etc). @@ -1440,6 +1440,9 @@ div.block-message { padding: 14px; color: #404040; color: rgba(0, 0, 0, 0.8); + *color: #404040; + /* IE 6-7 */ + text-shadow: 0 1px 0 rgba(255, 255, 255, 0.25); -webkit-border-radius: 6px; -moz-border-radius: 6px; @@ -1448,6 +1451,9 @@ div.block-message { div.block-message p { color: #404040; color: rgba(0, 0, 0, 0.8); + *color: #404040; + /* IE 6-7 */ + margin-right: 30px; margin-bottom: 0; } diff --git a/bootstrap-1.0.0.min.css b/bootstrap-1.0.0.min.css index 598725b0a8..200b5a4489 100644 --- a/bootstrap-1.0.0.min.css +++ b/bootstrap-1.0.0.min.css @@ -183,7 +183,7 @@ div.alert-message.warning{background-color:#ffd75a;} div.alert-message.success{background-color:#74c474;} div.alert-message.info{background-color:#30c0fb;} div.alert-message a.close{float:right;margin-top:-2px;color:#fff;font-size:20px;font-weight:bold;text-shadow:0 1px 0 rgba(0, 0, 0, 0.5);filter:alpha(opacity=50);-khtml-opacity:0.5;-moz-opacity:0.5;opacity:0.5;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;}div.alert-message a.close:hover{text-decoration:none;filter:alpha(opacity=50);-khtml-opacity:0.5;-moz-opacity:0.5;opacity:0.5;} -div.block-message{margin-bottom:18px;padding:14px;color:#404040;color:rgba(0, 0, 0, 0.8);text-shadow:0 1px 0 rgba(255, 255, 255, 0.25);-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;}div.block-message p{color:#404040;color:rgba(0, 0, 0, 0.8);margin-right:30px;margin-bottom:0;} +div.block-message{margin-bottom:18px;padding:14px;color:#404040;color:rgba(0, 0, 0, 0.8);*color:#404040;text-shadow:0 1px 0 rgba(255, 255, 255, 0.25);-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;}div.block-message p{color:#404040;color:rgba(0, 0, 0, 0.8);*color:#404040;margin-right:30px;margin-bottom:0;} div.block-message ul{margin-bottom:0;} div.block-message strong{display:block;} div.block-message a.close{display:block;color:#404040;color:rgba(0, 0, 0, 0.5);text-shadow:0 1px 1px rgba(255, 255, 255, 0.75);} diff --git a/lib/patterns.less b/lib/patterns.less index e920122407..02aeaf5597 100644 --- a/lib/patterns.less +++ b/lib/patterns.less @@ -338,11 +338,13 @@ div.block-message { padding: 14px; color: @grayDark; color: rgba(0,0,0,.8); + *color: @grayDark; /* IE 6-7 */ text-shadow: 0 1px 0 rgba(255,255,255,.25); .border-radius(6px); p { color: @grayDark; color: rgba(0,0,0,.8); + *color: @grayDark; /* IE 6-7 */ margin-right: 30px; margin-bottom: 0; } From f630615d2603337843a1b8766496cb313e60fb6c Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 21 Aug 2011 20:27:19 -0700 Subject: [PATCH 37/38] remove tags from form selectors --- bootstrap-1.0.0.css | 70 ++++++++++++++++++++--------------------- bootstrap-1.0.0.min.css | 44 +++++++++++++------------- lib/forms.less | 28 ++++++++--------- 3 files changed, 71 insertions(+), 71 deletions(-) diff --git a/bootstrap-1.0.0.css b/bootstrap-1.0.0.css index c446aef1b6..edcb06b88d 100644 --- a/bootstrap-1.0.0.css +++ b/bootstrap-1.0.0.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: Sun Aug 21 20:16:18 PDT 2011 + * Date: Sun Aug 21 20:27:08 PDT 2011 */ /* Reset.less * Props to Eric Meyer (meyerweb.com) for his CSS reset file. We're using an adapted version here that cuts out some of the reset HTML elements we will never need here (i.e., dfn, samp, etc). @@ -651,7 +651,7 @@ form fieldset legend { line-height: 1; color: #404040; } -form div.clearfix { +form .clearfix { margin-bottom: 18px; } form label, @@ -735,7 +735,7 @@ form input[type=text]:focus, form input[type=password]:focus, form textarea:focu -moz-box-shadow: inset 0 1px 3px rgba(0, 0, 0, 0.1), 0 0 8px rgba(82, 168, 236, 0.6); box-shadow: inset 0 1px 3px rgba(0, 0, 0, 0.1), 0 0 8px rgba(82, 168, 236, 0.6); } -form div.error { +form .error { background: #fae5e3; padding: 10px 0; margin: -10px 0 10px; @@ -743,22 +743,22 @@ form div.error { -moz-border-radius: 4px; border-radius: 4px; } -form div.error > label, form div.error span.help-inline, form div.error span.help-block { +form .error > label, form .error span.help-inline, form .error span.help-block { color: #9d261d; } -form div.error input[type=text], form div.error input[type=password], form div.error textarea { +form .error input[type=text], form .error input[type=password], form .error textarea { border-color: #c87872; -webkit-box-shadow: 0 0 3px rgba(171, 41, 32, 0.25); -moz-box-shadow: 0 0 3px rgba(171, 41, 32, 0.25); box-shadow: 0 0 3px rgba(171, 41, 32, 0.25); } -form div.error input[type=text]:focus, form div.error input[type=password]:focus, form div.error textarea:focus { +form .error input[type=text]:focus, form .error input[type=password]:focus, form .error textarea:focus { border-color: #b9554d; -webkit-box-shadow: 0 0 6px rgba(171, 41, 32, 0.5); -moz-box-shadow: 0 0 6px rgba(171, 41, 32, 0.5); box-shadow: 0 0 6px rgba(171, 41, 32, 0.5); } -form div.error div.input-prepend span.add-on, form div.error div.input-append span.add-on { +form .error .input-prepend span.add-on, form .error .input-append span.add-on { background: #f4c8c5; border-color: #c87872; color: #b9554d; @@ -809,7 +809,7 @@ form input[readonly]:focus, form textarea[readonly]:focus, form input.disabled { -moz-box-shadow: none; box-shadow: none; } -div.actions { +.actions { background: #f5f5f5; margin-top: 18px; margin-bottom: 18px; @@ -819,13 +819,13 @@ div.actions { -moz-border-radius: 0 0 3px 3px; border-radius: 0 0 3px 3px; } -div.actions div.secondary-action { +.actions .secondary-action { float: right; } -div.actions div.secondary-action a { +.actions .secondary-action a { line-height: 30px; } -div.actions div.secondary-action a:hover { +.actions .secondary-action a:hover { text-decoration: underline; } .help-inline, .help-block { @@ -840,27 +840,27 @@ div.actions div.secondary-action a:hover { display: block; max-width: 600px; } -div.inline-inputs { +.inline-inputs { color: #808080; } -div.inline-inputs span, div.inline-inputs input[type=text] { +.inline-inputs span, .inline-inputs input[type=text] { display: inline-block; } -div.inline-inputs input.mini { +.inline-inputs input.mini { width: 60px; } -div.inline-inputs input.small { +.inline-inputs input.small { width: 90px; } -div.inline-inputs span { +.inline-inputs span { padding: 0 2px 0 1px; } -div.input-prepend input[type=text], div.input-append input[type=text] { +.input-prepend input[type=text], .input-append input[type=text] { -webkit-border-radius: 0 3px 3px 0; -moz-border-radius: 0 3px 3px 0; border-radius: 0 3px 3px 0; } -div.input-prepend .add-on, div.input-append .add-on { +.input-prepend .add-on, .input-append .add-on { background: #f5f5f5; float: left; display: block; @@ -879,33 +879,33 @@ div.input-prepend .add-on, div.input-append .add-on { -moz-border-radius: 3px 0 0 3px; border-radius: 3px 0 0 3px; } -div.input-prepend .active, div.input-append .active { +.input-prepend .active, .input-append .active { background: #a9dba9; border-color: #46a546; } -div.input-append input[type=text] { +.input-append input[type=text] { float: left; -webkit-border-radius: 3px 0 0 3px; -moz-border-radius: 3px 0 0 3px; border-radius: 3px 0 0 3px; } -div.input-append .add-on { +.input-append .add-on { -webkit-border-radius: 0 3px 3px 0; -moz-border-radius: 0 3px 3px 0; border-radius: 0 3px 3px 0; border-right-width: 1px; border-left-width: 0; } -ul.inputs-list { +.inputs-list { margin: 0 0 5px; width: 100%; } -ul.inputs-list li { +.inputs-list li { display: block; padding: 0; width: 100%; } -ul.inputs-list li label { +.inputs-list li label { display: block; float: none; width: auto; @@ -914,22 +914,22 @@ ul.inputs-list li label { text-align: left; white-space: normal; } -ul.inputs-list li label strong { +.inputs-list li label strong { color: #808080; } -ul.inputs-list li label small { +.inputs-list li label small { font-size: 12px; font-weight: normal; } -ul.inputs-list li ul.inputs-list { +.inputs-list li ul.inputs-list { margin-left: 25px; margin-bottom: 10px; padding-top: 0; } -ul.inputs-list li:first-child { +.inputs-list li:first-child { padding-top: 5px; } -ul.inputs-list input[type=radio], ul.inputs-list input[type=checkbox] { +.inputs-list input[type=radio], .inputs-list input[type=checkbox] { margin-bottom: 0; } form.form-stacked { @@ -950,23 +950,23 @@ form.form-stacked label { line-height: 20px; padding-top: 0; } -form.form-stacked div.clearfix { +form.form-stacked .clearfix { margin-bottom: 9px; } -form.form-stacked div.clearfix div.input { +form.form-stacked .clearfix div.input { margin-left: 0; } -form.form-stacked ul.inputs-list { +form.form-stacked .inputs-list { margin-bottom: 0; } -form.form-stacked ul.inputs-list li { +form.form-stacked .inputs-list li { padding-top: 0; } -form.form-stacked ul.inputs-list li label { +form.form-stacked .inputs-list li label { font-weight: normal; padding-top: 0; } -form.form-stacked div.actions { +form.form-stacked .actions { margin-left: -20px; padding-left: 20px; } diff --git a/bootstrap-1.0.0.min.css b/bootstrap-1.0.0.min.css index 1fce25139f..273fb6eb9e 100644 --- a/bootstrap-1.0.0.min.css +++ b/bootstrap-1.0.0.min.css @@ -83,7 +83,7 @@ code,pre{padding:0 3px 2px;font-family:Monaco, Andale Mono, Courier New, monospa code{background-color:#fee9cc;color:rgba(0, 0, 0, 0.75);padding:1px 3px;} pre{background-color:#f5f5f5;display:block;padding:17px;margin:0 0 18px;line-height:18px;font-size:12px;border:1px solid #ccc;border:1px solid rgba(0, 0, 0, 0.15);-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;white-space:pre-wrap;} form{margin-bottom:18px;}form fieldset{margin-bottom:18px;padding-top:18px;}form fieldset legend{display:block;margin-left:150px;font-size:20px;line-height:1;color:#404040;} -form div.clearfix{margin-bottom:18px;} +form .clearfix{margin-bottom:18px;} form label,form input,form select,form textarea{font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:13px;font-weight:normal;line-height:normal;} form label{padding-top:6px;font-size:13px;line-height:18px;float:left;width:130px;text-align:right;color:#404040;} form div.input{margin-left:150px;} @@ -96,9 +96,9 @@ form :-moz-placeholder{color:#bfbfbf;} form ::-webkit-input-placeholder{color:#bfbfbf;} form input[type=text],form input[type=password],form select,form textarea{-webkit-transition:border linear 0.2s,box-shadow linear 0.2s;-moz-transition:border linear 0.2s,box-shadow linear 0.2s;transition:border linear 0.2s,box-shadow linear 0.2s;-webkit-box-shadow:inset 0 1px 3px rgba(0, 0, 0, 0.1);-moz-box-shadow:inset 0 1px 3px rgba(0, 0, 0, 0.1);box-shadow:inset 0 1px 3px rgba(0, 0, 0, 0.1);} form input[type=text]:focus,form input[type=password]:focus,form textarea:focus{outline:none;border-color:rgba(82, 168, 236, 0.8);-webkit-box-shadow:inset 0 1px 3px rgba(0, 0, 0, 0.1),0 0 8px rgba(82, 168, 236, 0.6);-moz-box-shadow:inset 0 1px 3px rgba(0, 0, 0, 0.1),0 0 8px rgba(82, 168, 236, 0.6);box-shadow:inset 0 1px 3px rgba(0, 0, 0, 0.1),0 0 8px rgba(82, 168, 236, 0.6);} -form div.error{background:#fae5e3;padding:10px 0;margin:-10px 0 10px;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;}form div.error>label,form div.error span.help-inline,form div.error span.help-block{color:#9d261d;} -form div.error input[type=text],form div.error input[type=password],form div.error textarea{border-color:#c87872;-webkit-box-shadow:0 0 3px rgba(171, 41, 32, 0.25);-moz-box-shadow:0 0 3px rgba(171, 41, 32, 0.25);box-shadow:0 0 3px rgba(171, 41, 32, 0.25);}form div.error input[type=text]:focus,form div.error input[type=password]:focus,form div.error textarea:focus{border-color:#b9554d;-webkit-box-shadow:0 0 6px rgba(171, 41, 32, 0.5);-moz-box-shadow:0 0 6px rgba(171, 41, 32, 0.5);box-shadow:0 0 6px rgba(171, 41, 32, 0.5);} -form div.error div.input-prepend span.add-on,form div.error div.input-append span.add-on{background:#f4c8c5;border-color:#c87872;color:#b9554d;} +form .error{background:#fae5e3;padding:10px 0;margin:-10px 0 10px;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;}form .error>label,form .error span.help-inline,form .error span.help-block{color:#9d261d;} +form .error input[type=text],form .error input[type=password],form .error textarea{border-color:#c87872;-webkit-box-shadow:0 0 3px rgba(171, 41, 32, 0.25);-moz-box-shadow:0 0 3px rgba(171, 41, 32, 0.25);box-shadow:0 0 3px rgba(171, 41, 32, 0.25);}form .error input[type=text]:focus,form .error input[type=password]:focus,form .error textarea:focus{border-color:#b9554d;-webkit-box-shadow:0 0 6px rgba(171, 41, 32, 0.5);-moz-box-shadow:0 0 6px rgba(171, 41, 32, 0.5);box-shadow:0 0 6px rgba(171, 41, 32, 0.5);} +form .error .input-prepend span.add-on,form .error .input-append span.add-on{background:#f4c8c5;border-color:#c87872;color:#b9554d;} form .input-mini,form input.mini,form textarea.mini,form select.mini{width:60px;} form .input-small,form input.small,form textarea.small,form select.small{width:90px;} form .input-medium,form input.medium,form textarea.medium,form select.medium{width:150px;} @@ -107,30 +107,30 @@ form .input-xlarge,form input.xlarge,form textarea.xlarge,form select.xlarge{wid form .input-xxlarge,form input.xxlarge,form textarea.xxlarge,form select.xxlarge{width:530px;} form textarea.xxlarge{overflow-y:scroll;} form input[readonly]:focus,form textarea[readonly]:focus,form input.disabled{background:#f5f5f5;border-color:#ddd;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;} -div.actions{background:#f5f5f5;margin-top:18px;margin-bottom:18px;padding:17px 20px 18px 150px;border-top:1px solid #ddd;-webkit-border-radius:0 0 3px 3px;-moz-border-radius:0 0 3px 3px;border-radius:0 0 3px 3px;}div.actions div.secondary-action{float:right;}div.actions div.secondary-action a{line-height:30px;}div.actions div.secondary-action a:hover{text-decoration:underline;} +.actions{background:#f5f5f5;margin-top:18px;margin-bottom:18px;padding:17px 20px 18px 150px;border-top:1px solid #ddd;-webkit-border-radius:0 0 3px 3px;-moz-border-radius:0 0 3px 3px;border-radius:0 0 3px 3px;}.actions .secondary-action{float:right;}.actions .secondary-action a{line-height:30px;}.actions .secondary-action a:hover{text-decoration:underline;} .help-inline,.help-block{font-size:12px;line-height:18px;color:#bfbfbf;} .help-inline{padding-left:5px;} .help-block{display:block;max-width:600px;} -div.inline-inputs{color:#808080;}div.inline-inputs span,div.inline-inputs input[type=text]{display:inline-block;} -div.inline-inputs input.mini{width:60px;} -div.inline-inputs input.small{width:90px;} -div.inline-inputs span{padding:0 2px 0 1px;} -div.input-prepend input[type=text],div.input-append input[type=text]{-webkit-border-radius:0 3px 3px 0;-moz-border-radius:0 3px 3px 0;border-radius:0 3px 3px 0;} -div.input-prepend .add-on,div.input-append .add-on{background:#f5f5f5;float:left;display:block;width:auto;min-width:16px;padding:4px 4px 4px 5px;color:#bfbfbf;font-weight:normal;line-height:18px;height:18px;text-align:center;text-shadow:0 1px 0 #fff;border:1px solid #ccc;border-right-width:0;-webkit-border-radius:3px 0 0 3px;-moz-border-radius:3px 0 0 3px;border-radius:3px 0 0 3px;} -div.input-prepend .active,div.input-append .active{background:#a9dba9;border-color:#46a546;} -div.input-append input[type=text]{float:left;-webkit-border-radius:3px 0 0 3px;-moz-border-radius:3px 0 0 3px;border-radius:3px 0 0 3px;} -div.input-append .add-on{-webkit-border-radius:0 3px 3px 0;-moz-border-radius:0 3px 3px 0;border-radius:0 3px 3px 0;border-right-width:1px;border-left-width:0;} -ul.inputs-list{margin:0 0 5px;width:100%;}ul.inputs-list li{display:block;padding:0;width:100%;}ul.inputs-list li label{display:block;float:none;width:auto;padding:0;line-height:18px;text-align:left;white-space:normal;}ul.inputs-list li label strong{color:#808080;} -ul.inputs-list li label small{font-size:12px;font-weight:normal;} -ul.inputs-list li ul.inputs-list{margin-left:25px;margin-bottom:10px;padding-top:0;} -ul.inputs-list li:first-child{padding-top:5px;} -ul.inputs-list input[type=radio],ul.inputs-list input[type=checkbox]{margin-bottom:0;} +.inline-inputs{color:#808080;}.inline-inputs span,.inline-inputs input[type=text]{display:inline-block;} +.inline-inputs input.mini{width:60px;} +.inline-inputs input.small{width:90px;} +.inline-inputs span{padding:0 2px 0 1px;} +.input-prepend input[type=text],.input-append input[type=text]{-webkit-border-radius:0 3px 3px 0;-moz-border-radius:0 3px 3px 0;border-radius:0 3px 3px 0;} +.input-prepend .add-on,.input-append .add-on{background:#f5f5f5;float:left;display:block;width:auto;min-width:16px;padding:4px 4px 4px 5px;color:#bfbfbf;font-weight:normal;line-height:18px;height:18px;text-align:center;text-shadow:0 1px 0 #fff;border:1px solid #ccc;border-right-width:0;-webkit-border-radius:3px 0 0 3px;-moz-border-radius:3px 0 0 3px;border-radius:3px 0 0 3px;} +.input-prepend .active,.input-append .active{background:#a9dba9;border-color:#46a546;} +.input-append input[type=text]{float:left;-webkit-border-radius:3px 0 0 3px;-moz-border-radius:3px 0 0 3px;border-radius:3px 0 0 3px;} +.input-append .add-on{-webkit-border-radius:0 3px 3px 0;-moz-border-radius:0 3px 3px 0;border-radius:0 3px 3px 0;border-right-width:1px;border-left-width:0;} +.inputs-list{margin:0 0 5px;width:100%;}.inputs-list li{display:block;padding:0;width:100%;}.inputs-list li label{display:block;float:none;width:auto;padding:0;line-height:18px;text-align:left;white-space:normal;}.inputs-list li label strong{color:#808080;} +.inputs-list li label small{font-size:12px;font-weight:normal;} +.inputs-list li ul.inputs-list{margin-left:25px;margin-bottom:10px;padding-top:0;} +.inputs-list li:first-child{padding-top:5px;} +.inputs-list input[type=radio],.inputs-list input[type=checkbox]{margin-bottom:0;} form.form-stacked{padding-left:20px;}form.form-stacked fieldset{padding-top:9px;} form.form-stacked legend{margin-left:0;} form.form-stacked label{display:block;float:none;width:auto;font-weight:bold;text-align:left;line-height:20px;padding-top:0;} -form.form-stacked div.clearfix{margin-bottom:9px;}form.form-stacked div.clearfix div.input{margin-left:0;} -form.form-stacked ul.inputs-list{margin-bottom:0;}form.form-stacked ul.inputs-list li{padding-top:0;}form.form-stacked ul.inputs-list li label{font-weight:normal;padding-top:0;} -form.form-stacked div.actions{margin-left:-20px;padding-left:20px;} +form.form-stacked .clearfix{margin-bottom:9px;}form.form-stacked .clearfix div.input{margin-left:0;} +form.form-stacked .inputs-list{margin-bottom:0;}form.form-stacked .inputs-list li{padding-top:0;}form.form-stacked .inputs-list li label{font-weight:normal;padding-top:0;} +form.form-stacked .actions{margin-left:-20px;padding-left:20px;} table{width:100%;margin-bottom:18px;padding:0;border-collapse:separate;font-size:13px;}table th,table td{padding:10px 10px 9px;line-height:13.5px;text-align:left;vertical-align:middle;border-bottom:1px solid #ddd;} table th{padding-top:9px;font-weight:bold;border-bottom-width:2px;} .zebra-striped tbody tr:nth-child(odd) td{background-color:#f9f9f9;} diff --git a/lib/forms.less b/lib/forms.less index f958693fc4..3a847ae841 100644 --- a/lib/forms.less +++ b/lib/forms.less @@ -23,7 +23,7 @@ form { } // Parent element that clears floats and wraps labels and fields together - div.clearfix { + .clearfix { margin-bottom: @baseline; } @@ -112,7 +112,7 @@ form { } // Error styles - div.error { + .error { background: lighten(@red, 57%); padding: 10px 0; margin: -10px 0 10px; @@ -133,8 +133,8 @@ form { .box-shadow(0 0 6px rgba(171,41,32,.5)); } } - div.input-prepend, - div.input-append { + .input-prepend, + .input-append { span.add-on { background: lighten(@red, 50%); border-color: @error-text; @@ -177,14 +177,14 @@ form { } // Actions (the buttons) -div.actions { +.actions { background: #f5f5f5; margin-top: @baseline; margin-bottom: @baseline; padding: (@baseline - 1) 20px @baseline 150px; border-top: 1px solid #ddd; .border-radius(0 0 3px 3px); - div.secondary-action { + .secondary-action { float: right; a { line-height: 30px; @@ -213,7 +213,7 @@ div.actions { } // Inline Fields (input fields that appear as inline objects -div.inline-inputs { +.inline-inputs { color: @gray; span, input[type=text] { display: inline-block; @@ -230,8 +230,8 @@ div.inline-inputs { } // Allow us to put symbols and text within the input field for a cleaner look -div.input-prepend, -div.input-append { +.input-prepend, +.input-append { input[type=text] { .border-radius(0 3px 3px 0); } @@ -257,7 +257,7 @@ div.input-append { border-color: @green; } } -div.input-append { +.input-append { input[type=text] { float: left; .border-radius(3px 0 0 3px); @@ -270,7 +270,7 @@ div.input-append { } // Stacked options for forms (radio buttons or checkboxes) -ul.inputs-list { +.inputs-list { margin: 0 0 5px; width: 100%; li { @@ -326,13 +326,13 @@ form.form-stacked { line-height: 20px; padding-top: 0; } - div.clearfix { + .clearfix { margin-bottom: @baseline / 2; div.input { margin-left: 0; } } - ul.inputs-list { + .inputs-list { margin-bottom: 0; li { padding-top: 0; @@ -342,7 +342,7 @@ form.form-stacked { } } } - div.actions { + .actions { margin-left: -20px; padding-left: 20px; } From 027538e66d633b15c9074b14d206602ad8fb42a1 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 21 Aug 2011 20:30:58 -0700 Subject: [PATCH 38/38] fix topbar dropdown active and hover states --- bootstrap-1.0.0.css | 66 ++++++++++++++++++++--------------------- bootstrap-1.0.0.min.css | 38 ++++++++++++------------ lib/patterns.less | 6 ++-- 3 files changed, 56 insertions(+), 54 deletions(-) diff --git a/bootstrap-1.0.0.css b/bootstrap-1.0.0.css index edcb06b88d..8d9774984f 100644 --- a/bootstrap-1.0.0.css +++ b/bootstrap-1.0.0.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: Sun Aug 21 20:27:08 PDT 2011 + * Date: Sun Aug 21 20:30:19 PDT 2011 */ /* Reset.less * Props to Eric Meyer (meyerweb.com) for his CSS reset file. We're using an adapted version here that cuts out some of the reset HTML elements we will never need here (i.e., dfn, samp, etc). @@ -1087,7 +1087,7 @@ table .headerSortUp.purple, table .headerSortDown.purple { /* Patterns.less * Repeatable UI elements outside the base styles provided from the scaffolding * ---------------------------------------------------------------------------- */ -div.topbar { +.topbar { background-color: #222222; background-repeat: repeat-x; background-image: -khtml-gradient(linear, left top, left bottom, from(#333333), to(#222222)); @@ -1108,17 +1108,17 @@ div.topbar { -moz-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.25), inset 0 -1px 0 rgba(0, 0, 0, 0.1); box-shadow: 0 1px 3px rgba(0, 0, 0, 0.25), inset 0 -1px 0 rgba(0, 0, 0, 0.1); } -div.topbar a { +.topbar a { color: #bfbfbf; text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); } -div.topbar a:hover, div.topbar ul li.active a { +.topbar a:hover, .topbar ul li.active a { background-color: #333; background-color: rgba(255, 255, 255, 0.05); color: #ffffff; text-decoration: none; } -div.topbar h3 a { +.topbar h3 a { float: left; display: block; padding: 8px 20px 12px; @@ -1128,7 +1128,7 @@ div.topbar h3 a { font-weight: 200; line-height: 1; } -div.topbar form { +.topbar form { float: left; margin: 5px 0 0 0; position: relative; @@ -1137,7 +1137,7 @@ div.topbar form { -moz-opacity: 1; opacity: 1; } -div.topbar form input { +.topbar form input { background-color: #bfbfbf; background-color: rgba(255, 255, 255, 0.3); font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; @@ -1159,18 +1159,18 @@ div.topbar form input { -moz-transition: none; transition: none; } -div.topbar form input:-moz-placeholder { +.topbar form input:-moz-placeholder { color: #e6e6e6; } -div.topbar form input::-webkit-input-placeholder { +.topbar form input::-webkit-input-placeholder { color: #e6e6e6; } -div.topbar form input:hover { +.topbar form input:hover { background-color: #444; background-color: rgba(255, 255, 255, 0.5); color: #fff; } -div.topbar form input:focus, div.topbar form input.focused { +.topbar form input:focus, .topbar form input.focused { outline: none; background-color: #fff; color: #404040; @@ -1181,47 +1181,47 @@ div.topbar form input:focus, div.topbar form input.focused { -moz-box-shadow: 0 0 3px rgba(0, 0, 0, 0.15); box-shadow: 0 0 3px rgba(0, 0, 0, 0.15); } -div.topbar ul { +.topbar ul { display: block; float: left; margin: 0 10px 0 0; position: relative; } -div.topbar ul.secondary-nav { +.topbar ul.secondary-nav { float: right; margin-left: 10px; margin-right: 0; } -div.topbar ul li { +.topbar ul li { display: block; float: left; font-size: 13px; } -div.topbar ul li a { +.topbar ul li a { display: block; float: none; padding: 10px 10px 11px; line-height: 19px; text-decoration: none; } -div.topbar ul li a:hover { +.topbar ul li a:hover { color: #fff; text-decoration: none; } -div.topbar ul li.active a { +.topbar ul li.active a { background-color: #222; background-color: rgba(0, 0, 0, 0.5); } -div.topbar ul.primary-nav li ul { +.topbar ul.primary-nav li ul { left: 0; } -div.topbar ul.secondary-nav li ul { +.topbar ul.secondary-nav li ul { right: 0; } -div.topbar ul li.menu { +.topbar ul li.menu { position: relative; } -div.topbar ul li.menu a.menu:after { +.topbar ul li.menu a.menu:after { width: 0px; height: 0px; display: inline-block; @@ -1238,27 +1238,27 @@ div.topbar ul li.menu a.menu:after { -moz-opacity: 0.5; opacity: 0.5; } -div.topbar ul li.menu.open a.menu, div.topbar ul li.menu.open a:hover { - background-color: #00b4eb; +.topbar ul li.menu.open a.menu, .topbar ul li.menu.open a:hover { + background-color: #333; background-color: rgba(255, 255, 255, 0.1); color: #fff; } -div.topbar ul li.menu.open ul { +.topbar ul li.menu.open ul { display: block; } -div.topbar ul li.menu.open ul li a { +.topbar ul li.menu.open ul li a { background-color: transparent; font-weight: normal; } -div.topbar ul li.menu.open ul li a:hover { +.topbar ul li.menu.open ul li a:hover { background-color: rgba(255, 255, 255, 0.1); color: #fff; } -div.topbar ul li.menu.open ul li.active a { +.topbar ul li.menu.open ul li.active a { background-color: rgba(255, 255, 255, 0.1); font-weight: bold; } -div.topbar ul li ul { +.topbar ul li ul { background-color: #333; float: left; display: none; @@ -1280,14 +1280,14 @@ div.topbar ul li ul { -moz-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.6); box-shadow: 0 1px 2px rgba(0, 0, 0, 0.6); } -div.topbar ul li ul li { +.topbar ul li ul li { float: none; clear: both; display: block; background: none; font-size: 12px; } -div.topbar ul li ul li a { +.topbar ul li ul li a { display: block; padding: 6px 15px; clear: both; @@ -1295,19 +1295,19 @@ div.topbar ul li ul li a { line-height: 19px; color: #bbb; } -div.topbar ul li ul li a:hover { +.topbar ul li ul li a:hover { background-color: #333; background-color: rgba(255, 255, 255, 0.25); color: #fff; } -div.topbar ul li ul li.divider { +.topbar ul li ul li.divider { height: 1px; overflow: hidden; background: rgba(0, 0, 0, 0.2); border-bottom: 1px solid rgba(255, 255, 255, 0.1); margin: 5px 0; } -div.topbar ul li ul li span { +.topbar ul li ul li span { clear: both; display: block; background: rgba(0, 0, 0, 0.2); diff --git a/bootstrap-1.0.0.min.css b/bootstrap-1.0.0.min.css index 273fb6eb9e..2fd6ddd5ef 100644 --- a/bootstrap-1.0.0.min.css +++ b/bootstrap-1.0.0.min.css @@ -152,25 +152,25 @@ table .orange{color:#f89406;border-bottom-color:#f89406;} table .headerSortUp.orange,table .headerSortDown.orange{background-color:#fee9cc;} table .purple{color:#7a43b6;border-bottom-color:#7a43b6;} table .headerSortUp.purple,table .headerSortDown.purple{background-color:#e2d5f0;} -div.topbar{background-color:#222222;background-repeat:repeat-x;background-image:-khtml-gradient(linear, left top, left bottom, from(#333333), to(#222222));background-image:-moz-linear-gradient(#333333, #222222);background-image:-ms-linear-gradient(#333333, #222222);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #333333), color-stop(100%, #222222));background-image:-webkit-linear-gradient(#333333, #222222);background-image:-o-linear-gradient(#333333, #222222);background-image:linear-gradient(#333333, #222222);height:40px;position:fixed;top:0;left:0;right:0;z-index:10000;overflow:visible;-webkit-box-shadow:0 1px 3px rgba(0, 0, 0, 0.25),inset 0 -1px 0 rgba(0, 0, 0, 0.1);-moz-box-shadow:0 1px 3px rgba(0, 0, 0, 0.25),inset 0 -1px 0 rgba(0, 0, 0, 0.1);box-shadow:0 1px 3px rgba(0, 0, 0, 0.25),inset 0 -1px 0 rgba(0, 0, 0, 0.1);}div.topbar a{color:#bfbfbf;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);} -div.topbar a:hover,div.topbar ul li.active a{background-color:#333;background-color:rgba(255, 255, 255, 0.05);color:#ffffff;text-decoration:none;} -div.topbar h3 a{float:left;display:block;padding:8px 20px 12px;margin-left:-20px;color:#ffffff;font-size:20px;font-weight:200;line-height:1;} -div.topbar form{float:left;margin:5px 0 0 0;position:relative;filter:alpha(opacity=100);-khtml-opacity:1;-moz-opacity:1;opacity:1;}div.topbar form input{background-color:#bfbfbf;background-color:rgba(255, 255, 255, 0.3);font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:normal;font-weight:13px;line-height:1;width:220px;padding:4px 9px;color:#fff;color:rgba(255, 255, 255, 0.75);border:1px solid #111;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-webkit-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1),0 1px 0px rgba(255, 255, 255, 0.25);-moz-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1),0 1px 0px rgba(255, 255, 255, 0.25);box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1),0 1px 0px rgba(255, 255, 255, 0.25);-webkit-transition:none;-moz-transition:none;transition:none;}div.topbar form input:-moz-placeholder{color:#e6e6e6;} -div.topbar form input::-webkit-input-placeholder{color:#e6e6e6;} -div.topbar form input:hover{background-color:#444;background-color:rgba(255, 255, 255, 0.5);color:#fff;} -div.topbar form input:focus,div.topbar form input.focused{outline:none;background-color:#fff;color:#404040;text-shadow:0 1px 0 #fff;border:0;padding:5px 10px;-webkit-box-shadow:0 0 3px rgba(0, 0, 0, 0.15);-moz-box-shadow:0 0 3px rgba(0, 0, 0, 0.15);box-shadow:0 0 3px rgba(0, 0, 0, 0.15);} -div.topbar ul{display:block;float:left;margin:0 10px 0 0;position:relative;}div.topbar ul.secondary-nav{float:right;margin-left:10px;margin-right:0;} -div.topbar ul li{display:block;float:left;font-size:13px;}div.topbar ul li a{display:block;float:none;padding:10px 10px 11px;line-height:19px;text-decoration:none;}div.topbar ul li a:hover{color:#fff;text-decoration:none;} -div.topbar ul li.active a{background-color:#222;background-color:rgba(0, 0, 0, 0.5);} -div.topbar ul.primary-nav li ul{left:0;} -div.topbar ul.secondary-nav li ul{right:0;} -div.topbar ul li.menu{position:relative;}div.topbar ul li.menu a.menu:after{width:0px;height:0px;display:inline-block;content:"↓";text-indent:-99999px;vertical-align:top;margin-top:8px;margin-left:4px;border-left:4px solid transparent;border-right:4px solid transparent;border-top:4px solid #fff;filter:alpha(opacity=50);-khtml-opacity:0.5;-moz-opacity:0.5;opacity:0.5;} -div.topbar ul li.menu.open a.menu,div.topbar ul li.menu.open a:hover{background-color:#00b4eb;background-color:rgba(255, 255, 255, 0.1);color:#fff;} -div.topbar ul li.menu.open ul{display:block;}div.topbar ul li.menu.open ul li a{background-color:transparent;font-weight:normal;}div.topbar ul li.menu.open ul li a:hover{background-color:rgba(255, 255, 255, 0.1);color:#fff;} -div.topbar ul li.menu.open ul li.active a{background-color:rgba(255, 255, 255, 0.1);font-weight:bold;} -div.topbar ul li ul{background-color:#333;float:left;display:none;position:absolute;top:40px;min-width:160px;max-width:220px;_width:160px;margin-left:0;margin-right:0;padding:0;text-align:left;border:0;zoom:1;-webkit-border-radius:0 0 5px 5px;-moz-border-radius:0 0 5px 5px;border-radius:0 0 5px 5px;-webkit-box-shadow:0 1px 2px rgba(0, 0, 0, 0.6);-moz-box-shadow:0 1px 2px rgba(0, 0, 0, 0.6);box-shadow:0 1px 2px rgba(0, 0, 0, 0.6);}div.topbar ul li ul li{float:none;clear:both;display:block;background:none;font-size:12px;}div.topbar ul li ul li a{display:block;padding:6px 15px;clear:both;font-weight:normal;line-height:19px;color:#bbb;}div.topbar ul li ul li a:hover{background-color:#333;background-color:rgba(255, 255, 255, 0.25);color:#fff;} -div.topbar ul li ul li.divider{height:1px;overflow:hidden;background:rgba(0, 0, 0, 0.2);border-bottom:1px solid rgba(255, 255, 255, 0.1);margin:5px 0;} -div.topbar ul li ul li span{clear:both;display:block;background:rgba(0, 0, 0, 0.2);padding:6px 15px;cursor:default;color:#808080;border-top:1px solid rgba(0, 0, 0, 0.2);} +.topbar{background-color:#222222;background-repeat:repeat-x;background-image:-khtml-gradient(linear, left top, left bottom, from(#333333), to(#222222));background-image:-moz-linear-gradient(#333333, #222222);background-image:-ms-linear-gradient(#333333, #222222);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #333333), color-stop(100%, #222222));background-image:-webkit-linear-gradient(#333333, #222222);background-image:-o-linear-gradient(#333333, #222222);background-image:linear-gradient(#333333, #222222);height:40px;position:fixed;top:0;left:0;right:0;z-index:10000;overflow:visible;-webkit-box-shadow:0 1px 3px rgba(0, 0, 0, 0.25),inset 0 -1px 0 rgba(0, 0, 0, 0.1);-moz-box-shadow:0 1px 3px rgba(0, 0, 0, 0.25),inset 0 -1px 0 rgba(0, 0, 0, 0.1);box-shadow:0 1px 3px rgba(0, 0, 0, 0.25),inset 0 -1px 0 rgba(0, 0, 0, 0.1);}.topbar a{color:#bfbfbf;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);} +.topbar a:hover,.topbar ul li.active a{background-color:#333;background-color:rgba(255, 255, 255, 0.05);color:#ffffff;text-decoration:none;} +.topbar h3 a{float:left;display:block;padding:8px 20px 12px;margin-left:-20px;color:#ffffff;font-size:20px;font-weight:200;line-height:1;} +.topbar form{float:left;margin:5px 0 0 0;position:relative;filter:alpha(opacity=100);-khtml-opacity:1;-moz-opacity:1;opacity:1;}.topbar form input{background-color:#bfbfbf;background-color:rgba(255, 255, 255, 0.3);font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:normal;font-weight:13px;line-height:1;width:220px;padding:4px 9px;color:#fff;color:rgba(255, 255, 255, 0.75);border:1px solid #111;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-webkit-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1),0 1px 0px rgba(255, 255, 255, 0.25);-moz-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1),0 1px 0px rgba(255, 255, 255, 0.25);box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1),0 1px 0px rgba(255, 255, 255, 0.25);-webkit-transition:none;-moz-transition:none;transition:none;}.topbar form input:-moz-placeholder{color:#e6e6e6;} +.topbar form input::-webkit-input-placeholder{color:#e6e6e6;} +.topbar form input:hover{background-color:#444;background-color:rgba(255, 255, 255, 0.5);color:#fff;} +.topbar form input:focus,.topbar form input.focused{outline:none;background-color:#fff;color:#404040;text-shadow:0 1px 0 #fff;border:0;padding:5px 10px;-webkit-box-shadow:0 0 3px rgba(0, 0, 0, 0.15);-moz-box-shadow:0 0 3px rgba(0, 0, 0, 0.15);box-shadow:0 0 3px rgba(0, 0, 0, 0.15);} +.topbar ul{display:block;float:left;margin:0 10px 0 0;position:relative;}.topbar ul.secondary-nav{float:right;margin-left:10px;margin-right:0;} +.topbar ul li{display:block;float:left;font-size:13px;}.topbar ul li a{display:block;float:none;padding:10px 10px 11px;line-height:19px;text-decoration:none;}.topbar ul li a:hover{color:#fff;text-decoration:none;} +.topbar ul li.active a{background-color:#222;background-color:rgba(0, 0, 0, 0.5);} +.topbar ul.primary-nav li ul{left:0;} +.topbar ul.secondary-nav li ul{right:0;} +.topbar ul li.menu{position:relative;}.topbar ul li.menu a.menu:after{width:0px;height:0px;display:inline-block;content:"↓";text-indent:-99999px;vertical-align:top;margin-top:8px;margin-left:4px;border-left:4px solid transparent;border-right:4px solid transparent;border-top:4px solid #fff;filter:alpha(opacity=50);-khtml-opacity:0.5;-moz-opacity:0.5;opacity:0.5;} +.topbar ul li.menu.open a.menu,.topbar ul li.menu.open a:hover{background-color:#333;background-color:rgba(255, 255, 255, 0.1);color:#fff;} +.topbar ul li.menu.open ul{display:block;}.topbar ul li.menu.open ul li a{background-color:transparent;font-weight:normal;}.topbar ul li.menu.open ul li a:hover{background-color:rgba(255, 255, 255, 0.1);color:#fff;} +.topbar ul li.menu.open ul li.active a{background-color:rgba(255, 255, 255, 0.1);font-weight:bold;} +.topbar ul li ul{background-color:#333;float:left;display:none;position:absolute;top:40px;min-width:160px;max-width:220px;_width:160px;margin-left:0;margin-right:0;padding:0;text-align:left;border:0;zoom:1;-webkit-border-radius:0 0 5px 5px;-moz-border-radius:0 0 5px 5px;border-radius:0 0 5px 5px;-webkit-box-shadow:0 1px 2px rgba(0, 0, 0, 0.6);-moz-box-shadow:0 1px 2px rgba(0, 0, 0, 0.6);box-shadow:0 1px 2px rgba(0, 0, 0, 0.6);}.topbar ul li ul li{float:none;clear:both;display:block;background:none;font-size:12px;}.topbar ul li ul li a{display:block;padding:6px 15px;clear:both;font-weight:normal;line-height:19px;color:#bbb;}.topbar ul li ul li a:hover{background-color:#333;background-color:rgba(255, 255, 255, 0.25);color:#fff;} +.topbar ul li ul li.divider{height:1px;overflow:hidden;background:rgba(0, 0, 0, 0.2);border-bottom:1px solid rgba(255, 255, 255, 0.1);margin:5px 0;} +.topbar ul li ul li span{clear:both;display:block;background:rgba(0, 0, 0, 0.2);padding:6px 15px;cursor:default;color:#808080;border-top:1px solid rgba(0, 0, 0, 0.2);} .hero-unit{background-color:#f5f5f5;margin-bottom:30px;padding:60px;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;}.hero-unit h1{margin-bottom:0;font-size:60px;line-height:1;letter-spacing:-1px;} .hero-unit p{font-size:18px;font-weight:200;line-height:27px;} .page-header{margin-bottom:17px;border-bottom:1px solid #ddd;-webkit-box-shadow:0 1px 0 rgba(255, 255, 255, 0.5);-moz-box-shadow:0 1px 0 rgba(255, 255, 255, 0.5);box-shadow:0 1px 0 rgba(255, 255, 255, 0.5);}.page-header h1{margin-bottom:8px;} diff --git a/lib/patterns.less b/lib/patterns.less index 1f8f289631..79b8b2de99 100644 --- a/lib/patterns.less +++ b/lib/patterns.less @@ -7,7 +7,7 @@ // ------ // Topbar for Branding and Nav -div.topbar { +.topbar { #gradient > .vertical(#333, #222); height: 40px; position: fixed; @@ -73,11 +73,13 @@ div.topbar { &::-webkit-input-placeholder { color: @grayLighter; } + // Hover states &:hover { background-color: #444; background-color: rgba(255,255,255,.5); color: #fff; } + // Focus states (we use .focused since IE8 and down doesn't support :focus) &:focus, &.focused { outline: none; @@ -151,7 +153,7 @@ div.topbar { &.open { a.menu, a:hover { - background-color: lighten(#00a0d1,5); + background-color: #333; background-color: rgba(255,255,255,.1); color: #fff; }