mirrors/bootstrap
2
0
Fork 0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-06-14 18:42:30 +03:00
Code Activity

Merge branch '3.0.0-wip' into reset-FF-Android-default-background-image

Browse Source 
Conflicts:
	dist/css/bootstrap.min.css
This commit is contained in:
Mark Otto
2013-08-14 16:24:39 -07:00
parent 4d527ec316 8e8fe8de93
commit a9d6b7ee0b
5 changed files with 30 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
less/button-groups.less
+1
View File
@@ -229,6 +229,7 @@
display: table;
width: 100%;
table-layout: fixed;
border-collapse: separate;
.btn {
float: none;
display: table-cell;
less/mixins.less
+2 -2
View File
@@ -331,7 +331,7 @@
// -------------------------
.panel-variant(@border; @heading-text-color; @heading-bg-color; @heading-border) {
border-color: @border;
.panel-heading {
& > .panel-heading {
color: @heading-text-color;
background-color: @heading-bg-color;
border-color: @heading-border;
@@ -339,7 +339,7 @@
border-top-color: @border;
}
}
.panel-footer {
& > .panel-footer {
+ .panel-collapse .panel-body {
border-bottom-color: @border;
}