aboutsummaryrefslogtreecommitdiff
path: root/less
diff options
context:
space:
mode:
authorfat <[email protected]>2013-07-25 23:30:29 -0700
committerfat <[email protected]>2013-07-25 23:30:29 -0700
commitf58827f24d6593bc36ff48b4c58a0fd954427326 (patch)
tree2770668c3b1fe4a6eab4d5cca7a6f713f752c800 /less
parentf5f04ae4a0cd57c59c782a45cca28220d5dbb3ea (diff)
parent8a7553aeda0a99598c54637bc22954ca890cb697 (diff)
downloadbootstrap-f58827f24d6593bc36ff48b4c58a0fd954427326.tar.xz
bootstrap-f58827f24d6593bc36ff48b4c58a0fd954427326.zip
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
Diffstat (limited to 'less')
-rw-r--r--less/panels.less10
1 files changed, 8 insertions, 2 deletions
diff --git a/less/panels.less b/less/panels.less
index a08febef3..691a15545 100644
--- a/less/panels.less
+++ b/less/panels.less
@@ -17,14 +17,20 @@
.panel-heading {
margin: -15px -15px 15px;
padding: 10px 15px;
- font-size: (@font-size-base * 1.25);
- font-weight: 500;
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);
}
+// Within heading, strip any `h*` tag of it's default margins for spacing.
+.panel-title {
+ margin-top: 0;
+ margin-bottom: 0;
+ font-size: (@font-size-base * 1.25);
+ font-weight: 500;
+}
+
// Optional footer (stays gray in every modifier class)
.panel-footer {
margin: 15px -15px -15px;