2
0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-06-05 16:42:29 +03:00

resolve conflicts

This commit is contained in:
Mark Otto
2011-09-02 11:54:17 -07:00
3 changed files with 18 additions and 9 deletions
+1
View File
@@ -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;