From aaf9f752c476877fa99a2f54576e3785b397dec6 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 20 Aug 2011 23:25:22 -0700 Subject: docs spacing, spare divs in a few places, updating css spacing --- lib/preboot.less | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) (limited to 'lib/preboot.less') diff --git a/lib/preboot.less b/lib/preboot.less index 9aad126d3..941f2817c 100644 --- a/lib/preboot.less +++ b/lib/preboot.less @@ -145,39 +145,39 @@ // Border Radius .border-radius(@radius: 5px) { -webkit-border-radius: @radius; - -moz-border-radius: @radius; - border-radius: @radius; + -moz-border-radius: @radius; + border-radius: @radius; } // Drop shadows .box-shadow(@shadow: 0 1px 3px rgba(0,0,0,.25)) { -webkit-box-shadow: @shadow; - -moz-box-shadow: @shadow; - box-shadow: @shadow; + -moz-box-shadow: @shadow; + box-shadow: @shadow; } // Transitions .transition(@transition) { -webkit-transition: @transition; - -moz-transition: @transition; - transition: @transition; + -moz-transition: @transition; + transition: @transition; } // Background clipping .background-clip(@clip) { -webkit-background-clip: @clip; - -moz-background-clip: @clip; - background-clip: @clip; + -moz-background-clip: @clip; + background-clip: @clip; } // CSS3 Content Columns .content-columns(@columnCount, @columnGap: 20px) { -webkit-column-count: @columnCount; - -webkit-column-gap: @columnGap; - -moz-column-count: @columnCount; - -moz-column-gap: @columnGap; - column-count: @columnCount; - column-gap: @columnGap; + -moz-column-count: @columnCount; + column-count: @columnCount; + -webkit-column-gap: @columnGap; + -moz-column-gap: @columnGap; + column-gap: @columnGap; } // Buttons @@ -265,6 +265,6 @@ .opacity(@opacity: 100) { filter: e(%("alpha(opacity=%d)", @opacity)); -khtml-opacity: @opacity / 100; - -moz-opacity: @opacity / 100; - opacity: @opacity / 100; + -moz-opacity: @opacity / 100; + opacity: @opacity / 100; } \ No newline at end of file -- cgit v1.2.3 From 254e70550e2e10372736939702ee77072884bde2 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 21 Aug 2011 17:06:37 -0700 Subject: remove 60px top margin on body and tweak a few other things --- lib/preboot.less | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'lib/preboot.less') diff --git a/lib/preboot.less b/lib/preboot.less index 941f2817c..8b913604a 100644 --- a/lib/preboot.less +++ b/lib/preboot.less @@ -20,7 +20,6 @@ // Accent Colors @blue: #049CDB; -@blueDark: #0064CD; @green: #46a546; @red: #9d261d; @yellow: #ffc40d; @@ -181,7 +180,7 @@ } // Buttons -.button(@color: #fff, @padding: 4px 14px, @textColor: #333, @textShadow: 0 1px 1px rgba(255,255,255,.75), @fontSize: 13px, @borderColor: rgba(0,0,0,.1), @borderRadius: 4px) { +/*.button(@color: #fff, @padding: 4px 14px, @textColor: #333, @textShadow: 0 1px 1px rgba(255,255,255,.75), @fontSize: 13px, @borderColor: rgba(0,0,0,.1), @borderRadius: 4px) { display: inline-block; #gradient > .vertical-three-colors(@color, @color, 0.25, darken(@color, 10%)); padding: @padding; @@ -189,7 +188,7 @@ color: @textColor; font-size: @fontSize; line-height: @baseline; - border: 1px solid @borderColor; + border: 1px solid darken(@color, 10%); 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); @@ -199,7 +198,7 @@ color: @textColor; text-decoration: none; } -} +}*/ // Add an alphatransparency value to any background or border color (via Elyse Holladay) #translucent { -- cgit v1.2.3 From a98d2cccb8076b106e08e7ca76e59af013ab2851 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 21 Aug 2011 20:47:24 -0700 Subject: merge in master, resolve conflicts --- lib/preboot.less | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'lib/preboot.less') diff --git a/lib/preboot.less b/lib/preboot.less index 8b913604a..bf20b53fe 100644 --- a/lib/preboot.less +++ b/lib/preboot.less @@ -20,6 +20,7 @@ // Accent Colors @blue: #049CDB; +@blueDark: #0064CD; @green: #46a546; @red: #9d261d; @yellow: #ffc40d; @@ -188,8 +189,9 @@ color: @textColor; font-size: @fontSize; line-height: @baseline; - border: 1px solid darken(@color, 10%); - 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); @@ -222,8 +224,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) { @@ -235,8 +235,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) { -- cgit v1.2.3