diff options
| author | Mark Otto <[email protected]> | 2011-09-02 11:54:17 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2011-09-02 11:54:17 -0700 |
| commit | 6638f87f5052cf9e1869e9811124daef1c6c1355 (patch) | |
| tree | 91d12621a8c255ce7c05d71af98358affe40db62 /lib | |
| parent | 62f891640714d86e1c26a0d5c9da9ee63ac22f21 (diff) | |
| parent | db43777ddf2a72146621f385f54cba0d4103f80d (diff) | |
| download | bootstrap-6638f87f5052cf9e1869e9811124daef1c6c1355.tar.xz bootstrap-6638f87f5052cf9e1869e9811124daef1c6c1355.zip | |
resolve conflicts
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/preboot.less | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/preboot.less b/lib/preboot.less index f5d5a48d1..9a1d88b2c 100644 --- a/lib/preboot.less +++ b/lib/preboot.less @@ -240,6 +240,7 @@ background-image: -webkit-linear-gradient(top, @startColor, @endColor); // Safari 5.1+, Chrome 10+ background-image: -o-linear-gradient(top, @startColor, @endColor); // Opera 11.10 background-image: linear-gradient(top, @startColor, @endColor); // The standard + filter: e(%("progid:DXImageTransform.Microsoft.gradient(startColorstr='%d', endColorstr='%d', GradientType=0)",@startColor,@endColor)); // IE6 & IE7 } .directional (@startColor: #555, @endColor: #333, @deg: 45deg) { background-color: @endColor; |