diff options
| author | Mark Otto <[email protected]> | 2014-03-04 00:41:57 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2014-03-04 00:41:57 -0800 |
| commit | d6e07f045c2070f7b958a577549f7600ed45927b (patch) | |
| tree | c23a4b3140e37c653737ec68178b136d93b88be1 /less | |
| parent | 477dc99ffa3a4a8c604e6fbbc4946ca2eb83ba01 (diff) | |
| parent | 1399497a02c6741c21a655b22a4ae71f8ed2b974 (diff) | |
| download | bootstrap-d6e07f045c2070f7b958a577549f7600ed45927b.tar.xz bootstrap-d6e07f045c2070f7b958a577549f7600ed45927b.zip | |
Merge branch 'master' into rtl_via_css_flip
Conflicts:
docs/assets/js/raw-files.min.js
Diffstat (limited to 'less')
| -rw-r--r-- | less/panels.less | 4 | ||||
| -rw-r--r-- | less/variables.less | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/less/panels.less b/less/panels.less index 20dd14938..bb3593c87 100644 --- a/less/panels.less +++ b/less/panels.less @@ -20,7 +20,7 @@ // Optional heading .panel-heading { - padding: 10px 15px; + padding: @panel-heading-padding; border-bottom: 1px solid transparent; .border-top-radius((@panel-border-radius - 1)); @@ -43,7 +43,7 @@ // Optional footer (stays gray in every modifier class) .panel-footer { - padding: 10px 15px; + padding: @panel-footer-padding; background-color: @panel-footer-bg; border-top: 1px solid @panel-inner-border; .border-bottom-radius((@panel-border-radius - 1)); diff --git a/less/variables.less b/less/variables.less index fa736f0ac..b58417e98 100644 --- a/less/variables.less +++ b/less/variables.less @@ -663,6 +663,8 @@ @panel-bg: #fff; @panel-body-padding: 15px; +@panel-heading-padding: 10px 15px; +@panel-footer-padding: @panel-heading-padding; @panel-border-radius: @border-radius-base; //** Border color for elements within panels |