diff options
| author | Mark Otto <[email protected]> | 2013-05-03 14:11:23 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-05-03 14:11:23 -0700 |
| commit | 14861e9cc32552ee235ceeb7b2bf0459d5298ea0 (patch) | |
| tree | 58a3131cdb3adffa4f0fead99da7cc5e0c126221 | |
| parent | b5d68f59c20bbc9bd0290950d0d04db417697843 (diff) | |
| parent | b0bd5899c55255abba96b01959e55a2feed8e4d3 (diff) | |
| download | bootstrap-14861e9cc32552ee235ceeb7b2bf0459d5298ea0.tar.xz bootstrap-14861e9cc32552ee235ceeb7b2bf0459d5298ea0.zip | |
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
| -rw-r--r-- | README.md | 2 | ||||
| -rw-r--r-- | docs/assets/css/bootstrap.css | 8 | ||||
| -rw-r--r-- | docs/examples/carousel.html | 2 | ||||
| -rw-r--r-- | less/forms.less | 2 |
4 files changed, 7 insertions, 7 deletions
@@ -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 0216ffc5b..a17a47128 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 954375d4b..cd6855aab 100644 --- a/docs/examples/carousel.html +++ b/docs/examples/carousel.html @@ -350,7 +350,7 @@ body { <div class="featurette"> <img class="featurette-image img-circle pull-right" data-src="holder.js/512x512"> - <h2 class="featurette-heading">First featurette headling. <span class="text-muted">It'll blow your mind.</span></h2> + <h2 class="featurette-heading">First featurette heading. <span class="text-muted">It'll blow your mind.</span></h2> <p class="lead">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.</p> </div> diff --git a/less/forms.less b/less/forms.less index 38df8b297..2a1a4e90c 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 |