diff options
| author | Jacob Thornton <[email protected]> | 2011-08-22 11:27:21 -0700 |
|---|---|---|
| committer | Jacob Thornton <[email protected]> | 2011-08-22 11:27:21 -0700 |
| commit | 8497d935adc278e91d54a3f3054eb9cbc45299a1 (patch) | |
| tree | a7cfc73e9625de04a06351f0e10859c967be4afd /lib | |
| parent | 621f358dc051cf45f7da96df78ea673c7f0ac11b (diff) | |
| parent | ee6402b6c8c6103c918031d1ff3f574c2a3f2e11 (diff) | |
| download | bootstrap-8497d935adc278e91d54a3f3054eb9cbc45299a1.tar.xz bootstrap-8497d935adc278e91d54a3f3054eb9cbc45299a1.zip | |
Merge branch 'master' of github.com:twitter/bootstrap
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/patterns.less | 4 | ||||
| -rw-r--r-- | lib/preboot.less | 12 |
2 files changed, 8 insertions, 8 deletions
diff --git a/lib/patterns.less b/lib/patterns.less index 6f561a844..50471daa0 100644 --- a/lib/patterns.less +++ b/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; } } -}
\ No newline at end of file +} diff --git a/lib/preboot.less b/lib/preboot.less index bf20b53fe..e4026b891 100644 --- a/lib/preboot.less +++ b/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); } } |