Skip to content
Browse files

Merge branch 'master' of github.com:twitter/bootstrap

  • Loading branch information...
2 parents 621f358 + ee6402b commit 8497d935adc278e91d54a3f3054eb9cbc45299a1 @fat fat committed
Showing with 8 additions and 8 deletions.
  1. +2 −2 lib/patterns.less
  2. +6 −6 lib/preboot.less
View
4 lib/patterns.less
@@ -460,7 +460,7 @@
border: 1px solid #ddd;
border: 1px solid rgba(0,0,0,.15);
.border-radius(3px);
- .box-shadow(0 1px 2px rgba(0,0,0,.05);
+ .box-shadow(0 1px 2px rgba(0,0,0,.05));
li {
display: inline;
a {
@@ -676,4 +676,4 @@
margin-bottom: 0;
}
}
-}
+}
View
12 lib/preboot.less
@@ -246,15 +246,15 @@
background-image: -o-linear-gradient(@deg, @startColor, @endColor); // Opera 11.10
background-image: linear-gradient(@deg, @startColor, @endColor); // The standard
}
- .vertical-three-colors(@startColor: #00b3ee, @midColor: #7a43b6, @colorStop: 0.5, @endColor: #c3325f) {
+ .vertical-three-colors(@startColor: #00b3ee, @midColor: #7a43b6, @colorStop: 50%, @endColor: #c3325f) {
background-color: @endColor;
background-repeat: no-repeat;
background-image: -webkit-gradient(linear, 0 0, 0 100%, from(@startColor), color-stop(@colorStop, @midColor), to(@endColor));
- background-image: -webkit-linear-gradient(@startColor, color-stop(@colorStop, @midColor), @endColor);
- background-image: -moz-linear-gradient(@startColor, @midColor @colorStop*100%, @endColor);
- background-image: -ms-linear-gradient(@startColor, color-stop(@midColor, @colorStop), @endColor);
- background-image: -o-linear-gradient(@startColor, color-stop(@midColor, @colorStop), @endColor);
- background-image: linear-gradient(@startColor, color-stop(@midColor, @colorStop), @endColor);
+ background-image: -webkit-linear-gradient(@startColor, @midColor @colorStop, @endColor);
+ background-image: -moz-linear-gradient(@startColor, @midColor @colorStop, @endColor);
+ background-image: -ms-linear-gradient(@startColor, @midColor @colorStop, @endColor);
+ background-image: -o-linear-gradient(@startColor, @midColor @colorStop, @endColor);
+ background-image: linear-gradient(@startColor, @midColor @colorStop, @endColor);
}
}

0 comments on commit 8497d93

Please sign in to comment.
Something went wrong with that request. Please try again.