From df8b65445c332c6fa68858a8f839c24f8b4413ad Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Fri, 26 Aug 2011 19:31:50 -0700 Subject: [PATCH 01/14] small typo in offset generation --- bootstrap-1.1.1.css | 4 ++-- bootstrap-1.1.1.min.css | 2 +- lib/scaffolding.less | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/bootstrap-1.1.1.css b/bootstrap-1.1.1.css index 9ece1008d4..9f422a2431 100644 --- a/bootstrap-1.1.1.css +++ b/bootstrap-1.1.1.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: Fri Aug 26 15:21:30 PDT 2011 + * Date: Fri Aug 26 19:31: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). @@ -373,7 +373,7 @@ table { margin-left: 500px; } .row .offset9 { - margin-left: 500px; + margin-left: 560px; } .row .offset10 { margin-left: 620px; diff --git a/bootstrap-1.1.1.min.css b/bootstrap-1.1.1.min.css index 06bff3eb77..8d8a00b958 100644 --- a/bootstrap-1.1.1.min.css +++ b/bootstrap-1.1.1.min.css @@ -56,7 +56,7 @@ table{border-collapse:collapse;border-spacing:0;} .row .offset6{margin-left:380px;} .row .offset7{margin-left:440px;} .row .offset8{margin-left:500px;} -.row .offset9{margin-left:500px;} +.row .offset9{margin-left:560px;} .row .offset10{margin-left:620px;} .row .offset11{margin-left:680px;} .row .offset12{margin-left:740px;} diff --git a/lib/scaffolding.less b/lib/scaffolding.less index d1b621c13e..ded9a1e5f1 100644 --- a/lib/scaffolding.less +++ b/lib/scaffolding.less @@ -60,7 +60,7 @@ .offset6 { .offset(6); } .offset7 { .offset(7); } .offset8 { .offset(8); } - .offset9 { .offset(8); } + .offset9 { .offset(9); } .offset10 { .offset(10); } .offset11 { .offset(11); } .offset12 { .offset(12); } From 315af8e18b6ade15c372420cb256053697553716 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 27 Aug 2011 00:49:48 -0700 Subject: [PATCH 02/14] Edited readme to include the versioning approach we'll be striving to use --- README.md | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/README.md b/README.md index 8ac5f78ff5..8d0e693c97 100644 --- a/README.md +++ b/README.md @@ -23,6 +23,24 @@ Or if you prefer, the standard css way: For more info, refer to the docs! +Versioning +---------- + +For transparency and insight into our release cycle, and for striving to maintain backwards compatibility, Bootstrap will be maintained under the Semantic Versioning guidelines as much as possible. + +Releases will be numbered with the follow format: + +`..` + +And constructed with the following guidelines: + +* Breaking backwards compatibility bumps the major +* New additions without breaking backwards compatibility bumpbs the minor +* Bug fixes and misc changes bump the patch + +For more information on SemVer, please visit http://semver.org/. + + Bug Tracker ----------- From 589204803bc34575a8ca2c3e624864d3dc8e63ba Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Mon, 29 Aug 2011 21:41:12 -0700 Subject: [PATCH 03/14] remove duplicate defined btn class O_O --- bootstrap-1.1.1.css | 109 +--------------------------------------- bootstrap-1.1.1.min.css | 9 ---- lib/scaffolding.less | 88 +------------------------------- 3 files changed, 2 insertions(+), 204 deletions(-) diff --git a/bootstrap-1.1.1.css b/bootstrap-1.1.1.css index da8e8996d5..090b1d3df9 100644 --- a/bootstrap-1.1.1.css +++ b/bootstrap-1.1.1.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: Mon Aug 29 21:26:39 PDT 2011 + * Date: Mon Aug 29 21: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). @@ -428,113 +428,6 @@ 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, #ffffff 0.25, #e6e6e6); - background-image: -moz-linear-gradient(#ffffff, #ffffff 0.25, #e6e6e6); - background-image: -ms-linear-gradient(#ffffff, #ffffff 0.25, #e6e6e6); - background-image: -o-linear-gradient(#ffffff, #ffffff 0.25, #e6e6e6); - background-image: linear-gradient(#ffffff, #ffffff 0.25, #e6e6e6); - padding: 4px 14px; - text-shadow: 0 1px 1px rgba(255, 255, 255, 0.75); - color: #333; - font-size: 13px; - line-height: 18px; - border: 1px solid #ccc; - border-bottom-color: #bbb; - -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); -} -.btn:hover { - background-position: 0 -15px; - color: #333; - text-decoration: none; -} -.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(top, #049cdb, #0064cd); - background-image: -ms-linear-gradient(top, #049cdb, #0064cd); - background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #049cdb), color-stop(100%, #0064cd)); - background-image: -webkit-linear-gradient(top, #049cdb, #0064cd); - background-image: -o-linear-gradient(top, #049cdb, #0064cd); - background-image: linear-gradient(top, #049cdb, #0064cd); - color: #fff; - text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); - border: 1px solid #004b9a; - border-bottom-color: #003f81; -} -.primary:hover { - color: #fff; -} -.btn { - -webkit-transition: 0.1s linear all; - -moz-transition: 0.1s linear all; - transition: 0.1s linear all; -} -.btn.primary { - 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; - -webkit-box-shadow: none; - -moz-box-shadow: none; - box-shadow: none; -} -.btn:disabled { - background-image: none; - filter: alpha(opacity=65); - -khtml-opacity: 0.65; - -moz-opacity: 0.65; - opacity: 0.65; - cursor: default; - -webkit-box-shadow: none; - -moz-box-shadow: none; - box-shadow: none; -} -.btn:disabled.primary { - color: #fff; -} -.btn:active { - -webkit-box-shadow: inset 0 3px 7px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05); - -moz-box-shadow: inset 0 3px 7px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05); - box-shadow: inset 0 3px 7px rgba(0, 0, 0, 0.15), 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; -} /* Typography.less * Headings, body text, lists, code, and more for a versatile and durable typography system * ---------------------------------------------------------------------------------------- */ diff --git a/bootstrap-1.1.1.min.css b/bootstrap-1.1.1.min.css index dff0d7e8a3..77a13e983c 100644 --- a/bootstrap-1.1.1.min.css +++ b/bootstrap-1.1.1.min.css @@ -72,15 +72,6 @@ body{margin:0;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size: .container-fluid .sidebar{float:left;width:220px;} .container-fluid .content{min-width:700px;max-width:1180px;margin-left:240px;} a{color:#0069d6;text-decoration:none;line-height:inherit;font-weight: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, #ffffff 0.25, #e6e6e6);background-image:-moz-linear-gradient(#ffffff, #ffffff 0.25, #e6e6e6);background-image:-ms-linear-gradient(#ffffff, #ffffff 0.25, #e6e6e6);background-image:-o-linear-gradient(#ffffff, #ffffff 0.25, #e6e6e6);background-image:linear-gradient(#ffffff, #ffffff 0.25, #e6e6e6);padding:4px 14px;text-shadow:0 1px 1px rgba(255, 255, 255, 0.75);color:#333;font-size:13px;line-height:18px;border:1px solid #ccc;border-bottom-color:#bbb;-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);}.btn:hover{background-position:0 -15px;color:#333;text-decoration:none;} -.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(top, #049cdb, #0064cd);background-image:-ms-linear-gradient(top, #049cdb, #0064cd);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #049cdb), color-stop(100%, #0064cd));background-image:-webkit-linear-gradient(top, #049cdb, #0064cd);background-image:-o-linear-gradient(top, #049cdb, #0064cd);background-image:linear-gradient(top, #049cdb, #0064cd);color:#fff;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);border:1px solid #004b9a;border-bottom-color:#003f81;}.primary:hover{color:#fff;} -.btn{-webkit-transition:0.1s linear all;-moz-transition:0.1s linear all;transition:0.1s linear all;}.btn.primary{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;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;} -.btn:disabled{background-image:none;filter:alpha(opacity=65);-khtml-opacity:0.65;-moz-opacity:0.65;opacity:0.65;cursor:default;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;}.btn:disabled.primary{color:#fff;} -.btn:active{-webkit-box-shadow:inset 0 3px 7px rgba(0, 0, 0, 0.15),0 1px 2px rgba(0, 0, 0, 0.05);-moz-box-shadow:inset 0 3px 7px rgba(0, 0, 0, 0.15),0 1px 2px rgba(0, 0, 0, 0.05);box-shadow:inset 0 3px 7px rgba(0, 0, 0, 0.15),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;} h1,h2,h3,h4,h5,h6{font-weight:bold;color:#404040;}h1 small,h2 small,h3 small,h4 small,h5 small,h6 small{color:#bfbfbf;} h1{margin-bottom:18px;font-size:30px;line-height:36px;}h1 small{font-size:18px;} diff --git a/lib/scaffolding.less b/lib/scaffolding.less index 2bbb1dc6cc..c0272908ff 100644 --- a/lib/scaffolding.less +++ b/lib/scaffolding.less @@ -107,90 +107,4 @@ a { color: @linkColorHover; text-decoration: underline; } -} - -// Buttons -.btn { - display: inline-block; - #gradient > .vertical-three-colors(#fff, #fff, 0.25, darken(#fff, 10%)); - padding: 4px 14px; - text-shadow: 0 1px 1px rgba(255,255,255,.75); - color: #333; - font-size: 13px; - line-height: @baseline; - border: 1px solid #ccc; - border-bottom-color: #bbb; - .border-radius(4px); - @shadow: inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05); - .box-shadow(@shadow); - &:hover { - background-position: 0 -15px; - color: #333; - text-decoration: none; - } -} -.primary { - #gradient > .vertical(#049CDB, #0064CD); - color: #fff; - text-shadow: 0 -1px 0 rgba(0,0,0,.25); - border: 1px solid darken(#0064CD, 10%); - border-bottom-color: darken(#0064CD, 15%); - &:hover { - color: #fff; - } -} - -.btn { - //.button(#1174C6); - .transition(.1s linear all); - &.primary { - //#gradient > .vertical(@blue, @blueDark); - color: #fff; - text-shadow: 0 -1px 0 rgba(0,0,0,.25); - 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; - } - } - &.large { - font-size: 16px; - line-height: 28px; - .border-radius(6px); - } - &.small { - padding-right: 9px; - padding-left: 9px; - font-size: 11px; - } - &.disabled { - background-image: none; - .opacity(65); - cursor: default; - .box-shadow(none); - } - - // this can't be included with the .disabled def because IE8 and below will drop it ;_; - &:disabled { - background-image: none; - .opacity(65); - cursor: default; - .box-shadow(none); - &.primary { - color: #fff; - } - } - &:active { - @shadow: inset 0 3px 7px rgba(0,0,0,.15), 0 1px 2px rgba(0,0,0,.05); - .box-shadow(@shadow); - } -} - -// Help Firefox not be a jerk about adding extra padding to buttons -button.btn, -input[type=submit].btn { - &::-moz-focus-inner { - padding: 0; - border: 0; - } -} +} \ No newline at end of file From e8f1ae007339c98ea71b0f56b37c037d11fa6276 Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Mon, 29 Aug 2011 21:52:45 -0700 Subject: [PATCH 04/14] btn's need &nbps; seperating them for ie7 --- docs/index.html | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/docs/index.html b/docs/index.html index 3d7f38ba04..db31ca296e 100644 --- a/docs/index.html +++ b/docs/index.html @@ -863,11 +863,7 @@

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:

- - - - - + &nbps;&nbps;&nbps;&nbps;

Alternate sizes

Fancy larger or smaller buttons? Have at it!

From fc0471a450d8cf3fdeb0971ce2636ac11053891d Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Mon, 29 Aug 2011 22:34:13 -0700 Subject: [PATCH 05/14] lulz nbsp --- docs/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/index.html b/docs/index.html index db31ca296e..415ea6a3b0 100644 --- a/docs/index.html +++ b/docs/index.html @@ -863,7 +863,7 @@

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:

- &nbps;&nbps;&nbps;&nbps; +     

Alternate sizes

Fancy larger or smaller buttons? Have at it!

From efd6fd609c7e1406d40906d4aa14949345a2d5ff Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Mon, 29 Aug 2011 22:36:05 -0700 Subject: [PATCH 06/14] fix open ui for ie 7 --- bootstrap-1.1.1.css | 3 ++- bootstrap-1.1.1.min.css | 2 +- lib/patterns.less | 1 + 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/bootstrap-1.1.1.css b/bootstrap-1.1.1.css index 090b1d3df9..ef9cbd7e68 100644 --- a/bootstrap-1.1.1.css +++ b/bootstrap-1.1.1.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: Mon Aug 29 21:40:43 PDT 2011 + * Date: Mon Aug 29 22:36:01 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). @@ -1234,6 +1234,7 @@ table .headerSortUp.purple, table .headerSortDown.purple { } .nav .dropdown-menu .dropdown-toggle.open { background-color: rgba(255, 255, 255, 0.05); + *background-color: #444; } .nav .dropdown-menu li a { color: #999; diff --git a/bootstrap-1.1.1.min.css b/bootstrap-1.1.1.min.css index 77a13e983c..715b25d1b6 100644 --- a/bootstrap-1.1.1.min.css +++ b/bootstrap-1.1.1.min.css @@ -187,7 +187,7 @@ table .headerSortUp.purple,table .headerSortDown.purple{background-color:#e2d5f0 .nav .active a{background-color:#222;background-color:rgba(0, 0, 0, 0.5);} .nav.secondary-nav{float:right;margin-left:10px;margin-right:0;}.nav.secondary-nav .dropdown-menu{right:0;} .nav .dropdown-toggle:hover,.nav .dropdown.open .dropdown-toggle{background-color:#444;background-color:rgba(255, 255, 255, 0.05);*background-color:#444;} -.nav .dropdown-menu{background-color:#333;}.nav .dropdown-menu .dropdown-toggle{color:#fff;}.nav .dropdown-menu .dropdown-toggle.open{background-color:rgba(255, 255, 255, 0.05);} +.nav .dropdown-menu{background-color:#333;}.nav .dropdown-menu .dropdown-toggle{color:#fff;}.nav .dropdown-menu .dropdown-toggle.open{background-color:rgba(255, 255, 255, 0.05);*background-color:#444;} .nav .dropdown-menu li a{color:#999;text-shadow:0 1px 0 rgba(0, 0, 0, 0.5);}.nav .dropdown-menu li a:hover{background-color:#191919;background-repeat:repeat-x;background-image:-khtml-gradient(linear, left top, left bottom, from(#292929), to(#191919));background-image:-moz-linear-gradient(top, #292929, #191919);background-image:-ms-linear-gradient(top, #292929, #191919);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #292929), color-stop(100%, #191919));background-image:-webkit-linear-gradient(top, #292929, #191919);background-image:-o-linear-gradient(top, #292929, #191919);background-image:linear-gradient(top, #292929, #191919);color:#fff;} .nav .dropdown-menu .divider{background-color:#222;border-color:#444;} .dropdown{position:relative;} diff --git a/lib/patterns.less b/lib/patterns.less index 219e26b3f8..dba5af3aaf 100644 --- a/lib/patterns.less +++ b/lib/patterns.less @@ -157,6 +157,7 @@ color: #fff; &.open { background-color: rgba(255,255,255,.05); + *background-color: #444; // IE6-7 } } li a { From afec7859cc08b7d57100ab7d96f11a9df5bdb32e Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Mon, 29 Aug 2011 22:43:40 -0700 Subject: [PATCH 07/14] fix background color for ie7 -- negative margin bug still there though ;_; --- bootstrap-1.1.1.css | 6 ++++-- bootstrap-1.1.1.min.css | 4 ++-- lib/patterns.less | 2 +- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/bootstrap-1.1.1.css b/bootstrap-1.1.1.css index ef9cbd7e68..5171561f59 100644 --- a/bootstrap-1.1.1.css +++ b/bootstrap-1.1.1.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: Mon Aug 29 22:36:01 PDT 2011 + * Date: Mon Aug 29 22:43: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). @@ -1234,7 +1234,6 @@ table .headerSortUp.purple, table .headerSortDown.purple { } .nav .dropdown-menu .dropdown-toggle.open { background-color: rgba(255, 255, 255, 0.05); - *background-color: #444; } .nav .dropdown-menu li a { color: #999; @@ -1344,6 +1343,9 @@ table .headerSortUp.purple, table .headerSortDown.purple { color: #fff; background-color: #ccc; background-color: rgba(0, 0, 0, 0.3); + *background-color: #ccc; + /* ie6 -7 */ + } .dropdown.open .dropdown-menu { display: block; diff --git a/bootstrap-1.1.1.min.css b/bootstrap-1.1.1.min.css index 715b25d1b6..2ed10b26d6 100644 --- a/bootstrap-1.1.1.min.css +++ b/bootstrap-1.1.1.min.css @@ -187,7 +187,7 @@ table .headerSortUp.purple,table .headerSortDown.purple{background-color:#e2d5f0 .nav .active a{background-color:#222;background-color:rgba(0, 0, 0, 0.5);} .nav.secondary-nav{float:right;margin-left:10px;margin-right:0;}.nav.secondary-nav .dropdown-menu{right:0;} .nav .dropdown-toggle:hover,.nav .dropdown.open .dropdown-toggle{background-color:#444;background-color:rgba(255, 255, 255, 0.05);*background-color:#444;} -.nav .dropdown-menu{background-color:#333;}.nav .dropdown-menu .dropdown-toggle{color:#fff;}.nav .dropdown-menu .dropdown-toggle.open{background-color:rgba(255, 255, 255, 0.05);*background-color:#444;} +.nav .dropdown-menu{background-color:#333;}.nav .dropdown-menu .dropdown-toggle{color:#fff;}.nav .dropdown-menu .dropdown-toggle.open{background-color:rgba(255, 255, 255, 0.05);} .nav .dropdown-menu li a{color:#999;text-shadow:0 1px 0 rgba(0, 0, 0, 0.5);}.nav .dropdown-menu li a:hover{background-color:#191919;background-repeat:repeat-x;background-image:-khtml-gradient(linear, left top, left bottom, from(#292929), to(#191919));background-image:-moz-linear-gradient(top, #292929, #191919);background-image:-ms-linear-gradient(top, #292929, #191919);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #292929), color-stop(100%, #191919));background-image:-webkit-linear-gradient(top, #292929, #191919);background-image:-o-linear-gradient(top, #292929, #191919);background-image:linear-gradient(top, #292929, #191919);color:#fff;} .nav .dropdown-menu .divider{background-color:#222;border-color:#444;} .dropdown{position:relative;} @@ -195,7 +195,7 @@ table .headerSortUp.purple,table .headerSortDown.purple{background-color:#e2d5f0 .dropdown-menu{background-color:#fff;float:left;display:none;position:absolute;top:40px;min-width:160px;max-width:220px;_width:160px;margin-left:0;margin-right:0;padding:6px 0;zoom:1;border-color:#999;border-color:rgba(0, 0, 0, 0.2);border-style:solid;border-width:0 1px 1px;-webkit-border-radius:0 0 6px 6px;-moz-border-radius:0 0 6px 6px;border-radius:0 0 6px 6px;-webkit-box-shadow:0 2px 4px rgba(0, 0, 0, 0.2);-moz-box-shadow:0 2px 4px rgba(0, 0, 0, 0.2);box-shadow:0 2px 4px rgba(0, 0, 0, 0.2);-webkit-background-clip:padding-box;-moz-background-clip:padding-box;background-clip:padding-box;}.dropdown-menu li{float:none;display:block;background-color:none;} .dropdown-menu a{display:block;padding:4px 15px;clear:both;font-weight:normal;line-height:18px;color:#808080;text-shadow:0 1px 0 #fff;}.dropdown-menu a:hover{background-color:#dddddd;background-repeat:repeat-x;background-image:-khtml-gradient(linear, left top, left bottom, from(#eeeeee), to(#dddddd));background-image:-moz-linear-gradient(top, #eeeeee, #dddddd);background-image:-ms-linear-gradient(top, #eeeeee, #dddddd);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #eeeeee), color-stop(100%, #dddddd));background-image:-webkit-linear-gradient(top, #eeeeee, #dddddd);background-image:-o-linear-gradient(top, #eeeeee, #dddddd);background-image:linear-gradient(top, #eeeeee, #dddddd);color:#404040;text-decoration:none;-webkit-box-shadow:inset 0 1px 0 rgba(0, 0, 0, 0.025),inset 0 -1px rgba(0, 0, 0, 0.025);-moz-box-shadow:inset 0 1px 0 rgba(0, 0, 0, 0.025),inset 0 -1px rgba(0, 0, 0, 0.025);box-shadow:inset 0 1px 0 rgba(0, 0, 0, 0.025),inset 0 -1px rgba(0, 0, 0, 0.025);} .dropdown-menu .divider{height:1px;margin:5px 0;overflow:hidden;background-color:#eee;border-bottom:1px solid #fff;} -.dropdown.open .dropdown-toggle{color:#fff;background-color:#ccc;background-color:rgba(0, 0, 0, 0.3);} +.dropdown.open .dropdown-toggle{color:#fff;background-color:#ccc;background-color:rgba(0, 0, 0, 0.3);*background-color:#ccc;} .dropdown.open .dropdown-menu{display:block;} .tabs,.pills{margin:0 0 20px;padding:0;list-style:none;zoom:1;margin-bottom:18px;}.tabs:before,.pills:before,.tabs:after,.pills:after{display:table;content:"";} .tabs:after,.pills:after{clear:both;} diff --git a/lib/patterns.less b/lib/patterns.less index dba5af3aaf..a4bc6b855a 100644 --- a/lib/patterns.less +++ b/lib/patterns.less @@ -157,7 +157,6 @@ color: #fff; &.open { background-color: rgba(255,255,255,.05); - *background-color: #444; // IE6-7 } } li a { @@ -256,6 +255,7 @@ color: #fff; background-color: #ccc; background-color: rgba(0,0,0,.3); + *background-color: #ccc; /* ie6 -7 */ } .dropdown-menu { display: block; From a16dfb735aaa460c91e69f94679ca334e852225f Mon Sep 17 00:00:00 2001 From: David Haywood Smith Date: Tue, 30 Aug 2011 11:19:46 +0100 Subject: [PATCH 08/14] Fixed readme spelling mistake, closes #123 --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 8d0e693c97..c0199d4b14 100644 --- a/README.md +++ b/README.md @@ -35,7 +35,7 @@ Releases will be numbered with the follow format: And constructed with the following guidelines: * Breaking backwards compatibility bumps the major -* New additions without breaking backwards compatibility bumpbs the minor +* New additions without breaking backwards compatibility bumps the minor * Bug fixes and misc changes bump the patch For more information on SemVer, please visit http://semver.org/. From 55022228bcdfea8d87eefb0c21249e6a9e219263 Mon Sep 17 00:00:00 2001 From: David Haywood Smith Date: Tue, 30 Aug 2011 11:47:40 +0100 Subject: [PATCH 09/14] Fixed duplicate element ids Also updated labels where required --- docs/index.html | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/docs/index.html b/docs/index.html index bc0e216aba..b04e352920 100644 --- a/docs/index.html +++ b/docs/index.html @@ -651,9 +651,9 @@
- +
- + Small snippet of help text
@@ -688,7 +688,7 @@
- +
@@ -791,9 +791,9 @@
Example form legend
- +
- +
@@ -812,9 +812,9 @@
Example form legend
- +
- + Small snippet of help text
From 2ed869c2eef1ad89a26ecfa187638db6f84774cd Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Tue, 30 Aug 2011 23:03:01 -0700 Subject: [PATCH 10/14] remove * hack for ie7 + remove -1 margin bug for ie7 --- bootstrap-1.1.1.css | 17 +++++------------ bootstrap-1.1.1.min.css | 8 ++++---- lib/patterns.less | 11 ++++------- 3 files changed, 13 insertions(+), 23 deletions(-) diff --git a/bootstrap-1.1.1.css b/bootstrap-1.1.1.css index 5171561f59..e4387ec460 100644 --- a/bootstrap-1.1.1.css +++ b/bootstrap-1.1.1.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: Mon Aug 29 22:43:36 PDT 2011 + * Date: Tue Aug 30 23:02:58 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). @@ -1222,9 +1222,8 @@ table .headerSortUp.purple, table .headerSortDown.purple { right: 0; } .nav .dropdown-toggle:hover, .nav .dropdown.open .dropdown-toggle { - background-color: #444; + background: #444; background-color: rgba(255, 255, 255, 0.05); - *background-color: #444; } .nav .dropdown-menu { background-color: #333; @@ -1341,11 +1340,8 @@ table .headerSortUp.purple, table .headerSortDown.purple { } .dropdown.open .dropdown-toggle { color: #fff; - background-color: #ccc; + background: #ccc; background-color: rgba(0, 0, 0, 0.3); - *background-color: #ccc; - /* ie6 -7 */ - } .dropdown.open .dropdown-menu { display: block; @@ -1379,9 +1375,9 @@ table .headerSortUp.purple, table .headerSortDown.purple { } .tabs > li { position: relative; + top: 1px; } .tabs > li > a { - margin-bottom: -1px; margin-right: 2px; padding: 0 15px; line-height: 35px; @@ -1882,11 +1878,8 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { height: 0; } .popover .inner { - background-color: #333; + background: #333; background-color: rgba(0, 0, 0, 0.8); - *background-color: #333; - /* IE 6-7 */ - padding: 3px; overflow: hidden; width: 280px; diff --git a/bootstrap-1.1.1.min.css b/bootstrap-1.1.1.min.css index 2ed10b26d6..115f34e9ef 100644 --- a/bootstrap-1.1.1.min.css +++ b/bootstrap-1.1.1.min.css @@ -186,7 +186,7 @@ table .headerSortUp.purple,table .headerSortDown.purple{background-color:#e2d5f0 .nav a{display:block;float:none;padding:10px 10px 11px;line-height:19px;text-decoration:none;}.nav a:hover{color:#fff;text-decoration:none;} .nav .active a{background-color:#222;background-color:rgba(0, 0, 0, 0.5);} .nav.secondary-nav{float:right;margin-left:10px;margin-right:0;}.nav.secondary-nav .dropdown-menu{right:0;} -.nav .dropdown-toggle:hover,.nav .dropdown.open .dropdown-toggle{background-color:#444;background-color:rgba(255, 255, 255, 0.05);*background-color:#444;} +.nav .dropdown-toggle:hover,.nav .dropdown.open .dropdown-toggle{background:#444;background-color:rgba(255, 255, 255, 0.05);} .nav .dropdown-menu{background-color:#333;}.nav .dropdown-menu .dropdown-toggle{color:#fff;}.nav .dropdown-menu .dropdown-toggle.open{background-color:rgba(255, 255, 255, 0.05);} .nav .dropdown-menu li a{color:#999;text-shadow:0 1px 0 rgba(0, 0, 0, 0.5);}.nav .dropdown-menu li a:hover{background-color:#191919;background-repeat:repeat-x;background-image:-khtml-gradient(linear, left top, left bottom, from(#292929), to(#191919));background-image:-moz-linear-gradient(top, #292929, #191919);background-image:-ms-linear-gradient(top, #292929, #191919);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #292929), color-stop(100%, #191919));background-image:-webkit-linear-gradient(top, #292929, #191919);background-image:-o-linear-gradient(top, #292929, #191919);background-image:linear-gradient(top, #292929, #191919);color:#fff;} .nav .dropdown-menu .divider{background-color:#222;border-color:#444;} @@ -195,12 +195,12 @@ table .headerSortUp.purple,table .headerSortDown.purple{background-color:#e2d5f0 .dropdown-menu{background-color:#fff;float:left;display:none;position:absolute;top:40px;min-width:160px;max-width:220px;_width:160px;margin-left:0;margin-right:0;padding:6px 0;zoom:1;border-color:#999;border-color:rgba(0, 0, 0, 0.2);border-style:solid;border-width:0 1px 1px;-webkit-border-radius:0 0 6px 6px;-moz-border-radius:0 0 6px 6px;border-radius:0 0 6px 6px;-webkit-box-shadow:0 2px 4px rgba(0, 0, 0, 0.2);-moz-box-shadow:0 2px 4px rgba(0, 0, 0, 0.2);box-shadow:0 2px 4px rgba(0, 0, 0, 0.2);-webkit-background-clip:padding-box;-moz-background-clip:padding-box;background-clip:padding-box;}.dropdown-menu li{float:none;display:block;background-color:none;} .dropdown-menu a{display:block;padding:4px 15px;clear:both;font-weight:normal;line-height:18px;color:#808080;text-shadow:0 1px 0 #fff;}.dropdown-menu a:hover{background-color:#dddddd;background-repeat:repeat-x;background-image:-khtml-gradient(linear, left top, left bottom, from(#eeeeee), to(#dddddd));background-image:-moz-linear-gradient(top, #eeeeee, #dddddd);background-image:-ms-linear-gradient(top, #eeeeee, #dddddd);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #eeeeee), color-stop(100%, #dddddd));background-image:-webkit-linear-gradient(top, #eeeeee, #dddddd);background-image:-o-linear-gradient(top, #eeeeee, #dddddd);background-image:linear-gradient(top, #eeeeee, #dddddd);color:#404040;text-decoration:none;-webkit-box-shadow:inset 0 1px 0 rgba(0, 0, 0, 0.025),inset 0 -1px rgba(0, 0, 0, 0.025);-moz-box-shadow:inset 0 1px 0 rgba(0, 0, 0, 0.025),inset 0 -1px rgba(0, 0, 0, 0.025);box-shadow:inset 0 1px 0 rgba(0, 0, 0, 0.025),inset 0 -1px rgba(0, 0, 0, 0.025);} .dropdown-menu .divider{height:1px;margin:5px 0;overflow:hidden;background-color:#eee;border-bottom:1px solid #fff;} -.dropdown.open .dropdown-toggle{color:#fff;background-color:#ccc;background-color:rgba(0, 0, 0, 0.3);*background-color:#ccc;} +.dropdown.open .dropdown-toggle{color:#fff;background:#ccc;background-color:rgba(0, 0, 0, 0.3);} .dropdown.open .dropdown-menu{display:block;} .tabs,.pills{margin:0 0 20px;padding:0;list-style:none;zoom:1;margin-bottom:18px;}.tabs:before,.pills:before,.tabs:after,.pills:after{display:table;content:"";} .tabs:after,.pills:after{clear:both;} .tabs>li,.pills>li{float:left;}.tabs>li>a,.pills>li>a{display:block;} -.tabs{width:100%;border-bottom:1px solid #ddd;}.tabs>li{position:relative;}.tabs>li>a{margin-bottom:-1px;margin-right:2px;padding:0 15px;line-height:35px;-webkit-border-radius:4px 4px 0 0;-moz-border-radius:4px 4px 0 0;border-radius:4px 4px 0 0;}.tabs>li>a:hover{background-color:#eee;border-bottom:1px solid #ddd;text-decoration:none;} +.tabs{width:100%;border-bottom:1px solid #ddd;}.tabs>li{position:relative;top:1px;}.tabs>li>a{margin-right:2px;padding:0 15px;line-height:35px;-webkit-border-radius:4px 4px 0 0;-moz-border-radius:4px 4px 0 0;border-radius:4px 4px 0 0;}.tabs>li>a:hover{background-color:#eee;border-bottom:1px solid #ddd;text-decoration:none;} .tabs>li.active>a{background-color:#fff;padding:0 14px;border:1px solid #ddd;border-bottom:0;color:#808080;} .tabs .dropdown-menu{top:35px;border-width:1px;-webkit-border-radius:0 6px 6px 6px;-moz-border-radius:0 6px 6px 6px;border-radius:0 6px 6px 6px;} .tabs .dropdown-toggle:after{border-top-color:#999;margin-top:15px;margin-left:5px;} @@ -255,6 +255,6 @@ button.btn::-moz-focus-inner,input[type=submit].btn::-moz-focus-inner{padding: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-color:#333;background-color:rgba(0, 0, 0, 0.8);*background-color:#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 .inner{background:#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 a4bc6b855a..f7f5d75bbf 100644 --- a/lib/patterns.less +++ b/lib/patterns.less @@ -147,9 +147,8 @@ // Dropdowns within the .nav .dropdown-toggle:hover, .dropdown.open .dropdown-toggle { - background-color: #444; + background: #444; background-color: rgba(255,255,255,.05); - *background-color: #444; // IE6-7 } .dropdown-menu { background-color: #333; @@ -253,9 +252,8 @@ .dropdown.open { .dropdown-toggle { color: #fff; - background-color: #ccc; + background: #ccc; background-color: rgba(0,0,0,.3); - *background-color: #ccc; /* ie6 -7 */ } .dropdown-menu { display: block; @@ -284,8 +282,8 @@ border-bottom: 1px solid #ddd; > li { position: relative; // For the dropdowns mostly + top: 1px; > a { - margin-bottom: -1px; margin-right: 2px; padding: 0 15px; line-height: (@baseline * 2) - 1; @@ -744,9 +742,8 @@ input[type=submit].btn { height: 0; } .inner { - background-color: #333; + background: #333; background-color: rgba(0,0,0,.8); - *background-color: #333; /* IE 6-7 */ padding: 3px; overflow: hidden; width: 280px; From 49e343c464c931210e6ffc896fb7a511e5e773d0 Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Tue, 30 Aug 2011 23:08:34 -0700 Subject: [PATCH 11/14] ie7 background toggle open --- bootstrap-1.1.1.css | 3 ++- bootstrap-1.1.1.min.css | 2 +- lib/patterns.less | 3 ++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/bootstrap-1.1.1.css b/bootstrap-1.1.1.css index e4387ec460..cb6cd43b5e 100644 --- a/bootstrap-1.1.1.css +++ b/bootstrap-1.1.1.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: Tue Aug 30 23:02:58 PDT 2011 + * Date: Tue Aug 30 23:08:30 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). @@ -1232,6 +1232,7 @@ table .headerSortUp.purple, table .headerSortDown.purple { color: #fff; } .nav .dropdown-menu .dropdown-toggle.open { + background: #444; background-color: rgba(255, 255, 255, 0.05); } .nav .dropdown-menu li a { diff --git a/bootstrap-1.1.1.min.css b/bootstrap-1.1.1.min.css index 115f34e9ef..a00127b604 100644 --- a/bootstrap-1.1.1.min.css +++ b/bootstrap-1.1.1.min.css @@ -187,7 +187,7 @@ table .headerSortUp.purple,table .headerSortDown.purple{background-color:#e2d5f0 .nav .active a{background-color:#222;background-color:rgba(0, 0, 0, 0.5);} .nav.secondary-nav{float:right;margin-left:10px;margin-right:0;}.nav.secondary-nav .dropdown-menu{right:0;} .nav .dropdown-toggle:hover,.nav .dropdown.open .dropdown-toggle{background:#444;background-color:rgba(255, 255, 255, 0.05);} -.nav .dropdown-menu{background-color:#333;}.nav .dropdown-menu .dropdown-toggle{color:#fff;}.nav .dropdown-menu .dropdown-toggle.open{background-color:rgba(255, 255, 255, 0.05);} +.nav .dropdown-menu{background-color:#333;}.nav .dropdown-menu .dropdown-toggle{color:#fff;}.nav .dropdown-menu .dropdown-toggle.open{background:#444;background-color:rgba(255, 255, 255, 0.05);} .nav .dropdown-menu li a{color:#999;text-shadow:0 1px 0 rgba(0, 0, 0, 0.5);}.nav .dropdown-menu li a:hover{background-color:#191919;background-repeat:repeat-x;background-image:-khtml-gradient(linear, left top, left bottom, from(#292929), to(#191919));background-image:-moz-linear-gradient(top, #292929, #191919);background-image:-ms-linear-gradient(top, #292929, #191919);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #292929), color-stop(100%, #191919));background-image:-webkit-linear-gradient(top, #292929, #191919);background-image:-o-linear-gradient(top, #292929, #191919);background-image:linear-gradient(top, #292929, #191919);color:#fff;} .nav .dropdown-menu .divider{background-color:#222;border-color:#444;} .dropdown{position:relative;} diff --git a/lib/patterns.less b/lib/patterns.less index f7f5d75bbf..c7397f094d 100644 --- a/lib/patterns.less +++ b/lib/patterns.less @@ -155,6 +155,7 @@ .dropdown-toggle { color: #fff; &.open { + background: #444; background-color: rgba(255,255,255,.05); } } @@ -320,7 +321,7 @@ // Basic pill nav .pills { a { - margin: 5px 3px 5px 0; + margin: 5px 3px 5px 0; padding: 0 15px; text-shadow: 0 1px 1px #fff; line-height: 30px; From 588cb1c06d372817e7be2a44384b177bef660f53 Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Tue, 30 Aug 2011 23:25:37 -0700 Subject: [PATCH 12/14] revert dhg mdo suggestion for fixing ie --- bootstrap-1.1.1.css | 17 ++++++++++++----- bootstrap-1.1.1.min.css | 8 ++++---- lib/patterns.less | 13 ++++++++----- 3 files changed, 24 insertions(+), 14 deletions(-) diff --git a/bootstrap-1.1.1.css b/bootstrap-1.1.1.css index cb6cd43b5e..650d28a27d 100644 --- a/bootstrap-1.1.1.css +++ b/bootstrap-1.1.1.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: Tue Aug 30 23:08:30 PDT 2011 + * Date: Tue Aug 30 23:25:32 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). @@ -1222,8 +1222,9 @@ table .headerSortUp.purple, table .headerSortDown.purple { right: 0; } .nav .dropdown-toggle:hover, .nav .dropdown.open .dropdown-toggle { - background: #444; + background-color: #444; background-color: rgba(255, 255, 255, 0.05); + *background-color: #444; } .nav .dropdown-menu { background-color: #333; @@ -1232,8 +1233,8 @@ table .headerSortUp.purple, table .headerSortDown.purple { color: #fff; } .nav .dropdown-menu .dropdown-toggle.open { - background: #444; background-color: rgba(255, 255, 255, 0.05); + *background-color: #444; } .nav .dropdown-menu li a { color: #999; @@ -1341,8 +1342,11 @@ table .headerSortUp.purple, table .headerSortDown.purple { } .dropdown.open .dropdown-toggle { color: #fff; - background: #ccc; + background-color: #ccc; background-color: rgba(0, 0, 0, 0.3); + *background-color: #ccc; + /* ie6 -7 */ + } .dropdown.open .dropdown-menu { display: block; @@ -1879,8 +1883,11 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { height: 0; } .popover .inner { - background: #333; + background-color: #333; background-color: rgba(0, 0, 0, 0.8); + *background-color: #333; + /* IE 6-7 */ + padding: 3px; overflow: hidden; width: 280px; diff --git a/bootstrap-1.1.1.min.css b/bootstrap-1.1.1.min.css index a00127b604..8238cbbc6f 100644 --- a/bootstrap-1.1.1.min.css +++ b/bootstrap-1.1.1.min.css @@ -186,8 +186,8 @@ table .headerSortUp.purple,table .headerSortDown.purple{background-color:#e2d5f0 .nav a{display:block;float:none;padding:10px 10px 11px;line-height:19px;text-decoration:none;}.nav a:hover{color:#fff;text-decoration:none;} .nav .active a{background-color:#222;background-color:rgba(0, 0, 0, 0.5);} .nav.secondary-nav{float:right;margin-left:10px;margin-right:0;}.nav.secondary-nav .dropdown-menu{right:0;} -.nav .dropdown-toggle:hover,.nav .dropdown.open .dropdown-toggle{background:#444;background-color:rgba(255, 255, 255, 0.05);} -.nav .dropdown-menu{background-color:#333;}.nav .dropdown-menu .dropdown-toggle{color:#fff;}.nav .dropdown-menu .dropdown-toggle.open{background:#444;background-color:rgba(255, 255, 255, 0.05);} +.nav .dropdown-toggle:hover,.nav .dropdown.open .dropdown-toggle{background-color:#444;background-color:rgba(255, 255, 255, 0.05);*background-color:#444;} +.nav .dropdown-menu{background-color:#333;}.nav .dropdown-menu .dropdown-toggle{color:#fff;}.nav .dropdown-menu .dropdown-toggle.open{background-color:rgba(255, 255, 255, 0.05);*background-color:#444;} .nav .dropdown-menu li a{color:#999;text-shadow:0 1px 0 rgba(0, 0, 0, 0.5);}.nav .dropdown-menu li a:hover{background-color:#191919;background-repeat:repeat-x;background-image:-khtml-gradient(linear, left top, left bottom, from(#292929), to(#191919));background-image:-moz-linear-gradient(top, #292929, #191919);background-image:-ms-linear-gradient(top, #292929, #191919);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #292929), color-stop(100%, #191919));background-image:-webkit-linear-gradient(top, #292929, #191919);background-image:-o-linear-gradient(top, #292929, #191919);background-image:linear-gradient(top, #292929, #191919);color:#fff;} .nav .dropdown-menu .divider{background-color:#222;border-color:#444;} .dropdown{position:relative;} @@ -195,7 +195,7 @@ table .headerSortUp.purple,table .headerSortDown.purple{background-color:#e2d5f0 .dropdown-menu{background-color:#fff;float:left;display:none;position:absolute;top:40px;min-width:160px;max-width:220px;_width:160px;margin-left:0;margin-right:0;padding:6px 0;zoom:1;border-color:#999;border-color:rgba(0, 0, 0, 0.2);border-style:solid;border-width:0 1px 1px;-webkit-border-radius:0 0 6px 6px;-moz-border-radius:0 0 6px 6px;border-radius:0 0 6px 6px;-webkit-box-shadow:0 2px 4px rgba(0, 0, 0, 0.2);-moz-box-shadow:0 2px 4px rgba(0, 0, 0, 0.2);box-shadow:0 2px 4px rgba(0, 0, 0, 0.2);-webkit-background-clip:padding-box;-moz-background-clip:padding-box;background-clip:padding-box;}.dropdown-menu li{float:none;display:block;background-color:none;} .dropdown-menu a{display:block;padding:4px 15px;clear:both;font-weight:normal;line-height:18px;color:#808080;text-shadow:0 1px 0 #fff;}.dropdown-menu a:hover{background-color:#dddddd;background-repeat:repeat-x;background-image:-khtml-gradient(linear, left top, left bottom, from(#eeeeee), to(#dddddd));background-image:-moz-linear-gradient(top, #eeeeee, #dddddd);background-image:-ms-linear-gradient(top, #eeeeee, #dddddd);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #eeeeee), color-stop(100%, #dddddd));background-image:-webkit-linear-gradient(top, #eeeeee, #dddddd);background-image:-o-linear-gradient(top, #eeeeee, #dddddd);background-image:linear-gradient(top, #eeeeee, #dddddd);color:#404040;text-decoration:none;-webkit-box-shadow:inset 0 1px 0 rgba(0, 0, 0, 0.025),inset 0 -1px rgba(0, 0, 0, 0.025);-moz-box-shadow:inset 0 1px 0 rgba(0, 0, 0, 0.025),inset 0 -1px rgba(0, 0, 0, 0.025);box-shadow:inset 0 1px 0 rgba(0, 0, 0, 0.025),inset 0 -1px rgba(0, 0, 0, 0.025);} .dropdown-menu .divider{height:1px;margin:5px 0;overflow:hidden;background-color:#eee;border-bottom:1px solid #fff;} -.dropdown.open .dropdown-toggle{color:#fff;background:#ccc;background-color:rgba(0, 0, 0, 0.3);} +.dropdown.open .dropdown-toggle{color:#fff;background-color:#ccc;background-color:rgba(0, 0, 0, 0.3);*background-color:#ccc;} .dropdown.open .dropdown-menu{display:block;} .tabs,.pills{margin:0 0 20px;padding:0;list-style:none;zoom:1;margin-bottom:18px;}.tabs:before,.pills:before,.tabs:after,.pills:after{display:table;content:"";} .tabs:after,.pills:after{clear:both;} @@ -255,6 +255,6 @@ button.btn::-moz-focus-inner,input[type=submit].btn::-moz-focus-inner{padding: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:#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 .inner{background-color:#333;background-color:rgba(0, 0, 0, 0.8);*background-color:#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-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 c7397f094d..38fbd8da06 100644 --- a/lib/patterns.less +++ b/lib/patterns.less @@ -147,16 +147,17 @@ // Dropdowns within the .nav .dropdown-toggle:hover, .dropdown.open .dropdown-toggle { - background: #444; + background-color: #444; background-color: rgba(255,255,255,.05); + *background-color: #444; // IE6-7 } .dropdown-menu { background-color: #333; .dropdown-toggle { color: #fff; &.open { - background: #444; background-color: rgba(255,255,255,.05); + *background-color: #444; } } li a { @@ -253,8 +254,9 @@ .dropdown.open { .dropdown-toggle { color: #fff; - background: #ccc; + background-color: #ccc; background-color: rgba(0,0,0,.3); + *background-color: #ccc; /* ie6 -7 */ } .dropdown-menu { display: block; @@ -321,7 +323,7 @@ // Basic pill nav .pills { a { - margin: 5px 3px 5px 0; + margin: 5px 3px 5px 0; padding: 0 15px; text-shadow: 0 1px 1px #fff; line-height: 30px; @@ -743,8 +745,9 @@ input[type=submit].btn { height: 0; } .inner { - background: #333; + background-color: #333; background-color: rgba(0,0,0,.8); + *background-color: #333; /* IE 6-7 */ padding: 3px; overflow: hidden; width: 280px; From 4fb1c5bd4b527797183a60e752f0276b01637fd5 Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Tue, 30 Aug 2011 23:34:19 -0700 Subject: [PATCH 13/14] rename all 1.1.1 stuff -> 1.2.0 and remove templates dir and fluid.html --- Makefile | 4 +- README.md | 2 +- bootstrap-1.1.1.css => bootstrap-1.2.0.css | 4 +- ...p-1.1.1.min.css => bootstrap-1.2.0.min.css | 0 docs/index.html | 4 +- examples/hero.html | 4 +- lib/bootstrap.less | 2 +- templates/fluid.html | 81 ------------------- 8 files changed, 10 insertions(+), 91 deletions(-) rename bootstrap-1.1.1.css => bootstrap-1.2.0.css (99%) rename bootstrap-1.1.1.min.css => bootstrap-1.2.0.min.css (100%) delete mode 100644 templates/fluid.html diff --git a/Makefile b/Makefile index f4f367567f..82603c41f6 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ DATE=$(shell DATE) -BOOTSTRAP = ./bootstrap-1.1.1.css -BOOTSTRAP_MIN = ./bootstrap-1.1.1.min.css +BOOTSTRAP = ./bootstrap-1.2.0.css +BOOTSTRAP_MIN = ./bootstrap-1.2.0.min.css BOOTSTRAP_LESS = ./lib/bootstrap.less LESS_COMPESSOR ?= `which lessc` WATCHR ?= `which watchr` diff --git a/README.md b/README.md index 8d0e693c97..76b6e4563c 100644 --- a/README.md +++ b/README.md @@ -18,7 +18,7 @@ Here's what the LESS version looks like: Or if you prefer, the standard css way: - + For more info, refer to the docs! diff --git a/bootstrap-1.1.1.css b/bootstrap-1.2.0.css similarity index 99% rename from bootstrap-1.1.1.css rename to bootstrap-1.2.0.css index 650d28a27d..afb6b584a5 100644 --- a/bootstrap-1.1.1.css +++ b/bootstrap-1.2.0.css @@ -1,12 +1,12 @@ /*! - * Bootstrap v1.1.1 + * Bootstrap v1.2.0 * * Copyright 2011 Twitter, Inc * Licensed under the Apache License v2.0 * http://www.apache.org/licenses/LICENSE-2.0 * * Designed and built with all the love in the world @twitter by @mdo and @fat. - * Date: Tue Aug 30 23:25:32 PDT 2011 + * Date: Tue Aug 30 23:30:34 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/bootstrap-1.1.1.min.css b/bootstrap-1.2.0.min.css similarity index 100% rename from bootstrap-1.1.1.min.css rename to bootstrap-1.2.0.min.css diff --git a/docs/index.html b/docs/index.html index 415ea6a3b0..9ec827fb1d 100644 --- a/docs/index.html +++ b/docs/index.html @@ -12,7 +12,7 @@ - + @@ -78,7 +78,7 @@
Hotlink the CSS

For the quickest and easiest start, just copy this snippet into your webpage.

- +
diff --git a/examples/hero.html b/examples/hero.html index a0025f2de2..ef773c5d01 100644 --- a/examples/hero.html +++ b/examples/hero.html @@ -12,7 +12,7 @@ - + @@ -27,7 +27,7 @@

Project name

-
    +
    • Home
    • About
    • Contact
      • diff --git a/lib/bootstrap.less b/lib/bootstrap.less index aa0e24b969..c31bd725da 100644 --- a/lib/bootstrap.less +++ b/lib/bootstrap.less @@ -1,5 +1,5 @@ /*! - * Bootstrap v1.1.1 + * Bootstrap v1.2.0 * * Copyright 2011 Twitter, Inc * Licensed under the Apache License v2.0 diff --git a/templates/fluid.html b/templates/fluid.html deleted file mode 100644 index 59a6ddb1c1..0000000000 --- a/templates/fluid.html +++ /dev/null @@ -1,81 +0,0 @@ - - - - - Bootstrap, from Twitter - - - - - - - - - - - - - - - - - - - - - - - - - - -
      -
      -

      Project name

      - -
      -
      - -
      - - -
      - -
      -
      - -
      -

      Fluid page template

      -

      Vestibulum id ligula porta felis euismod semper. Integer posuere erat a ante venenatis dapibus posuere velit aliquet. Duis mollis, est non commodo luctus, nisi erat porttitor ligula, eget lacinia odio sem nec elit.

      -

      Learn more »

      -
      - -
      -
      -

      Heading

      -
      -
      -

      Heading

      -
      -
      -

      Heading

      -
      -
      -
      - -
      - - - \ No newline at end of file From f6a4dd95b62771b105530c85a98901f06bfecdd7 Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Wed, 31 Aug 2011 10:55:53 -0700 Subject: [PATCH 14/14] try daves background thing again... --- bootstrap-1.2.0.css | 25 +++++++++---------------- bootstrap-1.2.0.min.css | 8 ++++---- lib/patterns.less | 19 ++++++++----------- 3 files changed, 21 insertions(+), 31 deletions(-) diff --git a/bootstrap-1.2.0.css b/bootstrap-1.2.0.css index b1cc2f1362..98f1b20db3 100644 --- a/bootstrap-1.2.0.css +++ b/bootstrap-1.2.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: Tue Aug 30 23:37:26 PDT 2011 + * Date: Wed Aug 31 10:55:48 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). @@ -1222,9 +1222,8 @@ table .headerSortUp.purple, table .headerSortDown.purple { right: 0; } .nav .dropdown-toggle:hover, .nav .dropdown.open .dropdown-toggle { - background-color: #444; - background-color: rgba(255, 255, 255, 0.05); - *background-color: #444; + background: #444; + background: rgba(255, 255, 255, 0.05); } .nav .dropdown-menu { background-color: #333; @@ -1233,8 +1232,8 @@ table .headerSortUp.purple, table .headerSortDown.purple { color: #fff; } .nav .dropdown-menu .dropdown-toggle.open { - background-color: rgba(255, 255, 255, 0.05); - *background-color: #444; + background: #444; + background: rgba(255, 255, 255, 0.05); } .nav .dropdown-menu li a { color: #999; @@ -1342,11 +1341,8 @@ table .headerSortUp.purple, table .headerSortDown.purple { } .dropdown.open .dropdown-toggle { color: #fff; - background-color: #ccc; - background-color: rgba(0, 0, 0, 0.3); - *background-color: #ccc; - /* ie6 -7 */ - + background: #ccc; + background: rgba(0, 0, 0, 0.3); } .dropdown.open .dropdown-menu { display: block; @@ -1883,11 +1879,8 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { height: 0; } .popover .inner { - background-color: #333; - background-color: rgba(0, 0, 0, 0.8); - *background-color: #333; - /* IE 6-7 */ - + background: #333; + background: rgba(0, 0, 0, 0.8); padding: 3px; overflow: hidden; width: 280px; diff --git a/bootstrap-1.2.0.min.css b/bootstrap-1.2.0.min.css index 8238cbbc6f..db834b105f 100644 --- a/bootstrap-1.2.0.min.css +++ b/bootstrap-1.2.0.min.css @@ -186,8 +186,8 @@ table .headerSortUp.purple,table .headerSortDown.purple{background-color:#e2d5f0 .nav a{display:block;float:none;padding:10px 10px 11px;line-height:19px;text-decoration:none;}.nav a:hover{color:#fff;text-decoration:none;} .nav .active a{background-color:#222;background-color:rgba(0, 0, 0, 0.5);} .nav.secondary-nav{float:right;margin-left:10px;margin-right:0;}.nav.secondary-nav .dropdown-menu{right:0;} -.nav .dropdown-toggle:hover,.nav .dropdown.open .dropdown-toggle{background-color:#444;background-color:rgba(255, 255, 255, 0.05);*background-color:#444;} -.nav .dropdown-menu{background-color:#333;}.nav .dropdown-menu .dropdown-toggle{color:#fff;}.nav .dropdown-menu .dropdown-toggle.open{background-color:rgba(255, 255, 255, 0.05);*background-color:#444;} +.nav .dropdown-toggle:hover,.nav .dropdown.open .dropdown-toggle{background:#444;background:rgba(255, 255, 255, 0.05);} +.nav .dropdown-menu{background-color:#333;}.nav .dropdown-menu .dropdown-toggle{color:#fff;}.nav .dropdown-menu .dropdown-toggle.open{background:#444;background:rgba(255, 255, 255, 0.05);} .nav .dropdown-menu li a{color:#999;text-shadow:0 1px 0 rgba(0, 0, 0, 0.5);}.nav .dropdown-menu li a:hover{background-color:#191919;background-repeat:repeat-x;background-image:-khtml-gradient(linear, left top, left bottom, from(#292929), to(#191919));background-image:-moz-linear-gradient(top, #292929, #191919);background-image:-ms-linear-gradient(top, #292929, #191919);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #292929), color-stop(100%, #191919));background-image:-webkit-linear-gradient(top, #292929, #191919);background-image:-o-linear-gradient(top, #292929, #191919);background-image:linear-gradient(top, #292929, #191919);color:#fff;} .nav .dropdown-menu .divider{background-color:#222;border-color:#444;} .dropdown{position:relative;} @@ -195,7 +195,7 @@ table .headerSortUp.purple,table .headerSortDown.purple{background-color:#e2d5f0 .dropdown-menu{background-color:#fff;float:left;display:none;position:absolute;top:40px;min-width:160px;max-width:220px;_width:160px;margin-left:0;margin-right:0;padding:6px 0;zoom:1;border-color:#999;border-color:rgba(0, 0, 0, 0.2);border-style:solid;border-width:0 1px 1px;-webkit-border-radius:0 0 6px 6px;-moz-border-radius:0 0 6px 6px;border-radius:0 0 6px 6px;-webkit-box-shadow:0 2px 4px rgba(0, 0, 0, 0.2);-moz-box-shadow:0 2px 4px rgba(0, 0, 0, 0.2);box-shadow:0 2px 4px rgba(0, 0, 0, 0.2);-webkit-background-clip:padding-box;-moz-background-clip:padding-box;background-clip:padding-box;}.dropdown-menu li{float:none;display:block;background-color:none;} .dropdown-menu a{display:block;padding:4px 15px;clear:both;font-weight:normal;line-height:18px;color:#808080;text-shadow:0 1px 0 #fff;}.dropdown-menu a:hover{background-color:#dddddd;background-repeat:repeat-x;background-image:-khtml-gradient(linear, left top, left bottom, from(#eeeeee), to(#dddddd));background-image:-moz-linear-gradient(top, #eeeeee, #dddddd);background-image:-ms-linear-gradient(top, #eeeeee, #dddddd);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #eeeeee), color-stop(100%, #dddddd));background-image:-webkit-linear-gradient(top, #eeeeee, #dddddd);background-image:-o-linear-gradient(top, #eeeeee, #dddddd);background-image:linear-gradient(top, #eeeeee, #dddddd);color:#404040;text-decoration:none;-webkit-box-shadow:inset 0 1px 0 rgba(0, 0, 0, 0.025),inset 0 -1px rgba(0, 0, 0, 0.025);-moz-box-shadow:inset 0 1px 0 rgba(0, 0, 0, 0.025),inset 0 -1px rgba(0, 0, 0, 0.025);box-shadow:inset 0 1px 0 rgba(0, 0, 0, 0.025),inset 0 -1px rgba(0, 0, 0, 0.025);} .dropdown-menu .divider{height:1px;margin:5px 0;overflow:hidden;background-color:#eee;border-bottom:1px solid #fff;} -.dropdown.open .dropdown-toggle{color:#fff;background-color:#ccc;background-color:rgba(0, 0, 0, 0.3);*background-color:#ccc;} +.dropdown.open .dropdown-toggle{color:#fff;background:#ccc;background:rgba(0, 0, 0, 0.3);} .dropdown.open .dropdown-menu{display:block;} .tabs,.pills{margin:0 0 20px;padding:0;list-style:none;zoom:1;margin-bottom:18px;}.tabs:before,.pills:before,.tabs:after,.pills:after{display:table;content:"";} .tabs:after,.pills:after{clear:both;} @@ -255,6 +255,6 @@ button.btn::-moz-focus-inner,input[type=submit].btn::-moz-focus-inner{padding: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-color:#333;background-color:rgba(0, 0, 0, 0.8);*background-color:#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 .inner{background:#333;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-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 38fbd8da06..91294103c6 100644 --- a/lib/patterns.less +++ b/lib/patterns.less @@ -147,17 +147,16 @@ // Dropdowns within the .nav .dropdown-toggle:hover, .dropdown.open .dropdown-toggle { - background-color: #444; - background-color: rgba(255,255,255,.05); - *background-color: #444; // IE6-7 + background: #444; + background: rgba(255,255,255,.05); } .dropdown-menu { background-color: #333; .dropdown-toggle { color: #fff; &.open { - background-color: rgba(255,255,255,.05); - *background-color: #444; + background: #444; + background: rgba(255,255,255,.05); } } li a { @@ -254,9 +253,8 @@ .dropdown.open { .dropdown-toggle { color: #fff; - background-color: #ccc; - background-color: rgba(0,0,0,.3); - *background-color: #ccc; /* ie6 -7 */ + background: #ccc; + background: rgba(0,0,0,.3); } .dropdown-menu { display: block; @@ -745,9 +743,8 @@ input[type=submit].btn { height: 0; } .inner { - background-color: #333; - background-color: rgba(0,0,0,.8); - *background-color: #333; /* IE 6-7 */ + background: #333; + background: rgba(0,0,0,.8); padding: 3px; overflow: hidden; width: 280px;