From 4211f21e39631179753d6775e3ad90be05ab5f8f Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 1 Feb 2012 22:27:11 -0800 Subject: #1571: remove fixed width on file inputs --- docs/assets/css/bootstrap.css | 1 + 1 file changed, 1 insertion(+) (limited to 'docs/assets/css/bootstrap.css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index a90e31930..9de317af5 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -570,6 +570,7 @@ input[type="image"], input[type="checkbox"], input[type="radio"] { border-radius: 0; } input[type="file"] { + width: auto; padding: initial; line-height: initial; border: initial; -- cgit v1.2.3 From ac98cee6092738eb431ebd4c944886358dab721f Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 4 Feb 2012 18:26:04 -0800 Subject: allow alternate form layouts to hide inputs with .hide on them --- docs/assets/css/bootstrap.css | 3 +++ 1 file changed, 3 insertions(+) (limited to 'docs/assets/css/bootstrap.css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 9de317af5..1ded1be23 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -940,6 +940,9 @@ input:focus:required:invalid:focus, textarea:focus:required:invalid:focus, selec display: inline-block; margin-bottom: 0; } +.form-search .hide, .form-inline .hide, .form-horizontal .hide { + display: none; +} .form-search label, .form-inline label, .form-search .input-append, -- cgit v1.2.3 From 81d1f3b96ea5c78d2e570c07c4c419a32a9b212c Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 4 Feb 2012 18:52:25 -0800 Subject: remove max-width on dropdown menus --- docs/assets/css/bootstrap.css | 1 - 1 file changed, 1 deletion(-) (limited to 'docs/assets/css/bootstrap.css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 1ded1be23..7d28ab36d 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -1533,7 +1533,6 @@ table .span12 { float: left; display: none; min-width: 160px; - max-width: 220px; _width: 160px; padding: 4px 0; margin: 0; -- cgit v1.2.3 From 7e81f84b29da8ba87fb4aefcc11946002ad9962c Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 4 Feb 2012 22:22:19 -0800 Subject: buttons and icons updated for improved placement and variable support for icon paths --- docs/assets/css/bootstrap.css | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'docs/assets/css/bootstrap.css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 7d28ab36d..459e207b7 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -1122,8 +1122,9 @@ table .span12 { display: inline-block; width: 14px; height: 14px; + line-height: 14px; vertical-align: text-top; - background-image: url(../img/glyphicons-halflings.png); + background-image: url("../img/glyphicons-halflings.png"); background-position: 14px 14px; background-repeat: no-repeat; *margin-right: .3em; @@ -1132,7 +1133,7 @@ table .span12 { *margin-left: 0; } .icon-white { - background-image: url(../img/glyphicons-halflings-white.png); + background-image: url("../img/glyphicons-halflings-white.png"); } .icon-glass { background-position: 0 0; @@ -1733,7 +1734,7 @@ table .span12 { -moz-border-radius: 5px; border-radius: 5px; } -.btn-large .icon { +.btn-large [class^="icon-"] { margin-top: 1px; } .btn-small { @@ -1741,7 +1742,7 @@ table .span12 { font-size: 11px; line-height: 16px; } -.btn-small .icon { +.btn-small [class^="icon-"] { margin-top: -1px; } .btn-primary, -- cgit v1.2.3 From 468688638d69e23141ec4abda074a36e888c12c7 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 4 Feb 2012 22:23:20 -0800 Subject: #1715: strip code of styles when in a pre --- docs/assets/css/bootstrap.css | 2 ++ 1 file changed, 2 insertions(+) (limited to 'docs/assets/css/bootstrap.css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 459e207b7..d51e3d6f9 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -494,7 +494,9 @@ pre.prettyprint { } pre code { padding: 0; + color: inherit; background-color: transparent; + border: 0; } form { margin: 0 0 18px; -- cgit v1.2.3 From 87a8c9b677bff0d831f920922c86d5b0cff9949c Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 4 Feb 2012 22:40:50 -0800 Subject: #1707: remove rgba() background override on navbar active items for customization --- docs/assets/css/bootstrap.css | 1 - 1 file changed, 1 deletion(-) (limited to 'docs/assets/css/bootstrap.css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index d51e3d6f9..6bbed834b 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -2550,7 +2550,6 @@ button.btn.small, input[type="submit"].btn.small { color: #ffffff; text-decoration: none; background-color: #222222; - background-color: rgba(0, 0, 0, 0.5); } .navbar .divider-vertical { height: 40px; -- cgit v1.2.3 From 35fdddbc4fdd134953ce2b1e4a88047850aa47a0 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 4 Feb 2012 22:55:47 -0800 Subject: correct css selector for .control-label, required in the docs but not in the CSS files --- docs/assets/css/bootstrap.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docs/assets/css/bootstrap.css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 6bbed834b..f954835b2 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -977,7 +977,7 @@ input:focus:required:invalid:focus, textarea:focus:required:invalid:focus, selec .form-horizontal .control-group:after { clear: both; } -.form-horizontal .control-group > label { +.form-horizontal .control-label { float: left; width: 140px; padding-top: 5px; -- cgit v1.2.3 From 4a09cf04d8d644734f91c9a9ce97091ad698fcce Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 5 Feb 2012 02:01:28 -0800 Subject: clean up labels per #1656 --- 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 f954835b2..2da793c7f 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -3050,11 +3050,11 @@ a.thumbnail:hover { padding: 9px; } .label { - padding: 1px 3px 2px; - font-size: 9.75px; + padding: 2px 4px 3px; + font-size: 11.049999999999999px; font-weight: bold; color: #ffffff; - text-transform: uppercase; + text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); background-color: #999999; -webkit-border-radius: 3px; -moz-border-radius: 3px; -- cgit v1.2.3 From 91475c865dd8fe224c574c1a15e8949fccdda8c0 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 5 Feb 2012 02:14:25 -0800 Subject: fix #1631 by adding focus to radio buttons --- docs/assets/css/bootstrap.css | 5 ++++- 1 file changed, 4 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 2da793c7f..12b9af84d 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -654,7 +654,10 @@ input:focus, textarea:focus { /* IE6-8 */ } -input[type="file"]:focus, input[type="checkbox"]:focus, select:focus { +input[type="file"]:focus, +input[type="radio"]:focus, +input[type="checkbox"]:focus, +select:focus { -webkit-box-shadow: none; -moz-box-shadow: none; box-shadow: none; -- cgit v1.2.3 From 59b32586af807d0e4f2985ef6e927e32d8ae2df5 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 5 Feb 2012 02:16:46 -0800 Subject: close #1628 to add padding to all inline checkboxes/radios --- docs/assets/css/bootstrap.css | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'docs/assets/css/bootstrap.css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 12b9af84d..2674c48a6 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -625,15 +625,13 @@ input[type="hidden"] { } .radio.inline, .checkbox.inline { display: inline-block; + padding-top: 5px; margin-bottom: 0; vertical-align: middle; } .radio.inline + .radio.inline, .checkbox.inline + .checkbox.inline { margin-left: 10px; } -.controls > .radio.inline:first-child, .controls > .checkbox.inline:first-child { - padding-top: 0; -} input, textarea { -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); -- cgit v1.2.3 From 546332d85de5837147b645bf6bab5fa06e2a1039 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 5 Feb 2012 02:28:42 -0800 Subject: resolve #1602 and add table hover style --- docs/assets/css/bootstrap.css | 3 +++ 1 file changed, 3 insertions(+) (limited to 'docs/assets/css/bootstrap.css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 2674c48a6..2f982b04a 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -1061,6 +1061,9 @@ table { .table-striped tbody tr:nth-child(odd) td, .table-striped tbody tr:nth-child(odd) th { background-color: #f9f9f9; } +.table tbody tr:hover td, .table tbody tr:hover th { + background-color: #f5f5f5; +} table .span1 { float: none; width: 44px; -- cgit v1.2.3 From 85e401a6567e51016357acfe6b01cd5b5c330652 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 5 Feb 2012 02:36:21 -0800 Subject: add label hover style for ability to make it a link --- docs/assets/css/bootstrap.css | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) (limited to 'docs/assets/css/bootstrap.css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 2f982b04a..3833da611 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -3064,18 +3064,34 @@ a.thumbnail:hover { -moz-border-radius: 3px; border-radius: 3px; } +.label:hover { + color: #ffffff; + text-decoration: none; +} .label-important { background-color: #b94a48; } +.label-important:hover { + background-color: #953b39; +} .label-warning { background-color: #f89406; } +.label-warning:hover { + background-color: #c67605; +} .label-success { background-color: #468847; } +.label-success:hover { + background-color: #356635; +} .label-info { background-color: #3a87ad; } +.label-info:hover { + background-color: #2d6987; +} @-webkit-keyframes progress-bar-stripes { from { background-position: 0 0; -- cgit v1.2.3 From 575b82473f8d248ca3782fa86ce1c92eea03905c Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 6 Feb 2012 23:34:03 -0800 Subject: rearrange some of the docs on buttons to show examples of all possible renderings along with code snippets and note about usage; also fix the portrait tablet media query --- docs/assets/css/bootstrap.css | 2 ++ 1 file changed, 2 insertions(+) (limited to 'docs/assets/css/bootstrap.css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 3833da611..188b97036 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -1668,11 +1668,13 @@ table .span12 { .btn { display: inline-block; padding: 4px 10px 4px; + margin-bottom: 0; font-size: 13px; line-height: 18px; color: #333333; text-align: center; text-shadow: 0 1px 1px rgba(255, 255, 255, 0.75); + vertical-align: middle; background-color: #fafafa; background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), color-stop(25%, #ffffff), to(#e6e6e6)); background-image: -webkit-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6); -- cgit v1.2.3 From 7ce62ffc9813ea2958b353ee36374d3146034dbf Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 6 Feb 2012 23:42:57 -0800 Subject: make after merging in breadcrumbs wrap fix --- docs/assets/css/bootstrap.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docs/assets/css/bootstrap.css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 188b97036..50d1f6944 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -2642,7 +2642,7 @@ button.btn.small, input[type="submit"].btn.small { box-shadow: inset 0 1px 0 #ffffff; } .breadcrumb li { - display: inline; + display: inline-block; text-shadow: 0 1px 0 #ffffff; } .breadcrumb .divider { -- cgit v1.2.3 From 25bf0af2492920d3da59cc64a23c1a776279a3eb Mon Sep 17 00:00:00 2001 From: Henrik N Date: Tue, 7 Feb 2012 19:29:45 +0100 Subject: Add ol.unstyled --- docs/assets/css/bootstrap.css | 3 ++- 1 file changed, 2 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 a90e31930..51719d3aa 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -374,7 +374,8 @@ ol { li { line-height: 18px; } -ul.unstyled { +ul.unstyled, +ol.unstyled { margin-left: 0; list-style: none; } -- cgit v1.2.3 From d7aefe67e3df78bde61eaa7ecab807bb03aeb1ef Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Fri, 10 Feb 2012 23:07:32 -0800 Subject: scope th bottom vertical-align to only thead, update code styles to include more comments in less file and scrollable option for pre tag --- docs/assets/css/bootstrap.css | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to 'docs/assets/css/bootstrap.css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 0b622d7d4..144783be4 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -374,8 +374,7 @@ ol { li { line-height: 18px; } -ul.unstyled, -ol.unstyled { +ul.unstyled, ol.unstyled { margin-left: 0; list-style: none; } @@ -499,6 +498,10 @@ pre code { background-color: transparent; border: 0; } +.pre-scrollable { + max-height: 340px; + overflow-y: scroll; +} form { margin: 0 0 18px; } @@ -1004,14 +1007,14 @@ table { padding: 8px; line-height: 18px; text-align: left; + vertical-align: top; border-top: 1px solid #ddd; } .table th { font-weight: bold; - vertical-align: bottom; } -.table td { - vertical-align: top; +.table thead th { + vertical-align: bottom; } .table thead:first-child tr th, .table thead:first-child tr td { border-top: 0; -- cgit v1.2.3 From 89205d9db43f6c2fb2ed14cdb11c50c858de0550 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Fri, 10 Feb 2012 23:59:00 -0800 Subject: manually address #1895 --- docs/assets/css/bootstrap.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docs/assets/css/bootstrap.css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 144783be4..9f0420b5b 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -393,7 +393,7 @@ dd { hr { margin: 18px 0; border: 0; - border-top: 1px solid #e5e5e5; + border-top: 1px solid #eeeeee; border-bottom: 1px solid #ffffff; } strong { -- cgit v1.2.3 From 722c75d1b19fbb9ed98be0afa54f4f79c9f7ee48 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 11 Feb 2012 00:07:05 -0800 Subject: update selectors for icons to include matcher for icon class in middle of class attr, remove docs mention of requiring icon-* first --- docs/assets/css/bootstrap.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'docs/assets/css/bootstrap.css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 9f0420b5b..d4d311b20 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -1128,7 +1128,7 @@ table .span12 { width: 924px; margin-left: 0; } -[class^="icon-"] { +[class^="icon-"], [class*=" icon-"] { display: inline-block; width: 14px; height: 14px; @@ -1139,7 +1139,7 @@ table .span12 { background-repeat: no-repeat; *margin-right: .3em; } -[class^="icon-"]:last-child { +[class^="icon-"]:last-child, [class*=" icon-"]:last-child { *margin-left: 0; } .icon-white { -- cgit v1.2.3 From efac5441d83079653dabcdd4879102ec8ccb72be Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 11 Feb 2012 00:11:34 -0800 Subject: move legend fix out of horizontal and to all forms --- docs/assets/css/bootstrap.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docs/assets/css/bootstrap.css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index d4d311b20..09688778b 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -967,7 +967,7 @@ input:focus:required:invalid:focus, textarea:focus:required:invalid:focus, selec .control-group { margin-bottom: 9px; } -.form-horizontal legend + .control-group { +legend + .control-group { margin-top: 18px; -webkit-margin-top-collapse: separate; } -- cgit v1.2.3 From 8f1db4321a35851d5b726290b2d99e7ea1ec7239 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 11 Feb 2012 00:24:06 -0800 Subject: fix inline form checkbox/radios --- docs/assets/css/bootstrap.css | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'docs/assets/css/bootstrap.css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 09688778b..1391ad41e 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -964,6 +964,13 @@ input:focus:required:invalid:focus, textarea:focus:required:invalid:focus, selec .form-inline .input-prepend .add-on { vertical-align: middle; } +.form-search .radio, +.form-inline .radio, +.form-search .checkbox, +.form-inline .checkbox { + margin-bottom: 0; + vertical-align: middle; +} .control-group { margin-bottom: 9px; } -- cgit v1.2.3 From 4ddc8fd0e41a4bf76249645674806a7f11e64879 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 11 Feb 2012 16:43:53 -0800 Subject: remove color on :active of buttons --- docs/assets/css/bootstrap.css | 1 - 1 file changed, 1 deletion(-) (limited to 'docs/assets/css/bootstrap.css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 1391ad41e..e32d2b13c 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -1732,7 +1732,6 @@ table .span12 { box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05); background-color: #e6e6e6; background-color: #d9d9d9 \9; - color: rgba(0, 0, 0, 0.5); outline: 0; } .btn.disabled, .btn[disabled] { -- cgit v1.2.3 From 5a3dfb72bfcf1859690c76a8ddb8457eb962bdb3 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 11 Feb 2012 16:50:57 -0800 Subject: support small for legend per #1544 --- docs/assets/css/bootstrap.css | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'docs/assets/css/bootstrap.css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index e32d2b13c..9654d856f 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -521,6 +521,10 @@ legend { border: 0; border-bottom: 1px solid #eee; } +legend small { + font-size: 13.5px; + color: #999999; +} label, input, button, -- cgit v1.2.3 From 5b22cf5cc3f06d4f63dfbd7579cfec32eb2c2c79 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 11 Feb 2012 17:27:08 -0800 Subject: fix tabs content wrapping per #1620 --- docs/assets/css/bootstrap.css | 3 +++ 1 file changed, 3 insertions(+) (limited to 'docs/assets/css/bootstrap.css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 9654d856f..407ded775 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -2282,6 +2282,9 @@ button.btn.small, input[type="submit"].btn.small { .tabbable:after { clear: both; } +.tab-content { + overflow: hidden; +} .tabs-below .nav-tabs, .tabs-right .nav-tabs, .tabs-left .nav-tabs { border-bottom: 0; } -- cgit v1.2.3 From 158419c0455ea499197f8b7917bdfe299caaac19 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 11 Feb 2012 20:00:44 -0800 Subject: reset line-height for file input in ie9 --- docs/assets/css/bootstrap.css | 3 +++ 1 file changed, 3 insertions(+) (limited to 'docs/assets/css/bootstrap.css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 407ded775..13af821b4 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -603,6 +603,9 @@ select, input[type="file"] { line-height: 28px; } +input[type="file"] { + line-height: 18px \9; +} select { width: 220px; background-color: #ffffff; -- cgit v1.2.3 From b327420e524691808b59fa2d0d552e5ec65e2a45 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 11 Feb 2012 20:58:10 -0800 Subject: update comment to reflect ie support --- docs/assets/css/bootstrap.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docs/assets/css/bootstrap.css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 13af821b4..1f2aae23e 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -660,7 +660,7 @@ input:focus, textarea:focus { box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(82, 168, 236, 0.6); outline: 0; outline: thin dotted \9; - /* IE6-8 */ + /* IE6-9 */ } input[type="file"]:focus, -- cgit v1.2.3 From a2bc22bad5fd1b7ab6bba10087cea36aad63c550 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 12 Feb 2012 11:14:13 -0800 Subject: standardize default button gradient styles to match other buttons, reset it's IE filter to improve IE7 hover --- docs/assets/css/bootstrap.css | 30 ++++++++++++++++++++++-------- 1 file changed, 22 insertions(+), 8 deletions(-) (limited to 'docs/assets/css/bootstrap.css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 1f2aae23e..a88db6685 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -1693,15 +1693,18 @@ table .span12 { text-align: center; text-shadow: 0 1px 1px rgba(255, 255, 255, 0.75); vertical-align: middle; - background-color: #fafafa; - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), color-stop(25%, #ffffff), to(#e6e6e6)); - background-image: -webkit-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6); - background-image: -moz-linear-gradient(top, #ffffff, #ffffff 25%, #e6e6e6); - background-image: -ms-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6); - background-image: -o-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6); - background-image: linear-gradient(#ffffff, #ffffff 25%, #e6e6e6); - background-repeat: no-repeat; + background-color: #f5f5f5; + background-image: -moz-linear-gradient(top, #ffffff, #e6e6e6); + background-image: -ms-linear-gradient(top, #ffffff, #e6e6e6); + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), to(#e6e6e6)); + background-image: -webkit-linear-gradient(top, #ffffff, #e6e6e6); + background-image: -o-linear-gradient(top, #ffffff, #e6e6e6); + background-image: linear-gradient(top, #ffffff, #e6e6e6); + background-repeat: repeat-x; filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#e6e6e6', GradientType=0); + border-color: #e6e6e6 #e6e6e6 #bfbfbf; + border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); + filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); border: 1px solid #ccc; border-bottom-color: #bbb; -webkit-border-radius: 4px; @@ -1711,8 +1714,19 @@ table .span12 { -moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); cursor: pointer; + filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); *margin-left: .3em; } +.btn:hover, +.btn:active, +.btn.active, +.btn.disabled, +.btn[disabled] { + background-color: #e6e6e6; +} +.btn:active, .btn.active { + background-color: #cccccc \9; +} .btn:first-child { *margin-left: 0; } -- cgit v1.2.3 From a9e469e75aba9edb6e4b0eb29f0a51dbef3167b7 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 12 Feb 2012 14:01:58 -0800 Subject: add navbar background hover variable and fix uneditable-input with append/prepend controls --- docs/assets/css/bootstrap.css | 1 + 1 file changed, 1 insertion(+) (limited to 'docs/assets/css/bootstrap.css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index a88db6685..b1a1d2611 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -913,6 +913,7 @@ input:focus:required:invalid:focus, textarea:focus:required:invalid:focus, selec border-radius: 3px 0 0 3px; } .input-append .uneditable-input { + border-left-color: #eee; border-right-color: #ccc; } .input-append .add-on { -- cgit v1.2.3 From 0ff88f2db3b9fa4604886494a711d74652a2fb4f Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 12 Feb 2012 14:09:13 -0800 Subject: enable the use of .nav-header in dropdowns per #1827 --- docs/assets/css/bootstrap.css | 26 +++++++++++++++----------- 1 file changed, 15 insertions(+), 11 deletions(-) (limited to 'docs/assets/css/bootstrap.css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index b1a1d2611..5a97f23a6 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -2130,27 +2130,31 @@ button.btn.small, input[type="submit"].btn.small { text-decoration: none; background-color: #eeeeee; } +.nav .nav-header { + display: block; + padding: 3px 15px; + font-size: 11px; + font-weight: bold; + line-height: 18px; + color: #999999; + text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5); + text-transform: uppercase; +} +.nav li + .nav-header { + margin-top: 9px; +} .nav-list { padding-left: 14px; padding-right: 14px; margin-bottom: 0; } .nav-list > li > a, .nav-list .nav-header { - display: block; - padding: 3px 15px; margin-left: -15px; margin-right: -15px; text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5); } -.nav-list .nav-header { - font-size: 11px; - font-weight: bold; - line-height: 18px; - color: #999999; - text-transform: uppercase; -} -.nav-list > li + .nav-header { - margin-top: 9px; +.nav-list > li > a { + padding: 3px 15px; } .nav-list .active > a, .nav-list .active > a:hover { color: #ffffff; -- cgit v1.2.3 From a57dbada0f17bc3dfd4a77de436a5e590fb0d1e3 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 12 Feb 2012 15:18:20 -0800 Subject: change classname from .btn-dark to .btn-inverse, change use text --- docs/assets/css/bootstrap.css | 34 +++++++++++++++++++++++++++++++--- 1 file changed, 31 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 5a97f23a6..acd3a396e 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -1794,7 +1794,9 @@ table .span12 { .btn-success, .btn-success:hover, .btn-info, -.btn-info:hover { +.btn-info:hover, +.btn-inverse, +.btn-inverse:hover { text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); color: #ffffff; } @@ -1802,7 +1804,8 @@ table .span12 { .btn-warning.active, .btn-danger.active, .btn-success.active, -.btn-info.active { +.btn-info.active, +.btn-dark.active { color: rgba(255, 255, 255, 0.75); } .btn-primary { @@ -1925,6 +1928,30 @@ table .span12 { .btn-info:active, .btn-info.active { background-color: #24748c \9; } +.btn-inverse { + background-color: #393939; + background-image: -moz-linear-gradient(top, #454545, #262626); + background-image: -ms-linear-gradient(top, #454545, #262626); + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#454545), to(#262626)); + background-image: -webkit-linear-gradient(top, #454545, #262626); + background-image: -o-linear-gradient(top, #454545, #262626); + background-image: linear-gradient(top, #454545, #262626); + background-repeat: repeat-x; + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#454545', endColorstr='#262626', GradientType=0); + border-color: #262626 #262626 #000000; + border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); + filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); +} +.btn-inverse:hover, +.btn-inverse:active, +.btn-inverse.active, +.btn-inverse.disabled, +.btn-inverse[disabled] { + background-color: #262626; +} +.btn-inverse:active, .btn-inverse.active { + background-color: #0c0c0c \9; +} button.btn, input[type="submit"].btn { *padding-top: 2px; *padding-bottom: 2px; @@ -2057,7 +2084,8 @@ button.btn.small, input[type="submit"].btn.small { .btn-primary .caret, .btn-danger .caret, .btn-info .caret, -.btn-success .caret { +.btn-success .caret, +.btn-inverse .caret { border-top-color: #ffffff; opacity: 0.75; filter: alpha(opacity=75); -- cgit v1.2.3 From 163c98ea7e321ce3a1b38128cfb2bec6cd76e6de Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 12 Feb 2012 15:43:04 -0800 Subject: clean up modals.less comments, add new class for optional use on modal forms to remove bottom margin --- docs/assets/css/bootstrap.css | 3 +++ 1 file changed, 3 insertions(+) (limited to 'docs/assets/css/bootstrap.css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index acd3a396e..754e9af2d 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -2888,6 +2888,9 @@ button.btn.small, input[type="submit"].btn.small { .modal-body { padding: 15px; } +.modal-body .modal-form { + margin-bottom: 0; +} .modal-footer { padding: 14px 15px 15px; margin-bottom: 0; -- cgit v1.2.3 From 5fc62c5fcc93ab36a419c35e72674fbf632b09c3 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 12 Feb 2012 16:59:29 -0800 Subject: clear up scaffolding page to separate fixed from fluid grid systems --- docs/assets/css/bootstrap.css | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'docs/assets/css/bootstrap.css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 754e9af2d..61e67360c 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -212,40 +212,40 @@ a:hover { .row-fluid > [class*="span"]:first-child { margin-left: 0; } -.row-fluid .span1 { +.row-fluid > .span1 { width: 6.382978723%; } -.row-fluid .span2 { +.row-fluid > .span2 { width: 14.89361702%; } -.row-fluid .span3 { +.row-fluid > .span3 { width: 23.404255317%; } -.row-fluid .span4 { +.row-fluid > .span4 { width: 31.914893614%; } -.row-fluid .span5 { +.row-fluid > .span5 { width: 40.425531911%; } -.row-fluid .span6 { +.row-fluid > .span6 { width: 48.93617020799999%; } -.row-fluid .span7 { +.row-fluid > .span7 { width: 57.446808505%; } -.row-fluid .span8 { +.row-fluid > .span8 { width: 65.95744680199999%; } -.row-fluid .span9 { +.row-fluid > .span9 { width: 74.468085099%; } -.row-fluid .span10 { +.row-fluid > .span10 { width: 82.97872339599999%; } -.row-fluid .span11 { +.row-fluid > .span11 { width: 91.489361693%; } -.row-fluid .span12 { +.row-fluid > .span12 { width: 99.99999998999999%; } .container { -- cgit v1.2.3 From 3e00c1261fa3d48b184874c9f5b94ce370bd6449 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 12 Feb 2012 20:28:22 -0800 Subject: allow .input-prepend/.input-append to work in .navbar per #1681 --- docs/assets/css/bootstrap.css | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'docs/assets/css/bootstrap.css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 61e67360c..38b1719de 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -2530,6 +2530,13 @@ button.btn.small, input[type="submit"].btn.small { .navbar-form input[type="image"], .navbar-form input[type="checkbox"], .navbar-form input[type="radio"] { margin-top: 3px; } +.navbar-form .input-append, .navbar-form .input-prepend { + margin-top: 6px; + white-space: nowrap; +} +.navbar-form .input-append input, .navbar-form .input-prepend input { + margin-top: 0; +} .navbar-search { position: relative; float: left; -- cgit v1.2.3 From ce5976fb2901ec43c132fa7d517b9e2ca6041087 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 12 Feb 2012 22:49:06 -0800 Subject: ensure help-block is block per #1937 --- docs/assets/css/bootstrap.css | 1 + 1 file changed, 1 insertion(+) (limited to 'docs/assets/css/bootstrap.css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 38b1719de..e52d2f0cf 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -832,6 +832,7 @@ input:focus:required:invalid:focus, textarea:focus:required:invalid:focus, selec color: #999999; } .help-block { + display: block; margin-top: 5px; margin-bottom: 0; color: #999999; -- cgit v1.2.3 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