diff options
| author | Mark Otto <[email protected]> | 2012-11-30 00:13:30 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2012-11-30 00:13:30 -0800 |
| commit | fca35c0dba060da14ccb29fc56dc37aa1de533c4 (patch) | |
| tree | 04cc972e705bedb2910247bdcfb0c8ede3cee09a /less/mixins.less | |
| parent | 7e56e2265d67ae81ad8be52af4d56f189929207a (diff) | |
| parent | bca3ff4ed6f42701ceae1405f518c35ec8c623be (diff) | |
| download | bootstrap-fca35c0dba060da14ccb29fc56dc37aa1de533c4.tar.xz bootstrap-fca35c0dba060da14ccb29fc56dc37aa1de533c4.zip | |
Merge branch '2.2.2-wip' into exploratory
Conflicts:
docs/assets/css/bootstrap.css
docs/components.html
docs/templates/pages/components.mustache
less/alerts.less
less/button-groups.less
less/buttons.less
less/tests/css-tests.html
Diffstat (limited to 'less/mixins.less')
| -rw-r--r-- | less/mixins.less | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/less/mixins.less b/less/mixins.less index f5edd230c..e477f7113 100644 --- a/less/mixins.less +++ b/less/mixins.less @@ -367,7 +367,7 @@ background-image: -webkit-gradient(linear, 0 0, 0 100%, from(@startColor), to(@endColor)); // Safari 4+, Chrome 2+ 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(to bottom, @startColor, @endColor); // Standard, IE10 + background-image: linear-gradient(top, @startColor, @endColor); // Standard, IE10 background-repeat: repeat-x; filter: e(%("progid:DXImageTransform.Microsoft.gradient(startColorstr='%d', endColorstr='%d', GradientType=0)",argb(@startColor),argb(@endColor))); // IE9 and down } |