diff --git a/README.md b/README.md index 8276ca2ea2..7579d3a992 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,7 @@ Three quick start options are available: * [Download the latest release](https://github.com/twitter/bootstrap/zipball/master). * Clone the repo: `git clone git://github.com/twitter/bootstrap.git`. -* Install with Twitter's [Bower](http://twitter.github.com/bower): `bower install bootstrap`. +* Install with Twitter's [Bower](http://github.com/bower/bower): `bower install bootstrap`. Read the [Getting Started page](http://getbootstrap.com/getting-started/) for information on the framework contents, basic template guidelines, and more. diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 0216ffc5bd..a17a471281 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/docs/examples/carousel.html b/docs/examples/carousel.html index 954375d4bf..cd6855aab5 100644 --- a/docs/examples/carousel.html +++ b/docs/examples/carousel.html @@ -350,7 +350,7 @@ body {
-

First featurette headling. It'll blow your mind.

+

First featurette heading. It'll blow your mind.

Donec ullamcorper nulla non metus auctor fringilla. Vestibulum id ligula porta felis euismod semper. Praesent commodo cursus magna, vel scelerisque nisl consectetur. Fusce dapibus, tellus ac cursus commodo.

diff --git a/less/forms.less b/less/forms.less index 38df8b2979..2a1a4e90cf 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