aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2013-05-03 10:59:52 -0700
committerMark Otto <[email protected]>2013-05-03 10:59:52 -0700
commit77102dd2e4e68d0d32eea8b1762a96ecd5d39911 (patch)
tree782fb177220fef7c3d1e7ab733531d90a64dfb62
parentc63b793a0d0f7cd223dc988c2429f5f6c878a8b6 (diff)
parent08fea3304ac8393ca5f549082f7e195e1762fb40 (diff)
downloadbootstrap-77102dd2e4e68d0d32eea8b1762a96ecd5d39911.tar.xz
bootstrap-77102dd2e4e68d0d32eea8b1762a96ecd5d39911.zip
Merge pull request #7770 from holic/3.0.0-input-border-transition
Fix input border flicker in Chrome
-rw-r--r--docs/assets/css/bootstrap.css8
-rw-r--r--less/forms.less2
2 files changed, 5 insertions, 5 deletions
diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index 1f338a871..281508ac0 100644
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@ -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,
diff --git a/less/forms.less b/less/forms.less
index 72eab570d..a00bedf1c 100644
--- a/less/forms.less
+++ b/less/forms.less
@@ -66,7 +66,7 @@ input[type="color"] {
border: 1px solid @input-border;
border-radius: @input-border-radius;
.box-shadow(inset 0 1px 1px rgba(0,0,0,.075));
- .transition(~"border linear .2s, box-shadow linear .2s");
+ .transition(~"border-color linear .2s, box-shadow linear .2s");
}
// Reset appearance properties for textual inputs and textarea