From 7d7156bff9818c8d50affffb750b6019a9f20f26 Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Tue, 23 Aug 2011 20:16:39 -0700 Subject: optimized grid system from @necolas --- lib/scaffolding.less | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) (limited to 'lib/scaffolding.less') diff --git a/lib/scaffolding.less b/lib/scaffolding.less index b1900f012..a75a47c5f 100644 --- a/lib/scaffolding.less +++ b/lib/scaffolding.less @@ -9,6 +9,29 @@ .row { .clearfix(); + margin: 0 -20px; + + // Default columns + .span1, + .span2, + .span3, + .span4, + .span5, + .span6, + .span7, + .span8, + .span9, + .span10, + .span11, + .span12, + .span13, + .span14, + .span15, + .span16 { + float: left; + margin-left: 20px; + *display: inline; // IE6 double margin bug fix. + } // Default columns .span1 { .columns(1); } -- cgit v1.2.3 From 0739583a46833b4813524e69726f79fe1b009542 Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Wed, 24 Aug 2011 15:55:08 -0700 Subject: optimize btn for outputted code + line-height: normal for firefox with adjusted padding --- lib/scaffolding.less | 65 +++++++++++++++++++++++++++++----------------------- 1 file changed, 36 insertions(+), 29 deletions(-) (limited to 'lib/scaffolding.less') diff --git a/lib/scaffolding.less b/lib/scaffolding.less index a75a47c5f..5dc054f93 100644 --- a/lib/scaffolding.less +++ b/lib/scaffolding.less @@ -118,73 +118,80 @@ a { } // Buttons -.btnColor(@primaryColor, @secondaryColor) { - #gradient > .vertical(@primaryColor, @secondaryColor); - text-shadow: 0 -1px 0 rgba(0,0,0,.25); - border-color: @secondaryColor @secondaryColor darken(@secondaryColor, 15%); - border-color: rgba(0,0,0,.1) rgba(0,0,0,.1) fadein(rgba(0,0,0,.1), 15%); -} - .btn { - // .button(#1174C6); + // Button Base cursor: pointer; display: inline-block; #gradient > .vertical-three-colors(#fff, #fff, 0.25, darken(#fff, 10%)); - padding: 4px 14px; + padding: 5px 14px 6px; text-shadow: 0 1px 1px rgba(255,255,255,.75); color: #333; font-size: 13px; - line-height: @baseline; + line-height: normal; 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; } + + // Transitions .transition(.1s linear all); + + // Colored Button Types &.primary, - &.danger { + &.danger, + &.danger:hover, + &.primary:hover { color: #fff; - &:hover { - color: #fff; - } } + &.primary { - .btnColor(@blue, @blueDark) + .btnColoring(@blue, @blueDark) } + &.danger { - .btnColor(lighten(@red, 15%), @red) - } - &.large { - font-size: 16px; - line-height: 28px; - .border-radius(6px); - } - &.small { - padding-right: 9px; - padding-left: 9px; - font-size: 11px; + .btnColoring(lighten(@red, 15%), @red) } + + // Active and Disabled states &.disabled { + cursor: default; background-image: none; .opacity(65); - cursor: default; } - // this can't be included with the .disabled def because IE8 and below will drop it ;_; &:disabled { + // disabled pseudo can't be included with .disabled + // def because IE8 and below will drop it ;_; + cursor: default; 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); } + + // Button Sizes + &.large { + font-size: 16px; + line-height: normal; + padding: 9px 14px 9px; + .border-radius(6px); + } + + &.small { + padding: 7px 9px 7px; + font-size: 11px; + } + } // Help Firefox not be a jerk about adding extra padding to buttons -- cgit v1.2.3 From 2d99e3f8a61ef9d4a40cd0cad109d0d89ae3c661 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 25 Aug 2011 00:13:40 -0700 Subject: base import of normalize into the reset css, tweaks to selector specificity across the board --- lib/scaffolding.less | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'lib/scaffolding.less') diff --git a/lib/scaffolding.less b/lib/scaffolding.less index 50f6c96cf..137230672 100644 --- a/lib/scaffolding.less +++ b/lib/scaffolding.less @@ -152,6 +152,7 @@ a { 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 ;_; @@ -159,10 +160,13 @@ a { background-image: none; .opacity(65); cursor: default; - color: #fff; + .box-shadow(none); + &.primary { + color: #fff; + } } &:active { - @shadow: inset 0 3px 7px rgba(0,0,0,.1), 0 1px 2px rgba(0,0,0,.05); + @shadow: inset 0 3px 7px rgba(0,0,0,.15), 0 1px 2px rgba(0,0,0,.05); .box-shadow(@shadow); } } -- cgit v1.2.3 From 50f484eed6e9161cb7e50531b0fa3f16ada549e0 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 25 Aug 2011 02:00:07 -0700 Subject: big update to change the alerts, normal and block level, to have simpler css and new colors independent of the base color scheme --- lib/scaffolding.less | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'lib/scaffolding.less') diff --git a/lib/scaffolding.less b/lib/scaffolding.less index 5dc054f93..f5bc68868 100644 --- a/lib/scaffolding.less +++ b/lib/scaffolding.less @@ -9,7 +9,7 @@ .row { .clearfix(); - margin: 0 -20px; + margin-left: -20px; // Default columns .span1, @@ -28,9 +28,9 @@ .span14, .span15, .span16 { + display: inline; float: left; margin-left: 20px; - *display: inline; // IE6 double margin bug fix. } // Default columns -- cgit v1.2.3 From 0e9d7c1c4d9552dda438d6eb5d2f175a99fd4501 Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Thu, 25 Aug 2011 13:31:46 -0700 Subject: update alert and button styling aproach --- lib/scaffolding.less | 88 +--------------------------------------------------- 1 file changed, 1 insertion(+), 87 deletions(-) (limited to 'lib/scaffolding.less') diff --git a/lib/scaffolding.less b/lib/scaffolding.less index f5bc68868..ad5cc7644 100644 --- a/lib/scaffolding.less +++ b/lib/scaffolding.less @@ -115,90 +115,4 @@ a { color: @linkColorHover; text-decoration: underline; } -} - -// Buttons -.btn { - // Button Base - cursor: pointer; - display: inline-block; - #gradient > .vertical-three-colors(#fff, #fff, 0.25, darken(#fff, 10%)); - padding: 5px 14px 6px; - text-shadow: 0 1px 1px rgba(255,255,255,.75); - color: #333; - font-size: 13px; - line-height: normal; - 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; - } - - // Transitions - .transition(.1s linear all); - - // Colored Button Types - &.primary, - &.danger, - &.danger:hover, - &.primary:hover { - color: #fff; - } - - &.primary { - .btnColoring(@blue, @blueDark) - } - - &.danger { - .btnColoring(lighten(@red, 15%), @red) - } - - // Active and Disabled states - &.disabled { - cursor: default; - background-image: none; - .opacity(65); - } - - &:disabled { - // disabled pseudo can't be included with .disabled - // def because IE8 and below will drop it ;_; - cursor: default; - background-image: none; - .opacity(65); - } - - &:active { - @shadow: inset 0 3px 7px rgba(0,0,0,.1), 0 1px 2px rgba(0,0,0,.05); - .box-shadow(@shadow); - } - - // Button Sizes - &.large { - font-size: 16px; - line-height: normal; - padding: 9px 14px 9px; - .border-radius(6px); - } - - &.small { - padding: 7px 9px 7px; - font-size: 11px; - } - -} - -// 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 7d821f18acf04cddd1067ee612773ce2f98cb4ac Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 25 Aug 2011 22:44:23 -0700 Subject: resolve issue #87 in this branch --- lib/scaffolding.less | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'lib/scaffolding.less') diff --git a/lib/scaffolding.less b/lib/scaffolding.less index ad5cc7644..6b7fa799f 100644 --- a/lib/scaffolding.less +++ b/lib/scaffolding.less @@ -81,20 +81,20 @@ body { } // Container (centered, fixed-width layouts) -div.container { +.container { width: 940px; margin: 0 auto; } // Fluid layouts (left aligned, with sidebar, min- & max-width content) -div.container-fluid { +.container-fluid { padding: 0 20px; .clearfix(); - div.sidebar { + .sidebar { float: left; width: 220px; } - div.content { + .content { min-width: 700px; max-width: 1180px; margin-left: 240px; -- cgit v1.2.3