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 --- less/popovers.less | 58 ------------------------------------------------------ 1 file changed, 58 deletions(-) (limited to 'less') diff --git a/less/popovers.less b/less/popovers.less index 4a23fad0f..b5b2a7eb5 100644 --- a/less/popovers.less +++ b/less/popovers.less @@ -126,62 +126,4 @@ } } - - -/* - &.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; - } - }*/ } -- 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. --- less/code.less | 2 ++ 1 file changed, 2 insertions(+) (limited to 'less') diff --git a/less/code.less b/less/code.less index ea1e749ae..266a926e7 100644 --- a/less/code.less +++ b/less/code.less @@ -47,6 +47,8 @@ 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 --- less/breadcrumbs.less | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'less') diff --git a/less/breadcrumbs.less b/less/breadcrumbs.less index 4c7c9a4a3..f753df6be 100644 --- a/less/breadcrumbs.less +++ b/less/breadcrumbs.less @@ -13,10 +13,10 @@ display: inline-block; .ie7-inline-block(); text-shadow: 0 1px 0 @white; - } - > .divider { - padding: 0 5px; - color: #ccc; + > .divider { + padding: 0 5px; + color: #ccc; + } } > .active { color: @grayLight; -- 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 --- less/buttons.less | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'less') diff --git a/less/buttons.less b/less/buttons.less index 78371c6ff..6f565b73c 100644 --- a/less/buttons.less +++ b/less/buttons.less @@ -86,6 +86,10 @@ .btn-small [class*=" icon-"] { margin-top: 0; } +.btn-mini [class^="icon-"], +.btn-mini [class*=" icon-"] { + margin-top: -1px; +} // Mini .btn-mini { -- 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 --- less/tables.less | 20 +++++++++---------- less/tests/css-tests.html | 49 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 59 insertions(+), 10 deletions(-) (limited to 'less') diff --git a/less/tables.less b/less/tables.less index d73b58180..b816e7c2d 100644 --- a/less/tables.less +++ b/less/tables.less @@ -89,23 +89,23 @@ table { border-top: 0; } // For first th or td in the first row in the first thead or tbody - thead:first-child tr:first-child th:first-child, - tbody:first-child tr:first-child td:first-child { + thead:first-child tr:first-child > th:first-child, + tbody:first-child tr:first-child > td:first-child { .border-top-left-radius(@baseBorderRadius); } - thead:first-child tr:first-child th:last-child, - tbody:first-child tr:first-child td:last-child { + thead:first-child tr:first-child > th:last-child, + tbody:first-child tr:first-child > td:last-child { .border-top-right-radius(@baseBorderRadius); } // For first th or td in the last row in the last thead or tbody - thead:last-child tr:last-child th:first-child, - tbody:last-child tr:last-child td:first-child, - tfoot:last-child tr:last-child td:first-child { + thead:last-child tr:last-child > th:first-child, + tbody:last-child tr:last-child > td:first-child, + tfoot:last-child tr:last-child > td:first-child { .border-bottom-left-radius(@baseBorderRadius); } - thead:last-child tr:last-child th:last-child, - tbody:last-child tr:last-child td:last-child, - tfoot:last-child tr:last-child td:last-child { + thead:last-child tr:last-child > th:last-child, + tbody:last-child tr:last-child > td:last-child, + tfoot:last-child tr:last-child > td:last-child { .border-bottom-right-radius(@baseBorderRadius); } diff --git a/less/tests/css-tests.html b/less/tests/css-tests.html index 70b8904b3..035ba8bd4 100644 --- a/less/tests/css-tests.html +++ b/less/tests/css-tests.html @@ -593,6 +593,55 @@ +

Nesting and striping

+ + + + + + + + + + + +
Test
+ + + + + + + + + + + + + + + + + + + + + +
TestTest
+ test + + test +
+ test + + test +
+ test + + test +
+
+

Fluid grid sizing

-- 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 --- less/tables.less | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'less') diff --git a/less/tables.less b/less/tables.less index b816e7c2d..f3b9967f0 100644 --- a/less/tables.less +++ b/less/tables.less @@ -48,6 +48,11 @@ table { tbody + tbody { border-top: 2px solid @tableBorder; } + + // Nesting + .table { + background-color: @bodyBackground; + } } @@ -143,8 +148,8 @@ table { // Default zebra-stripe styles (alternating gray and transparent backgrounds) .table-striped { tbody { - tr:nth-child(odd) td, - tr:nth-child(odd) th { + > tr:nth-child(odd) > td, + > tr:nth-child(odd) > th { background-color: @tableBackgroundAccent; } } -- cgit v1.2.3