diff options
| author | Mark Otto <[email protected]> | 2014-08-04 15:09:23 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2014-08-04 15:09:23 -0700 |
| commit | 724240fe4f2cba653cec0aad217dd133aaa9e051 (patch) | |
| tree | 48e8ee949ec664305e252c983f121d28d5d5bc5d /less | |
| parent | 9e92b74aa3a3d5807d3201ac4ea1778ea120274f (diff) | |
| parent | 9096c2002123a6dafdf0c3d9df5d069c968d738e (diff) | |
| download | bootstrap-724240fe4f2cba653cec0aad217dd133aaa9e051.tar.xz bootstrap-724240fe4f2cba653cec0aad217dd133aaa9e051.zip | |
Merge branch 'master' into derp
Conflicts:
dist/css/bootstrap.css.map
dist/css/bootstrap.min.css
docs/_includes/customizer-variables.html
docs/_includes/js/overview.html
docs/assets/js/customize.min.js
docs/assets/js/raw-files.min.js
docs/browser-bugs.html
docs/dist/css/bootstrap.css.map
docs/dist/css/bootstrap.min.css
less/carousel.less
Diffstat (limited to 'less')
| -rw-r--r-- | less/.csslintrc | 1 | ||||
| -rw-r--r-- | less/buttons.less | 1 | ||||
| -rw-r--r-- | less/carousel.less | 2 |
3 files changed, 3 insertions, 1 deletions
diff --git a/less/.csslintrc b/less/.csslintrc index 005b86236..19ceb82e9 100644 --- a/less/.csslintrc +++ b/less/.csslintrc @@ -3,6 +3,7 @@ "box-sizing": false, "box-model": false, "compatible-vendor-prefixes": false, + "fallback-colors": false, "floats": false, "font-sizes": false, "gradients": false, diff --git a/less/buttons.less b/less/buttons.less index 1cd48a056..c30a07490 100644 --- a/less/buttons.less +++ b/less/buttons.less @@ -88,6 +88,7 @@ &, &:active, + &.active, &[disabled], fieldset[disabled] & { background-color: transparent; diff --git a/less/carousel.less b/less/carousel.less index 64f125ce7..19313ed6a 100644 --- a/less/carousel.less +++ b/less/carousel.less @@ -27,7 +27,7 @@ // WebKit CSS3 transforms for supported devices @media all and (transform-3d), (-webkit-transform-3d) { - transition: transform(0.6s ease-in-out); + transition: transform .6s ease-in-out; backface-visibility: hidden; perspective: 1000; |