diff options
| author | Mark Otto <[email protected]> | 2011-08-21 20:38:57 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2011-08-21 20:38:57 -0700 |
| commit | b59b82b032b2ef868e113b40014f36ff0d22adcd (patch) | |
| tree | 46d36989b971bca3c92aa8cdfeded2c4a3fb77b4 /lib/preboot.less | |
| parent | 14b77f3a2164a5348ec8d9841ddc3ace27a64e37 (diff) | |
| parent | 34a19915f4f8b53eb7a5f2ffa4c87f7d47853827 (diff) | |
| download | bootstrap-b59b82b032b2ef868e113b40014f36ff0d22adcd.tar.xz bootstrap-b59b82b032b2ef868e113b40014f36ff0d22adcd.zip | |
updated to resolve conflicts
Diffstat (limited to 'lib/preboot.less')
| -rw-r--r-- | lib/preboot.less | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/lib/preboot.less b/lib/preboot.less index 9aad126d3..15f1c4c3c 100644 --- a/lib/preboot.less +++ b/lib/preboot.less @@ -189,8 +189,9 @@ color: @textColor; font-size: @fontSize; line-height: @baseline; - border: 1px solid @borderColor; - 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); @@ -223,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) { @@ -236,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) { |