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 /docs/dist/css/bootstrap.css | |
| 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 'docs/dist/css/bootstrap.css')
| -rw-r--r-- | docs/dist/css/bootstrap.css | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/docs/dist/css/bootstrap.css b/docs/dist/css/bootstrap.css index 305efb9bd..ad16cb2d1 100644 --- a/docs/dist/css/bootstrap.css +++ b/docs/dist/css/bootstrap.css @@ -2511,6 +2511,7 @@ fieldset[disabled] .btn-danger.active { } .btn-link, .btn-link:active, +.btn-link.active, .btn-link[disabled], fieldset[disabled] .btn-link { background-color: transparent; @@ -4902,9 +4903,9 @@ button.close { } @media all and (transform-3d), (-webkit-transform-3d) { .carousel-inner > .item { - -webkit-transition: -webkit-transform(.6s ease-in-out); - -o-transition: -o-transform(.6s ease-in-out); - transition: transform(.6s ease-in-out); + -webkit-transition: -webkit-transform .6s ease-in-out; + -o-transition: -o-transform .6s ease-in-out; + transition: transform .6s ease-in-out; -webkit-backface-visibility: hidden; backface-visibility: hidden; |