diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 046cc20a5b..209aed4967 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -1245,10 +1245,32 @@ 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-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; + -webkit-transition: border-color ease-in-out 0.15s, box-shadow ease-in-out 0.15s; + -moz-transition: border-color ease-in-out 0.15s, box-shadow ease-in-out 0.15s; + -o-transition: border-color ease-in-out 0.15s, box-shadow ease-in-out 0.15s; + transition: border-color ease-in-out 0.15s, box-shadow ease-in-out 0.15s; +} + +select:focus, +textarea:focus, +input[type="text"]:focus, +input[type="password"]:focus, +input[type="datetime"]:focus, +input[type="datetime-local"]:focus, +input[type="date"]:focus, +input[type="month"]:focus, +input[type="time"]:focus, +input[type="week"]:focus, +input[type="number"]:focus, +input[type="email"]:focus, +input[type="url"]:focus, +input[type="search"]:focus, +input[type="tel"]:focus, +input[type="color"]:focus { + border-color: rgba(82, 168, 236, 0.8); + outline: 0; + -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(82, 168, 236, 0.6); + box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(82, 168, 236, 0.6); } input, @@ -1277,30 +1299,6 @@ textarea { height: auto; } -textarea:focus, -input[type="text"]:focus, -input[type="password"]:focus, -input[type="datetime"]:focus, -input[type="datetime-local"]:focus, -input[type="date"]:focus, -input[type="month"]:focus, -input[type="time"]:focus, -input[type="week"]:focus, -input[type="number"]:focus, -input[type="email"]:focus, -input[type="url"]:focus, -input[type="search"]:focus, -input[type="tel"]:focus, -input[type="color"]:focus { - border-color: rgba(82, 168, 236, 0.8); - outline: 0; - outline: thin dotted \9; - /* IE6-9 */ - - -webkit-box-shadow: 0 0 8px rgba(82, 168, 236, 0.6); - box-shadow: 0 0 8px rgba(82, 168, 236, 0.6); -} - input[type="radio"], input[type="checkbox"] { margin: 4px 0 0; @@ -1323,7 +1321,6 @@ select[size] { height: auto; } -select:focus, input[type="file"]:focus, input[type="radio"]:focus, input[type="checkbox"]:focus { diff --git a/less/forms.less b/less/forms.less index c79f7f6733..2c696945d0 100644 --- a/less/forms.less +++ b/less/forms.less @@ -65,12 +65,12 @@ 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-color linear .2s, box-shadow linear .2s"); + .transition(~"border-color ease-in-out .15s, box-shadow ease-in-out .15s"); &:focus { border-color: rgba(82,168,236,.8); outline: 0; - .box-shadow(0 0 8px rgba(82,168,236,.6)); + .box-shadow(~"inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82,168,236,.6)"); } }