From d91d9b0ade9165c20d781ced128a751d0ae1fbda Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Fri, 7 Feb 2014 02:38:01 -0800 Subject: Fixes #12447: Properly reset borders on table cells in panels --- less/panels.less | 83 +++++++++++++++++++++++++++++++------------------------- 1 file changed, 46 insertions(+), 37 deletions(-) (limited to 'less') diff --git a/less/panels.less b/less/panels.less index e677d2b29..d00d81241 100644 --- a/less/panels.less +++ b/less/panels.less @@ -18,6 +18,37 @@ &:extend(.clearfix all); } +// Optional heading +.panel-heading { + padding: 10px 15px; + border-bottom: 1px solid transparent; + .border-top-radius((@panel-border-radius - 1)); + + > .dropdown .dropdown-toggle { + color: inherit; + } +} + +// Within heading, strip any `h*` tag of its default margins for spacing. +.panel-title { + margin-top: 0; + margin-bottom: 0; + font-size: ceil((@font-size-base * 1.125)); + color: inherit; + + > a { + color: inherit; + } +} + +// Optional footer (stays gray in every modifier class) +.panel-footer { + padding: 10px 15px; + background-color: @panel-footer-bg; + border-top: 1px solid @panel-inner-border; + .border-bottom-radius((@panel-border-radius - 1)); +} + // List groups in panels // @@ -126,12 +157,22 @@ > td:last-child { border-right: 0; } - &:first-child > th, - &:first-child > td { - border-top: 0; + } + } + > thead, + > tbody { + > tr:first-child { + > td, + > th { + border-bottom: 0; } - &:last-child > th, - &:last-child > td { + } + } + > tbody, + > tfoot { + > tr:last-child { + > td, + > th { border-bottom: 0; } } @@ -144,38 +185,6 @@ } -// Optional heading -.panel-heading { - padding: 10px 15px; - border-bottom: 1px solid transparent; - .border-top-radius((@panel-border-radius - 1)); - - > .dropdown .dropdown-toggle { - color: inherit; - } -} - -// Within heading, strip any `h*` tag of its default margins for spacing. -.panel-title { - margin-top: 0; - margin-bottom: 0; - font-size: ceil((@font-size-base * 1.125)); - color: inherit; - - > a { - color: inherit; - } -} - -// Optional footer (stays gray in every modifier class) -.panel-footer { - padding: 10px 15px; - background-color: @panel-footer-bg; - border-top: 1px solid @panel-inner-border; - .border-bottom-radius((@panel-border-radius - 1)); -} - - // Collapsable panels (aka, accordion) // // Wrap a series of panels in `.panel-group` to turn them into an accordion with -- cgit v1.2.3 From a2f08158d032c1025ca0c6bf411b8282b606fb7b Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Fri, 7 Feb 2014 15:44:50 -0800 Subject: Nuke shit I added in 4d7b2ddba92e47f923d22d9d7b23cb7b0a3e0bc2 that shouldn't come until v4 --- less/forms.less | 4 ---- 1 file changed, 4 deletions(-) (limited to 'less') diff --git a/less/forms.less b/less/forms.less index df83c9d8d..f607b8509 100644 --- a/less/forms.less +++ b/less/forms.less @@ -137,10 +137,6 @@ output { // HTML5 says that controls under a fieldset > legend:first-child won't be // disabled if the fieldset is disabled. Due to implementation difficulty, we // don't honor that edge case; we style them as disabled anyway. - // - // Also note that we include `[disabled]` for IE8. All other browsers take the - // `:disabled` selector. - &:disabled, &[disabled], &[readonly], fieldset[disabled] & { -- cgit v1.2.3 From 4c163600364243fd710b5e69ef3ba5365b16fc6d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zlatan=20Vasovi=C4=87?= Date: Sat, 8 Feb 2014 22:11:49 +0100 Subject: Fix #12656: add @blockquote-font-size --- less/type.less | 2 +- less/variables.less | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) (limited to 'less') diff --git a/less/type.less b/less/type.less index a55730dfe..ca574edc8 100644 --- a/less/type.less +++ b/less/type.less @@ -233,7 +233,7 @@ abbr[data-original-title] { blockquote { padding: (@line-height-computed / 2) @line-height-computed; margin: 0 0 @line-height-computed; - font-size: (@font-size-base * 1.25); + font-size: @blockquote-font-size; border-left: 5px solid @blockquote-border-color; p, diff --git a/less/variables.less b/less/variables.less index 4fb811d29..729da7cc9 100644 --- a/less/variables.less +++ b/less/variables.less @@ -810,6 +810,8 @@ @headings-small-color: @gray-light; //** Blockquote small color @blockquote-small-color: @gray-light; +//** Blockquote font size +@blockquote-font-size: (@font-size-base * 1.25); //** Blockquote border color @blockquote-border-color: @gray-lighter; //** Page header border color -- cgit v1.2.3