From df8b65445c332c6fa68858a8f839c24f8b4413ad Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Fri, 26 Aug 2011 19:31:50 -0700 Subject: small typo in offset generation --- lib/scaffolding.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/scaffolding.less b/lib/scaffolding.less index d1b621c13..ded9a1e5f 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); } -- cgit v1.2.3 From 589204803bc34575a8ca2c3e624864d3dc8e63ba Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Mon, 29 Aug 2011 21:41:12 -0700 Subject: remove duplicate defined btn class O_O --- lib/scaffolding.less | 88 +--------------------------------------------------- 1 file changed, 1 insertion(+), 87 deletions(-) (limited to 'lib') diff --git a/lib/scaffolding.less b/lib/scaffolding.less index 2bbb1dc6c..c0272908f 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 -- cgit v1.2.3 From efd6fd609c7e1406d40906d4aa14949345a2d5ff Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Mon, 29 Aug 2011 22:36:05 -0700 Subject: fix open ui for ie 7 --- lib/patterns.less | 1 + 1 file changed, 1 insertion(+) (limited to 'lib') diff --git a/lib/patterns.less b/lib/patterns.less index 219e26b3f..dba5af3aa 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 { -- cgit v1.2.3 From afec7859cc08b7d57100ab7d96f11a9df5bdb32e Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Mon, 29 Aug 2011 22:43:40 -0700 Subject: fix background color for ie7 -- negative margin bug still there though ;_; --- lib/patterns.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/patterns.less b/lib/patterns.less index dba5af3aa..a4bc6b855 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; -- cgit v1.2.3 From 2ed869c2eef1ad89a26ecfa187638db6f84774cd Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Tue, 30 Aug 2011 23:03:01 -0700 Subject: remove * hack for ie7 + remove -1 margin bug for ie7 --- lib/patterns.less | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) (limited to 'lib') diff --git a/lib/patterns.less b/lib/patterns.less index a4bc6b855..f7f5d75bb 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; -- cgit v1.2.3 From 49e343c464c931210e6ffc896fb7a511e5e773d0 Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Tue, 30 Aug 2011 23:08:34 -0700 Subject: ie7 background toggle open --- lib/patterns.less | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/patterns.less b/lib/patterns.less index f7f5d75bb..c7397f094 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; -- cgit v1.2.3 From 588cb1c06d372817e7be2a44384b177bef660f53 Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Tue, 30 Aug 2011 23:25:37 -0700 Subject: revert dhg mdo suggestion for fixing ie --- lib/patterns.less | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to 'lib') diff --git a/lib/patterns.less b/lib/patterns.less index c7397f094..38fbd8da0 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; -- cgit v1.2.3 From 4fb1c5bd4b527797183a60e752f0276b01637fd5 Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Tue, 30 Aug 2011 23:34:19 -0700 Subject: rename all 1.1.1 stuff -> 1.2.0 and remove templates dir and fluid.html --- lib/bootstrap.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/bootstrap.less b/lib/bootstrap.less index aa0e24b96..c31bd725d 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 -- cgit v1.2.3 From f6a4dd95b62771b105530c85a98901f06bfecdd7 Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Wed, 31 Aug 2011 10:55:53 -0700 Subject: try daves background thing again... --- lib/patterns.less | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) (limited to 'lib') diff --git a/lib/patterns.less b/lib/patterns.less index 38fbd8da0..91294103c 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; -- cgit v1.2.3