From 306c1b49147c388b7c458a939989bf33d464a69d Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 5 Dec 2012 11:06:16 -0800 Subject: Remove commented out old popover CSS --- docs/assets/css/bootstrap.css | 60 ------------------------------------------- 1 file changed, 60 deletions(-) (limited to 'docs/assets/css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 4a06a956b..5ed924b9b 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -5354,66 +5354,6 @@ input[type="submit"].btn.btn-mini { content: ""; } -.popover { - /* - &.top .arrow { - bottom: -@popoverArrowWidth; - left: 50%; - margin-left: -@popoverArrowWidth; - border-width: @popoverArrowWidth @popoverArrowWidth 0; - //border-top-color: @popoverArrowColor; - border-top-color: blue; - &:after { - border-width: @popoverArrowOuterWidth @popoverArrowOuterWidth 0; - //border-top-color: @popoverArrowOuterColor; - border-top-color: red; - top: -@popoverArrowWidth; - //bottom: -1px; - left: -@popoverArrowOuterWidth; - } - } - &.right .arrow { - top: 50%; - left: -@popoverArrowWidth; - margin-top: -@popoverArrowWidth; - border-width: @popoverArrowWidth @popoverArrowWidth @popoverArrowWidth 0; - border-right-color: @popoverArrowColor; - &:after { - border-width: @popoverArrowOuterWidth @popoverArrowOuterWidth @popoverArrowOuterWidth 0; - border-right-color: @popoverArrowOuterColor; - bottom: -@popoverArrowOuterWidth; - left: -1px; - } - } - &.bottom .arrow { - top: -@popoverArrowWidth; - left: 50%; - margin-left: -@popoverArrowWidth; - border-width: 0 @popoverArrowWidth @popoverArrowWidth; - border-bottom-color: @popoverArrowColor; - &:after { - border-width: 0 @popoverArrowOuterWidth @popoverArrowOuterWidth; - border-bottom-color: @popoverArrowOuterColor; - top: -1px; - left: -@popoverArrowOuterWidth; - } - } - &.left .arrow { - top: 50%; - right: -@popoverArrowWidth; - margin-top: -@popoverArrowWidth; - border-width: @popoverArrowWidth 0 @popoverArrowWidth @popoverArrowWidth; - border-left-color: @popoverArrowColor; - &:after { - border-width: @popoverArrowOuterWidth 0 @popoverArrowOuterWidth @popoverArrowOuterWidth; - border-left-color: @popoverArrowOuterColor; - bottom: -@popoverArrowOuterWidth; - right: -1px; - } - }*/ - -} - .popover.top .arrow { bottom: -11px; left: 50%; -- cgit v1.2.3 From f4466dd9c72da5604b1aa45c81d2d0e4cac3fad6 Mon Sep 17 00:00:00 2001 From: Bryan Petty Date: Thu, 6 Dec 2012 11:33:00 -0700 Subject: Fix code block white-space breaks within pre tags. --- docs/assets/css/bootstrap.css | 2 ++ 1 file changed, 2 insertions(+) (limited to 'docs/assets/css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 5ed924b9b..9c0e99844 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -993,6 +993,8 @@ pre.prettyprint { pre code { padding: 0; color: inherit; + white-space: pre; + white-space: pre-wrap; background-color: transparent; border: 0; } -- cgit v1.2.3 From 2c7ab23d7aae889b9bc649517f1c0654e69fd57e Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Fri, 7 Dec 2012 09:43:09 -0800 Subject: Fixes #6136: Proper scoping of breadcrumbs divider --- docs/assets/css/bootstrap.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docs/assets/css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 5ed924b9b..d6ac78f26 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -4866,7 +4866,7 @@ input[type="submit"].btn.btn-mini { *zoom: 1; } -.breadcrumb > .divider { +.breadcrumb > li > .divider { padding: 0 5px; color: #ccc; } -- cgit v1.2.3 From be45a821bb3387cac0944d80f7569b912cc21483 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Fri, 7 Dec 2012 09:51:01 -0800 Subject: Fixes #6148: Icons in mini buttons properly aligned --- docs/assets/css/bootstrap.css | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'docs/assets/css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index d6ac78f26..0891964de 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -3258,6 +3258,11 @@ button.close { margin-top: 0; } +.btn-mini [class^="icon-"], +.btn-mini [class*=" icon-"] { + margin-top: -1px; +} + .btn-mini { padding: 0 6px; font-size: 10.5px; -- cgit v1.2.3 From cacc2137620675f81ab8895c2988778d12f92596 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 8 Dec 2012 12:52:19 -0800 Subject: Nesting tables * Add simple test to css-tests.html * Scope .table-bordered to immediate children th/td elements only --- docs/assets/css/bootstrap.css | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'docs/assets/css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 30e6e40a2..c0838edc5 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -2044,31 +2044,31 @@ table { border-top: 0; } -.table-bordered thead:first-child tr:first-child th:first-child, -.table-bordered tbody:first-child tr:first-child td:first-child { +.table-bordered thead:first-child tr:first-child > th:first-child, +.table-bordered tbody:first-child tr:first-child > td:first-child { -webkit-border-top-left-radius: 4px; border-top-left-radius: 4px; -moz-border-radius-topleft: 4px; } -.table-bordered thead:first-child tr:first-child th:last-child, -.table-bordered tbody:first-child tr:first-child td:last-child { +.table-bordered thead:first-child tr:first-child > th:last-child, +.table-bordered tbody:first-child tr:first-child > td:last-child { -webkit-border-top-right-radius: 4px; border-top-right-radius: 4px; -moz-border-radius-topright: 4px; } -.table-bordered thead:last-child tr:last-child th:first-child, -.table-bordered tbody:last-child tr:last-child td:first-child, -.table-bordered tfoot:last-child tr:last-child td:first-child { +.table-bordered thead:last-child tr:last-child > th:first-child, +.table-bordered tbody:last-child tr:last-child > td:first-child, +.table-bordered tfoot:last-child tr:last-child > td:first-child { -webkit-border-bottom-left-radius: 4px; border-bottom-left-radius: 4px; -moz-border-radius-bottomleft: 4px; } -.table-bordered thead:last-child tr:last-child th:last-child, -.table-bordered tbody:last-child tr:last-child td:last-child, -.table-bordered tfoot:last-child tr:last-child td:last-child { +.table-bordered thead:last-child tr:last-child > th:last-child, +.table-bordered tbody:last-child tr:last-child > td:last-child, +.table-bordered tfoot:last-child tr:last-child > td:last-child { -webkit-border-bottom-right-radius: 4px; border-bottom-right-radius: 4px; -moz-border-radius-bottomright: 4px; -- cgit v1.2.3 From 9376a7c221a64c2bf508d02ea2ccd85748d10fcc Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 8 Dec 2012 12:57:21 -0800 Subject: Fixes #5729: Nested striped tables * Scopes striping to immediate children of the tbody and tr * For nested tables, sets a background color of @bodyBackground, to override the default transparent bg --- docs/assets/css/bootstrap.css | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'docs/assets/css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index c0838edc5..8ab3cefcf 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -2012,6 +2012,10 @@ table { border-top: 2px solid #dddddd; } +.table .table { + background-color: #ffffff; +} + .table-condensed th, .table-condensed td { padding: 4px 5px; @@ -2104,8 +2108,8 @@ table { -moz-border-radius-topright: 4px; } -.table-striped tbody tr:nth-child(odd) td, -.table-striped tbody tr:nth-child(odd) th { +.table-striped tbody > tr:nth-child(odd) > td, +.table-striped tbody > tr:nth-child(odd) > th { background-color: #f9f9f9; } -- cgit v1.2.3