From 6b850132d056a136dc4734c4d68c9e1c23b7843e Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Fri, 2 Aug 2013 17:57:19 -0700 Subject: Remove requirement of `.list-group-flush` when list groups are in panels Fixes #8900 --- less/panels.less | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) (limited to 'less/panels.less') diff --git a/less/panels.less b/less/panels.less index 691a15545..715ae1873 100644 --- a/less/panels.less +++ b/less/panels.less @@ -11,6 +11,24 @@ border: 1px solid @panel-border; border-radius: @panel-border-radius; .box-shadow(0 1px 1px rgba(0,0,0,.05)); + + // List groups in panels + .list-group { + margin: 15px -15px -15px; + + .list-group-item { + border-width: 1px 0; + + // Remove border radius for top one + &:first-child { + .border-top-radius(0); + } + // But keep it for the last one + &:last-child { + border-bottom: 0; + } + } + } } // Optional heading @@ -82,21 +100,3 @@ border-color: @panel-info-border; } } - -// List groups in panels -.list-group-flush { - margin: 15px -15px -15px; - - .list-group-item { - border-width: 1px 0; - - // Remove border radius for top one - &:first-child { - .border-top-radius(0); - } - // But keep it for the last one - &:last-child { - border-bottom: 0; - } - } -} -- cgit v1.2.3 From a2823d0f5efa3bf8c831de65a13d240e295493e2 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 4 Aug 2013 23:44:02 -0700 Subject: Fixes #9061: Panel titles should inherit color when linked --- less/panels.less | 3 +++ 1 file changed, 3 insertions(+) (limited to 'less/panels.less') diff --git a/less/panels.less b/less/panels.less index 715ae1873..87a786524 100644 --- a/less/panels.less +++ b/less/panels.less @@ -47,6 +47,9 @@ margin-bottom: 0; font-size: (@font-size-base * 1.25); font-weight: 500; + > a { + color: inherit; + } } // Optional footer (stays gray in every modifier class) -- cgit v1.2.3 From f90ac58410fcc511531484341e12c79023369a17 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Guillermo=20Gonz=C3=A1lez=20de=20Ag=C3=BCero?= Date: Wed, 7 Aug 2013 20:19:12 +0200 Subject: Updated panels.less to use variant-panel mixin --- less/panels.less | 35 +++++------------------------------ 1 file changed, 5 insertions(+), 30 deletions(-) (limited to 'less/panels.less') diff --git a/less/panels.less b/less/panels.less index 87a786524..df20975ee 100644 --- a/less/panels.less +++ b/less/panels.less @@ -64,42 +64,17 @@ // Contextual variations .panel-primary { - border-color: @panel-primary-border; - .panel-heading { - color: @panel-primary-text; - background-color: @panel-primary-heading-bg; - border-color: @panel-primary-border; - } + .panel-variant(@panel-primary-border; @panel-primary-text; @panel-primary-heading-bg; @panel-primary-border); } .panel-success { - border-color: @panel-success-border; - .panel-heading { - color: @panel-success-text; - background-color: @panel-success-heading-bg; - border-color: @panel-success-border; - } + .panel-variant(@panel-success-border; @panel-success-text; @panel-success-heading-bg; @panel-success-border); } .panel-warning { - border-color: @panel-warning-border; - .panel-heading { - color: @panel-warning-text; - background-color: @panel-warning-heading-bg; - border-color: @panel-warning-border; - } + .panel-variant(@panel-warning-border; @panel-warning-text; @panel-warning-heading-bg; @panel-warning-border); } .panel-danger { - border-color: @panel-danger-border; - .panel-heading { - color: @panel-danger-text; - background-color: @panel-danger-heading-bg; - border-color: @panel-danger-border; - } + .panel-variant(@panel-danger-border; @panel-danger-text; @panel-danger-heading-bg; @panel-danger-border); } .panel-info { - border-color: @panel-info-border; - .panel-heading { - color: @panel-info-text; - background-color: @panel-info-heading-bg; - border-color: @panel-info-border; - } + .panel-variant(@panel-info-border; @panel-info-text; @panel-info-heading-bg; @panel-info-border); } -- cgit v1.2.3 From ee62c37f17c7a741f6465f067a797881737e6fb3 Mon Sep 17 00:00:00 2001 From: liuyl Date: Fri, 9 Aug 2013 15:24:38 +0800 Subject: panels --- less/panels.less | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'less/panels.less') diff --git a/less/panels.less b/less/panels.less index df20975ee..c1158d14f 100644 --- a/less/panels.less +++ b/less/panels.less @@ -37,8 +37,7 @@ padding: 10px 15px; background-color: @panel-heading-bg; border-bottom: 1px solid @panel-border; - border-top-left-radius: (@panel-border-radius - 1); - border-top-right-radius: (@panel-border-radius - 1); + .border-top-radius(@panel-border-radius - 1); } // Within heading, strip any `h*` tag of it's default margins for spacing. @@ -58,8 +57,7 @@ padding: 10px 15px; background-color: @panel-footer-bg; border-top: 1px solid @panel-border; - border-bottom-left-radius: (@panel-border-radius - 1); - border-bottom-right-radius: (@panel-border-radius - 1); + .border-bottom-radius(@panel-border-radius - 1); } // Contextual variations -- cgit v1.2.3 From 0561cfec6bb0fc0738f9f1cf5f4463e96fa1c33c Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 11 Aug 2013 15:01:16 -0700 Subject: fixes #8900: nuke empty space between panel heading and list group --- less/panels.less | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) (limited to 'less/panels.less') diff --git a/less/panels.less b/less/panels.less index c1158d14f..c6d96b39f 100644 --- a/less/panels.less +++ b/less/panels.less @@ -11,8 +11,14 @@ border: 1px solid @panel-border; border-radius: @panel-border-radius; .box-shadow(0 1px 1px rgba(0,0,0,.05)); +} + +// List groups in panels +// +// By default, space out list group content from panel headings to account for +// any kind of custom content between the two. - // List groups in panels +.panel { .list-group { margin: 15px -15px -15px; @@ -30,6 +36,13 @@ } } } +// Collapse space between when there's no additional content. +.panel-heading + .list-group { + margin-top: -15px; + .list-group-item:first-child { + border-top-width: 0; + } +} // Optional heading .panel-heading { -- cgit v1.2.3 From bf4900072dba32ba6db36321f6d3175bd4b43718 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 11 Aug 2013 19:20:23 -0700 Subject: Drop the font-weight on panel labels since heading elements already get it --- less/panels.less | 1 - 1 file changed, 1 deletion(-) (limited to 'less/panels.less') diff --git a/less/panels.less b/less/panels.less index c6d96b39f..b78f0796a 100644 --- a/less/panels.less +++ b/less/panels.less @@ -58,7 +58,6 @@ margin-top: 0; margin-bottom: 0; font-size: (@font-size-base * 1.25); - font-weight: 500; > a { color: inherit; } -- cgit v1.2.3 From 237640c70697ffa0605770dee625d9e3c6abf479 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 12 Aug 2013 23:36:25 -0700 Subject: Drop the accordion for the panel * Deletes the accordion.less file * Extends the panel to be collapsible with our JS plugin * Supports panel color variations --- less/panels.less | 50 ++++++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 44 insertions(+), 6 deletions(-) (limited to 'less/panels.less') diff --git a/less/panels.less b/less/panels.less index b78f0796a..063973160 100644 --- a/less/panels.less +++ b/less/panels.less @@ -5,14 +5,18 @@ // Base class .panel { - padding: 15px; - margin-bottom: 20px; + margin-bottom: @line-height-computed; background-color: @panel-bg; border: 1px solid @panel-border; border-radius: @panel-border-radius; .box-shadow(0 1px 1px rgba(0,0,0,.05)); } +// Panel contents +.panel-body { + padding: 15px; +} + // List groups in panels // // By default, space out list group content from panel headings to account for @@ -20,7 +24,7 @@ .panel { .list-group { - margin: 15px -15px -15px; + margin-bottom: 0; .list-group-item { border-width: 1px 0; @@ -38,7 +42,6 @@ } // Collapse space between when there's no additional content. .panel-heading + .list-group { - margin-top: -15px; .list-group-item:first-child { border-top-width: 0; } @@ -46,7 +49,6 @@ // Optional heading .panel-heading { - margin: -15px -15px 15px; padding: 10px 15px; background-color: @panel-heading-bg; border-bottom: 1px solid @panel-border; @@ -65,13 +67,49 @@ // Optional footer (stays gray in every modifier class) .panel-footer { - margin: 15px -15px -15px; padding: 10px 15px; background-color: @panel-footer-bg; border-top: 1px solid @panel-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 +// the help of our collapse JavaScript plugin. + +.panel-group { + // Tighten up margin so it's only between panels + .panel { + margin-bottom: 0; + border-radius: @panel-border-radius; + overflow: hidden; // crop contents when collapsed + + .panel { + margin-top: 5px; + } + } + + .panel-heading { + border-bottom: 0; + + .panel-collapse .panel-body { + border-top: 1px solid @panel-border; + } + } + .panel-footer { + border-top: 0; + + .panel-collapse .panel-body { + border-bottom: 1px solid @panel-border; + } + } + + // New subcomponent for wrapping collapsable content for proper animations + .panel-collapse { + + } +} + + // Contextual variations .panel-primary { .panel-variant(@panel-primary-border; @panel-primary-text; @panel-primary-heading-bg; @panel-primary-border); -- cgit v1.2.3 From fc88bcf0d15417c05c6d37027579bb5e3cb34236 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 15 Aug 2013 18:58:02 -0700 Subject: fixes #9655: scrope list group styles in panels to immediate children only --- less/panels.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'less/panels.less') diff --git a/less/panels.less b/less/panels.less index 063973160..6d22dd965 100644 --- a/less/panels.less +++ b/less/panels.less @@ -23,7 +23,7 @@ // any kind of custom content between the two. .panel { - .list-group { + > .list-group { margin-bottom: 0; .list-group-item { -- cgit v1.2.3