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') 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/bootstrap.zip | Bin 52560 -> 52621 bytes docs/assets/css/bootstrap.css | 13 ++++++++----- docs/assets/css/docs.css | 3 --- 3 files changed, 8 insertions(+), 8 deletions(-) (limited to 'docs/assets') diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip index ed47cebd5..416ee8766 100644 Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ 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; diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index c3a6848d7..4cdbb0c7c 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -481,9 +481,6 @@ hr.soften { /* Misc -------------------------------------------------- */ -pre.prettyprint { - overflow: hidden; -} .browser-support { max-width: 100%; -- cgit v1.2.3 From 8a91f927f51fc96221dd553baef5dbe73b8b9b4c Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Fri, 10 Feb 2012 23:37:54 -0800 Subject: clarify npm install command in less docs --- docs/assets/bootstrap.zip | Bin 52621 -> 52621 bytes 1 file changed, 0 insertions(+), 0 deletions(-) (limited to 'docs/assets') diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip index 416ee8766..382cbcef4 100644 Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ -- cgit v1.2.3 From c720d951be4481dab684955b7ef1a4ebb03ed0cf Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Fri, 10 Feb 2012 23:50:45 -0800 Subject: add best practices and re-org the button groups --- docs/assets/bootstrap.zip | Bin 52621 -> 52621 bytes 1 file changed, 0 insertions(+), 0 deletions(-) (limited to 'docs/assets') diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip index 382cbcef4..0c63fb363 100644 Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ -- cgit v1.2.3 From b4b3343a617f8b23abcfa502dfd5fb4ff7c50ba1 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Fri, 10 Feb 2012 23:57:31 -0800 Subject: clarify structure of responsive css file --- docs/assets/bootstrap.zip | Bin 52621 -> 52621 bytes 1 file changed, 0 insertions(+), 0 deletions(-) (limited to 'docs/assets') diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip index 0c63fb363..d0a3ffdf7 100644 Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ -- 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/bootstrap.zip | Bin 52621 -> 52623 bytes docs/assets/css/bootstrap.css | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) (limited to 'docs/assets') diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip index d0a3ffdf7..6db7bd327 100644 Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ 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 02cb4df4697acacfdc65560e14994eccd6ebda7e Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 11 Feb 2012 00:01:35 -0800 Subject: fix some single vs double quotes, fix typo in js docs per #1900 --- docs/assets/bootstrap.zip | Bin 52623 -> 52623 bytes 1 file changed, 0 insertions(+), 0 deletions(-) (limited to 'docs/assets') diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip index 6db7bd327..3bbb15de1 100644 Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ -- cgit v1.2.3 From a63663a3b6309e98068a79b863b0f77031e5035e Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 11 Feb 2012 00:02:28 -0800 Subject: fix type in less docs per #1902 --- docs/assets/bootstrap.zip | Bin 52623 -> 52623 bytes 1 file changed, 0 insertions(+), 0 deletions(-) (limited to 'docs/assets') diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip index 3bbb15de1..3b87a25c0 100644 Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ -- 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/bootstrap.zip | Bin 52623 -> 52644 bytes docs/assets/css/bootstrap.css | 4 ++-- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'docs/assets') diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip index 3b87a25c0..ce828690e 100644 Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ 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 cbccbed8c8ebdfe0f02502b1915106d56c90b3cc Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 11 Feb 2012 00:10:26 -0800 Subject: fix javascript text on tooltips per #1862 --- docs/assets/bootstrap.zip | Bin 52644 -> 52644 bytes 1 file changed, 0 insertions(+), 0 deletions(-) (limited to 'docs/assets') diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip index ce828690e..feffa87c0 100644 Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ -- 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/bootstrap.zip | Bin 52644 -> 52641 bytes docs/assets/css/bootstrap.css | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) (limited to 'docs/assets') diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip index feffa87c0..8f614f14d 100644 Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ 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 60ee76853726f9711a41a865169d66cf136e5f71 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 11 Feb 2012 00:16:13 -0800 Subject: fix type on responsive grid per #1852 --- docs/assets/bootstrap.zip | Bin 52641 -> 52641 bytes 1 file changed, 0 insertions(+), 0 deletions(-) (limited to 'docs/assets') diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip index 8f614f14d..e8ca60a6d 100644 Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ -- 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/bootstrap.zip | Bin 52641 -> 52675 bytes docs/assets/css/bootstrap.css | 7 +++++++ 2 files changed, 7 insertions(+) (limited to 'docs/assets') diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip index e8ca60a6d..3097692de 100644 Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ 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 2679c3ebe3bb21599826dd204b1c9df44d217497 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 11 Feb 2012 10:13:53 -0800 Subject: remove the reset type from cancel buttons in forms examples per #1844 --- docs/assets/bootstrap.zip | Bin 52675 -> 52675 bytes 1 file changed, 0 insertions(+), 0 deletions(-) (limited to 'docs/assets') diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip index 3097692de..81a5fd5ba 100644 Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ -- cgit v1.2.3 From 102bb8e68439d28334c2c9f6e4579fdd9950c102 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 11 Feb 2012 10:38:41 -0800 Subject: clear up some messaging in docs on fluid grid system and nesting overall --- docs/assets/bootstrap.zip | Bin 52675 -> 52675 bytes 1 file changed, 0 insertions(+), 0 deletions(-) (limited to 'docs/assets') diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip index 81a5fd5ba..ed52bb830 100644 Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ -- 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/bootstrap.zip | Bin 52675 -> 52665 bytes docs/assets/css/bootstrap.css | 1 - 2 files changed, 1 deletion(-) (limited to 'docs/assets') diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip index ed52bb830..6532a299b 100644 Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ 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/bootstrap.zip | Bin 52665 -> 52683 bytes docs/assets/css/bootstrap.css | 4 ++++ 2 files changed, 4 insertions(+) (limited to 'docs/assets') diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip index 6532a299b..77e70e94d 100644 Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ 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 a497e9010a5fcf4fce7e7112a0d3f32da57e8adb Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 11 Feb 2012 17:12:32 -0800 Subject: make button examples button element and add upgrade note on tooltip positions per #1532 --- docs/assets/bootstrap.zip | Bin 52683 -> 52683 bytes 1 file changed, 0 insertions(+), 0 deletions(-) (limited to 'docs/assets') diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip index 77e70e94d..dc3849f1d 100644 Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ -- cgit v1.2.3 From a84092d2257ba8e000e2c656e6cb1b8415d0d9ac Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 11 Feb 2012 17:25:47 -0800 Subject: update buttons docs for .disabled class per #1774 --- docs/assets/bootstrap.zip | Bin 52683 -> 52683 bytes 1 file changed, 0 insertions(+), 0 deletions(-) (limited to 'docs/assets') diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip index dc3849f1d..9055e367e 100644 Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ -- 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/bootstrap.zip | Bin 52683 -> 52687 bytes docs/assets/css/bootstrap.css | 3 +++ 2 files changed, 3 insertions(+) (limited to 'docs/assets') diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip index 9055e367e..3284ea5eb 100644 Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ 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 5bb55e46157ec974120535acdb6335841c85fa37 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 11 Feb 2012 19:21:23 -0800 Subject: change fixed height on responsive textareas to min-height --- docs/assets/bootstrap.zip | Bin 52687 -> 52693 bytes docs/assets/css/bootstrap-responsive.css | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) (limited to 'docs/assets') diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip index 3284ea5eb..4bad32b3e 100644 Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ diff --git a/docs/assets/css/bootstrap-responsive.css b/docs/assets/css/bootstrap-responsive.css index 4d464ea88..c8c630296 100644 --- a/docs/assets/css/bootstrap-responsive.css +++ b/docs/assets/css/bootstrap-responsive.css @@ -25,7 +25,7 @@ .uneditable-input { display: block; width: 100%; - height: 28px; + min-height: 28px; /* Make inputs at least the height of their button counterpart */ /* Makes inputs behave like true block-level elements */ -- 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/bootstrap.zip | Bin 52693 -> 52705 bytes docs/assets/css/bootstrap.css | 3 +++ 2 files changed, 3 insertions(+) (limited to 'docs/assets') diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip index 4bad32b3e..48e48f502 100644 Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ 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/bootstrap.zip | Bin 52705 -> 52705 bytes docs/assets/css/bootstrap.css | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) (limited to 'docs/assets') diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip index 48e48f502..f107f2521 100644 Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ 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 2eedf60d6284f8eef256999d2a59dd18bcbd2b2a Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 11 Feb 2012 22:34:41 -0800 Subject: write out icon classes explicitly to enable find via browser --- docs/assets/bootstrap.zip | Bin 52705 -> 52705 bytes docs/assets/css/docs.css | 20 ++------------------ 2 files changed, 2 insertions(+), 18 deletions(-) (limited to 'docs/assets') diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip index f107f2521..1619fc54f 100644 Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index 4cdbb0c7c..a532d0819 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -543,28 +543,12 @@ form.well { /* Icons ------------------------- */ .the-icons { - margin-bottom: 18px; -} -.the-icons i { - display: block; - margin-bottom: 5px; + margin-left: 0; + list-style: none; } .the-icons i:hover { background-color: rgba(255,0,0,.25); } -.the-icons i:after { - display: block; - content: attr(class); - font-style: normal; - margin-left: 20px; - width: 140px; -} -#javascript input[type=checkbox] { - position: relative; - top: -1px; - display: inline; - margin-left: 6px; -} /* Eaxmples page ------------------------- */ -- cgit v1.2.3