From 9237b25300a9a997c43389d66da36dacc9a90e02 Mon Sep 17 00:00:00 2001 From: Chad Smith Date: Wed, 1 May 2013 13:47:52 -0400 Subject: [PATCH 1/3] Updating the README.md to fix the link to Bower --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 8276ca2ea..7579d3a99 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. From a62e97091c6c1bd732a8f7e0761e724dfe50e0df Mon Sep 17 00:00:00 2001 From: Seth Lilly Date: Thu, 2 May 2013 14:03:54 -0300 Subject: [PATCH 2/3] Corrected typo in carousel.html Changed text from "First featurette headling" to "First featurette heading" in the first `h2.featurette-heading` tag. --- docs/examples/carousel.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 {
-

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.

From 08fea3304ac8393ca5f549082f7e195e1762fb40 Mon Sep 17 00:00:00 2001 From: Kevin Ingersoll Date: Fri, 3 May 2013 15:27:10 +1200 Subject: [PATCH 3/3] Fix input border flicker in Chrome from @garoevans, closes #7689 --- docs/assets/css/bootstrap.css | 8 ++++---- less/forms.less | 2 +- 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