2
0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-05-21 13:24:08 +03:00

Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip

This commit is contained in:
Mark Otto
2013-05-03 14:11:23 -07:00
4 changed files with 7 additions and 7 deletions
+4 -4
View File
@@ -1261,10 +1261,10 @@ input[type="color"] {
border-radius: 4px;
-webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
-webkit-transition: border linear 0.2s, box-shadow linear 0.2s;
-moz-transition: border linear 0.2s, box-shadow linear 0.2s;
-o-transition: border linear 0.2s, box-shadow linear 0.2s;
transition: border linear 0.2s, box-shadow linear 0.2s;
-webkit-transition: border-color linear 0.2s, box-shadow linear 0.2s;
-moz-transition: border-color linear 0.2s, box-shadow linear 0.2s;
-o-transition: border-color linear 0.2s, box-shadow linear 0.2s;
transition: border-color linear 0.2s, box-shadow linear 0.2s;
}
input,