From 64ea59234f30f51ab5497830d1825c7e043a575e Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 13 Feb 2012 08:18:19 -0800 Subject: change up fonts on form elements to remove unnecessary font-family on label element, per #1950 --- docs/assets/css/bootstrap.css | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'docs/assets/css/bootstrap.css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index e52d2f0cf..57c30ab63 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -530,11 +530,16 @@ input, button, select, textarea { - font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; font-size: 13px; font-weight: normal; line-height: 18px; } +input, +button, +select, +textarea { + font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; +} label { display: block; margin-bottom: 5px; -- cgit v1.2.3 From 61e2201c64a9a61792680c2b1d236b0a753ed182 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 16 Feb 2012 21:25:40 -0800 Subject: fix buttons focus state and swap a buttons for button buttons --- docs/assets/css/bootstrap.css | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'docs/assets/css/bootstrap.css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 57c30ab63..e16383b1c 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -33,7 +33,7 @@ html { -ms-text-size-adjust: 100%; } a:focus { - outline: thin dotted; + outline: thin dotted #333; outline: 5px auto -webkit-focus-ring-color; outline-offset: -2px; } @@ -675,7 +675,7 @@ select:focus { -webkit-box-shadow: none; -moz-box-shadow: none; box-shadow: none; - outline: thin dotted; + outline: thin dotted #333; outline: 5px auto -webkit-focus-ring-color; outline-offset: -2px; } @@ -1749,7 +1749,7 @@ table .span12 { transition: background-position 0.1s linear; } .btn:focus { - outline: thin dotted; + outline: thin dotted #333; outline: 5px auto -webkit-focus-ring-color; outline-offset: -2px; } -- cgit v1.2.3 From 268e7d67abb32ed5cfc575c71f03d635672e781c Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 16 Feb 2012 21:28:16 -0800 Subject: add mini buttons per #1971 --- docs/assets/css/bootstrap.css | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'docs/assets/css/bootstrap.css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index e16383b1c..d6441d133 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -1791,6 +1791,11 @@ table .span12 { .btn-small [class^="icon-"] { margin-top: -1px; } +.btn-mini { + padding: 2px 6px; + font-size: 11px; + line-height: 14px; +} .btn-primary, .btn-primary:hover, .btn-warning, -- cgit v1.2.3 From 6f6adfb52fc2f6043f84ac4fab876592c00b2894 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 16 Feb 2012 22:04:11 -0800 Subject: change clearfix mixin to drop parens that prevent it from being a class, too --- docs/assets/css/bootstrap.css | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'docs/assets/css/bootstrap.css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index d6441d133..74d7308be 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -94,6 +94,16 @@ textarea { overflow: auto; vertical-align: top; } +.clearfix { + *zoom: 1; +} +.clearfix:before, .clearfix:after { + display: table; + content: ""; +} +.clearfix:after { + clear: both; +} body { margin: 0; font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; -- cgit v1.2.3 From 091622644a0c619e1afbb21041c141da30df76b7 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 16 Feb 2012 22:34:30 -0800 Subject: bring back checkbox borders to iOS by conditionalizing the border: 0; on it to IE7-9; fix word break on pre in IE --- docs/assets/css/bootstrap.css | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'docs/assets/css/bootstrap.css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 74d7308be..ed32b339f 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -498,6 +498,7 @@ pre { white-space: pre; white-space: pre-wrap; word-break: break-all; + word-wrap: break-word; } pre.prettyprint { margin-bottom: 18px; @@ -588,11 +589,16 @@ input[type="image"], input[type="checkbox"], input[type="radio"] { /* IE7 */ line-height: normal; - border: 0; cursor: pointer; -webkit-border-radius: 0; -moz-border-radius: 0; border-radius: 0; + border: 0 \9; + /* IE9 and down */ + +} +input[type="image"] { + border: 0; } input[type="file"] { width: auto; -- cgit v1.2.3