From ecbb0ed4df3975d473e3c3558db322e26c6620ae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20Cederstro=CC=88m?= Date: Thu, 27 Sep 2012 11:44:48 +0200 Subject: Making modal work with max width 767px - fixes #4860 --- docs/assets/css/bootstrap-responsive.css | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'docs') diff --git a/docs/assets/css/bootstrap-responsive.css b/docs/assets/css/bootstrap-responsive.css index f1efde190..5320eadf8 100644 --- a/docs/assets/css/bootstrap-responsive.css +++ b/docs/assets/css/bootstrap-responsive.css @@ -872,8 +872,11 @@ width: auto; margin: 0; } + .modal.fade { + top: -100px; + } .modal.fade.in { - top: auto; + top: 20px; } } -- cgit v1.2.3 From 50355929887bf1ff3ecbf4269d0ff05438a6ef5a Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 1 Oct 2012 11:53:52 -0700 Subject: fixes #5193 manually: checkbox and radio padding in .controls-row --- docs/assets/css/bootstrap.css | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'docs') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index eb810c209..54046fcd1 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -1329,6 +1329,11 @@ textarea.span1, float: left; } +.controls-row .checkbox[class*="span"], +.controls-row .radio[class*="span"] { + padding-top: 5px; +} + input[disabled], select[disabled], textarea[disabled], -- cgit v1.2.3 From bc4f5d565ef2a7a8ff71f255d3c147efef4f7039 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 1 Oct 2012 12:04:10 -0700 Subject: fixes #5275: inline-block badges and labels, then fix padding accordingly --- docs/assets/css/bootstrap.css | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'docs') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 54046fcd1..891a754a3 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -5435,6 +5435,8 @@ a.thumbnail:hover { .label, .badge { + display: inline-block; + padding: 2px 4px; font-size: 11.844px; font-weight: bold; line-height: 14px; @@ -5446,14 +5448,14 @@ a.thumbnail:hover { } .label { - padding: 1px 4px 2px; -webkit-border-radius: 3px; -moz-border-radius: 3px; border-radius: 3px; } .badge { - padding: 1px 9px 2px; + padding-right: 9px; + padding-left: 9px; -webkit-border-radius: 9px; -moz-border-radius: 9px; border-radius: 9px; -- cgit v1.2.3 From f8ac403d8b9fde348fe333903a62d644ce795826 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 1 Oct 2012 13:08:21 -0700 Subject: fixes #5123: scope table grid classes to td and th elements only, plus drop columns 13-24 --- docs/assets/css/bootstrap.css | 108 ++++++++++-------------------------------- 1 file changed, 24 insertions(+), 84 deletions(-) (limited to 'docs') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 891a754a3..25b0a1982 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -2023,150 +2023,90 @@ table [class*=span], margin-left: 0; } -.table .span1 { +.table td.span1, +.table th.span1 { float: none; width: 44px; margin-left: 0; } -.table .span2 { +.table td.span2, +.table th.span2 { float: none; width: 124px; margin-left: 0; } -.table .span3 { +.table td.span3, +.table th.span3 { float: none; width: 204px; margin-left: 0; } -.table .span4 { +.table td.span4, +.table th.span4 { float: none; width: 284px; margin-left: 0; } -.table .span5 { +.table td.span5, +.table th.span5 { float: none; width: 364px; margin-left: 0; } -.table .span6 { +.table td.span6, +.table th.span6 { float: none; width: 444px; margin-left: 0; } -.table .span7 { +.table td.span7, +.table th.span7 { float: none; width: 524px; margin-left: 0; } -.table .span8 { +.table td.span8, +.table th.span8 { float: none; width: 604px; margin-left: 0; } -.table .span9 { +.table td.span9, +.table th.span9 { float: none; width: 684px; margin-left: 0; } -.table .span10 { +.table td.span10, +.table th.span10 { float: none; width: 764px; margin-left: 0; } -.table .span11 { +.table td.span11, +.table th.span11 { float: none; width: 844px; margin-left: 0; } -.table .span12 { +.table td.span12, +.table th.span12 { float: none; width: 924px; margin-left: 0; } -.table .span13 { - float: none; - width: 1004px; - margin-left: 0; -} - -.table .span14 { - float: none; - width: 1084px; - margin-left: 0; -} - -.table .span15 { - float: none; - width: 1164px; - margin-left: 0; -} - -.table .span16 { - float: none; - width: 1244px; - margin-left: 0; -} - -.table .span17 { - float: none; - width: 1324px; - margin-left: 0; -} - -.table .span18 { - float: none; - width: 1404px; - margin-left: 0; -} - -.table .span19 { - float: none; - width: 1484px; - margin-left: 0; -} - -.table .span20 { - float: none; - width: 1564px; - margin-left: 0; -} - -.table .span21 { - float: none; - width: 1644px; - margin-left: 0; -} - -.table .span22 { - float: none; - width: 1724px; - margin-left: 0; -} - -.table .span23 { - float: none; - width: 1804px; - margin-left: 0; -} - -.table .span24 { - float: none; - width: 1884px; - margin-left: 0; -} - .table tbody tr.success td { background-color: #dff0d8; } -- cgit v1.2.3 From fd1e9b1498f3bae87025839bf44865d937795cc7 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 1 Oct 2012 13:28:54 -0700 Subject: fix copy on modal popover button doodad --- docs/javascript.html | 2 +- docs/templates/pages/javascript.mustache | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'docs') diff --git a/docs/javascript.html b/docs/javascript.html index f13668877..c61c0bc4f 100644 --- a/docs/javascript.html +++ b/docs/javascript.html @@ -224,7 +224,7 @@ $('#myModal').on('show', function (e) {

Duis mollis, est non commodo luctus, nisi erat porttitor ligula, eget lacinia odio sem.

Popover in a modal

-

This button should trigger a popover on hover.

+

This button should trigger a popover on click.

Tooltips in a modal

This link and that link should have tooltips on hover.

diff --git a/docs/templates/pages/javascript.mustache b/docs/templates/pages/javascript.mustache index 0406fd769..88ddbf6e0 100644 --- a/docs/templates/pages/javascript.mustache +++ b/docs/templates/pages/javascript.mustache @@ -154,7 +154,7 @@ $('#myModal').on('show', function (e) {

Duis mollis, est non commodo luctus, nisi erat porttitor ligula, eget lacinia odio sem.

{{_i}}Popover in a modal{{/i}}

-

{{_i}}This button should trigger a popover on hover.{{/i}}

+

{{_i}}This button should trigger a popover on click.{{/i}}

{{_i}}Tooltips in a modal{{/i}}

{{_i}}This link and that link should have tooltips on hover.{{/i}}

-- cgit v1.2.3 From 86d5ed6f4f688f8aa67a26c9b1f664123edf716f Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 1 Oct 2012 13:52:50 -0700 Subject: fixes #5377: change selectors for navbar collapse to be unique so only one open/closes at a time --- docs/components.html | 8 ++++---- docs/templates/pages/components.mustache | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) (limited to 'docs') diff --git a/docs/components.html b/docs/components.html index ea0e12272..f369cfa1b 100644 --- a/docs/components.html +++ b/docs/components.html @@ -1260,13 +1260,13 @@
- + Title -
+