aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--docs/assets/css/bootstrap.css17
-rw-r--r--docs/download.html6
-rw-r--r--docs/scaffolding.html8
-rw-r--r--docs/templates/pages/download.mustache6
-rw-r--r--docs/templates/pages/scaffolding.mustache8
-rw-r--r--js/bootstrap-typeahead.js4
-rw-r--r--less/buttons.less7
-rw-r--r--less/forms.less10
-rw-r--r--less/tables.less1
9 files changed, 58 insertions, 9 deletions
diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index 28f49391b..b2284bc16 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 23:15:40 PST 2012
+ * Date: Fri Jan 27 11:07:13 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;
@@ -884,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;
@@ -969,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;
@@ -2445,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;
@@ -2467,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;
diff --git a/docs/download.html b/docs/download.html
index 3af30dca7..c7b42542d 100644
--- a/docs/download.html
+++ b/docs/download.html
@@ -84,7 +84,7 @@
<section class="download" id="components">
<div class="page-header">
- <a class="pull-right toggle-all" href="#">Toggle all</a>
+ <a class="btn small pull-right toggle-all" href="#">Toggle all</a>
<h1>
1. Select components
<small>Get just the CSS you need</small>
@@ -144,7 +144,7 @@
<section class="download" id="variables">
<div class="page-header">
- <a class="pull-right toggle-all" href="#">Reset to defaults</a>
+ <a class="btn small pull-right toggle-all" href="#">Reset to defaults</a>
<h1>
2. Modify variables
<small>Customize Bootstrap without using a LESS compiler</small>
@@ -222,7 +222,7 @@
<section class="download" id="plugins">
<div class="page-header">
- <a class="pull-right toggle-all" href="#">Toggle all</a>
+ <a class="btn small pull-right toggle-all" href="#">Toggle all</a>
<h1>
3. Select jQuery plugins
<small>Quickly add only the necessary javascript</small>
diff --git a/docs/scaffolding.html b/docs/scaffolding.html
index f49b8d6c4..51dfc6dbb 100644
--- a/docs/scaffolding.html
+++ b/docs/scaffolding.html
@@ -136,6 +136,8 @@
</div>
</div><!-- /row -->
+ <br>
+
<h2>Offsetting columns</h2>
<div class="row show-grid">
<div class="span4">4</div>
@@ -148,6 +150,12 @@
<div class="row show-grid">
<div class="span8 offset4">8 offset 4</div>
</div><!-- /row -->
+<pre class="prettyprint linenums">
+&lt;div class="row"&gt;
+ &lt;div class="span4"&gt;...&lt;/div&gt;
+ &lt;div class="span4 offset4"&gt;...&lt;/div&gt;
+&lt;/div&gt;
+</pre>
<br>
diff --git a/docs/templates/pages/download.mustache b/docs/templates/pages/download.mustache
index 0f997d368..5b9f765ab 100644
--- a/docs/templates/pages/download.mustache
+++ b/docs/templates/pages/download.mustache
@@ -19,7 +19,7 @@
<section class="download" id="components">
<div class="page-header">
- <a class="pull-right toggle-all" href="#">Toggle all</a>
+ <a class="btn small pull-right toggle-all" href="#">Toggle all</a>
<h1>
1. Select components
<small>Get just the CSS you need</small>
@@ -79,7 +79,7 @@
<section class="download" id="variables">
<div class="page-header">
- <a class="pull-right toggle-all" href="#">Reset to defaults</a>
+ <a class="btn small pull-right toggle-all" href="#">Reset to defaults</a>
<h1>
2. Modify variables
<small>Customize Bootstrap without using a LESS compiler</small>
@@ -157,7 +157,7 @@
<section class="download" id="plugins">
<div class="page-header">
- <a class="pull-right toggle-all" href="#">Toggle all</a>
+ <a class="btn small pull-right toggle-all" href="#">Toggle all</a>
<h1>
3. Select jQuery plugins
<small>Quickly add only the necessary javascript</small>
diff --git a/docs/templates/pages/scaffolding.mustache b/docs/templates/pages/scaffolding.mustache
index 7781e86f6..cf672cc6e 100644
--- a/docs/templates/pages/scaffolding.mustache
+++ b/docs/templates/pages/scaffolding.mustache
@@ -71,6 +71,8 @@
</div>
</div><!-- /row -->
+ <br>
+
<h2>Offsetting columns</h2>
<div class="row show-grid">
<div class="span4">4</div>
@@ -83,6 +85,12 @@
<div class="row show-grid">
<div class="span8 offset4">8 offset 4</div>
</div><!-- /row -->
+<pre class="prettyprint linenums">
+&lt;div class="row"&gt;
+ &lt;div class="span4"&gt;...&lt;/div&gt;
+ &lt;div class="span4 offset4"&gt;...&lt;/div&gt;
+&lt;/div&gt;
+</pre>
<br>
diff --git a/js/bootstrap-typeahead.js b/js/bootstrap-typeahead.js
index 82c318831..b4d839c93 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
diff --git a/less/buttons.less b/less/buttons.less
index d7f533783..f18cf9d95 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;
diff --git a/less/forms.less b/less/forms.less
index 9e2e1dc1b..55a646368 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,
@@ -439,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;
+ }
+ }
}
diff --git a/less/tables.less b/less/tables.less
index 809c2f60e..c069ed588 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,
generated by cgit v1.2.3 (git 2.25.1) at 2026-06-06 12:50:06 +0000