From b9589fcb8076aa6b2559553c56d7e65808568a86 Mon Sep 17 00:00:00 2001 From: David N Date: Thu, 26 Jan 2012 17:23:09 -0600 Subject: [PATCH 1/7] Enable default browser key behaviour when typeahead isn't showing. --- js/bootstrap-typeahead.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/js/bootstrap-typeahead.js b/js/bootstrap-typeahead.js index fad28ea46b..82188f5926 100644 --- a/js/bootstrap-typeahead.js +++ b/js/bootstrap-typeahead.js @@ -157,6 +157,7 @@ case 9: // tab case 13: // enter + if (!this.shown) return this.select() break @@ -172,6 +173,7 @@ , keypress: function (e) { e.stopPropagation() + if (!this.shown) return switch(e.keyCode) { case 9: // tab @@ -181,13 +183,11 @@ break case 38: // up arrow - if (!this.shown) return e.preventDefault() this.prev() break case 40: // down arrow - if (!this.shown) return e.preventDefault() this.next() break From 9d0328ff00a1fa28f58b3cefa826bed9e21ab580 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Fri, 27 Jan 2012 08:21:39 -0800 Subject: [PATCH 2/7] adding outline callout as a fallback for IE--needs testing though, thought I already added this --- docs/assets/css/bootstrap.css | 7 +++++-- less/forms.less | 1 + 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 68e161051b..3a981f94da 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -6,7 +6,7 @@ * http://www.apache.org/licenses/LICENSE-2.0 * * Designed and built with all the love in the world @twitter by @mdo and @fat. - * Date: Thu Jan 26 22:39:03 PST 2012 + * Date: Fri Jan 27 08:21:21 PST 2012 */ article, aside, @@ -604,6 +604,9 @@ input:focus, textarea:focus { -moz-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); outline: 0; + outline: 1px dotted #666 \9; + /* IE6-8 */ + } input[type=file]:focus, input[type=checkbox]:focus, select:focus { -webkit-box-shadow: none; @@ -1831,7 +1834,7 @@ table .span12 { .navbar-search .search-query :-moz-placeholder { color: #eeeeee; } -.navbar-search .search-query::-webkit-input-placeholder { +.navbar-search .search-query ::-webkit-input-placeholder { color: #eeeeee; } .navbar-search .search-query:hover { diff --git a/less/forms.less b/less/forms.less index 9e2e1dc1bf..d2e049de5a 100644 --- a/less/forms.less +++ b/less/forms.less @@ -192,6 +192,7 @@ textarea:focus { @shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82,168,236,.6); .box-shadow(@shadow); outline: 0; + outline: 1px dotted #666 \9; /* IE6-8 */ } input[type=file]:focus, input[type=checkbox]:focus, From 6075b5dee6c892b991e8a00de70942f28f9a1c14 Mon Sep 17 00:00:00 2001 From: Pete Hopkins Date: Thu, 26 Jan 2012 17:32:11 -0500 Subject: [PATCH 3/7] Collapses borders for IE7, which doesn't respect border-spacing --- less/tables.less | 1 + 1 file changed, 1 insertion(+) diff --git a/less/tables.less b/less/tables.less index 809c2f60e7..c069ed5886 100644 --- a/less/tables.less +++ b/less/tables.less @@ -64,6 +64,7 @@ table { .table-bordered { border: 1px solid #ddd; border-collapse: separate; // Done so we can round those corners! + *border-collapse: collapsed; // IE7 can't round corners anyway .border-radius(4px); th + th, td + td, From 841e386daf01e06f2eba00725545f3e3315334b3 Mon Sep 17 00:00:00 2001 From: Pete Hopkins Date: Thu, 26 Jan 2012 17:32:44 -0500 Subject: [PATCH 4/7] Fixes up internal and external spacing for IE7 buttons --- less/buttons.less | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/less/buttons.less b/less/buttons.less index d7f5337832..f18cf9d955 100644 --- a/less/buttons.less +++ b/less/buttons.less @@ -67,6 +67,13 @@ // Button Base display: inline-block; padding: 4px 10px 4px; + *padding: 2px 10px; + // IE7 likes to collapse the whitespace before the button, so bring it back... + *margin-left: 4px; + &:first-child { + // ...but not before the first button + *margin-left: 0; + } font-size: @baseFontSize; line-height: @baseLineHeight; color: @grayDark; From 526d38839332907062cde27727900deb06e0c50b Mon Sep 17 00:00:00 2001 From: Pete Hopkins Date: Thu, 26 Jan 2012 18:03:53 -0500 Subject: [PATCH 5/7] Compensates for IE7 first-child-input-inheriting-hasLayout-parents-margins bug for appended text form element --- less/forms.less | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/less/forms.less b/less/forms.less index d2e049de5a..55a6463687 100644 --- a/less/forms.less +++ b/less/forms.less @@ -440,6 +440,15 @@ select:focus:required:invalid { margin-left: -1px; .border-radius(0 3px 3px 0); } + input:first-child { + // In IE7, having a hasLayout container (from clearfix's zoom:1) can make the first input + // inherit the sum of its ancestors' margins. + *margin-left: -160px; + + &+.add-on { + *margin-left: -21px; + } + } } From f51e703ba6a87ad504682c16b6dd747ebcfd2afb Mon Sep 17 00:00:00 2001 From: Pete Hopkins Date: Fri, 27 Jan 2012 12:16:36 -0500 Subject: [PATCH 6/7] Rebuild bootstrap.css --- docs/assets/css/bootstrap.css | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 3a981f94da..4fe86c977a 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -6,7 +6,7 @@ * http://www.apache.org/licenses/LICENSE-2.0 * * Designed and built with all the love in the world @twitter by @mdo and @fat. - * Date: Fri Jan 27 08:21:21 PST 2012 + * Date: Fri Jan 27 12:16:22 EST 2012 */ article, aside, @@ -887,6 +887,12 @@ input:focus:required:invalid:focus, textarea:focus:required:invalid:focus, selec -moz-border-radius: 0 3px 3px 0; border-radius: 0 3px 3px 0; } +.input-append input:first-child { + *margin-left: -160px; +} +.input-append input:first-child + .add-on { + *margin-left: -21px; +} .search-query { padding-left: 14px; padding-right: 14px; @@ -972,6 +978,7 @@ table { .table-bordered { border: 1px solid #ddd; border-collapse: separate; + *border-collapse: collapsed; -webkit-border-radius: 4px; -moz-border-radius: 4px; border-radius: 4px; @@ -1834,7 +1841,7 @@ table .span12 { .navbar-search .search-query :-moz-placeholder { color: #eeeeee; } -.navbar-search .search-query ::-webkit-input-placeholder { +.navbar-search .search-query::-webkit-input-placeholder { color: #eeeeee; } .navbar-search .search-query:hover { @@ -2448,6 +2455,8 @@ table .span12 { .btn { display: inline-block; padding: 4px 10px 4px; + *padding: 2px 10px; + *margin-left: 4px; font-size: 13px; line-height: 18px; color: #333333; @@ -2470,6 +2479,9 @@ table .span12 { box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); cursor: pointer; } +.btn:first-child { + *margin-left: 0; +} .btn:hover { color: #333333; text-decoration: none; From e44a7dd4ff2d505e6bc41ba0a5fdf66650cdf605 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Fri, 27 Jan 2012 09:36:49 -0800 Subject: [PATCH 7/7] buttons for toggle links in js docs, code example for offsetting in grid --- docs/templates/pages/download.mustache | 6 +++--- docs/templates/pages/scaffolding.mustache | 8 ++++++++ 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/docs/templates/pages/download.mustache b/docs/templates/pages/download.mustache index 0f997d3686..5b9f765ab9 100644 --- a/docs/templates/pages/download.mustache +++ b/docs/templates/pages/download.mustache @@ -19,7 +19,7 @@
- Toggle all + Toggle all

1. Select components Get just the CSS you need @@ -79,7 +79,7 @@
- Reset to defaults + Reset to defaults

2. Modify variables Customize Bootstrap without using a LESS compiler @@ -157,7 +157,7 @@
- Toggle all + Toggle all

3. Select jQuery plugins Quickly add only the necessary javascript diff --git a/docs/templates/pages/scaffolding.mustache b/docs/templates/pages/scaffolding.mustache index 7781e86f65..cf672cc6e0 100644 --- a/docs/templates/pages/scaffolding.mustache +++ b/docs/templates/pages/scaffolding.mustache @@ -71,6 +71,8 @@

+
+

Offsetting columns

4
@@ -83,6 +85,12 @@
8 offset 4
+
+<div class="row">
+  <div class="span4">...</div>
+  <div class="span4 offset4">...</div>
+</div>
+