aboutsummaryrefslogtreecommitdiff
path: root/dist/css/bootstrap.css
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 /dist/css/bootstrap.css
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 'dist/css/bootstrap.css')
-rw-r--r--dist/css/bootstrap.css9
1 files changed, 7 insertions, 2 deletions
diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css
index 11339c516..f60f59878 100644
--- a/dist/css/bootstrap.css
+++ b/dist/css/bootstrap.css
@@ -2269,14 +2269,19 @@ a.list-group-item.active .list-group-item-text {
.panel-heading {
padding: 10px 15px;
margin: -15px -15px 15px;
- font-size: 17.5px;
- font-weight: 500;
background-color: #f5f5f5;
border-bottom: 1px solid #dddddd;
border-top-right-radius: 3px;
border-top-left-radius: 3px;
}
+.panel-title {
+ margin-top: 0;
+ margin-bottom: 0;
+ font-size: 17.5px;
+ font-weight: 500;
+}
+
.panel-footer {
padding: 10px 15px;
margin: 15px -15px -15px;