2
0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-06-05 16:42:29 +03:00

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
This commit is contained in:
Mark Otto
2014-08-04 15:09:23 -07:00
15 changed files with 647 additions and 1769 deletions
+1
View File
@@ -3,6 +3,7 @@
"box-sizing": false,
"box-model": false,
"compatible-vendor-prefixes": false,
"fallback-colors": false,
"floats": false,
"font-sizes": false,
"gradients": false,
+1
View File
@@ -88,6 +88,7 @@
&,
&:active,
&.active,
&[disabled],
fieldset[disabled] & {
background-color: transparent;
+1 -1
View File
@@ -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;