mirror of
https://github.com/twbs/bootstrap.git
synced 2024-11-29 11:24:18 +01:00
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
This commit is contained in:
commit
c81f0b5af2
@ -414,7 +414,7 @@
|
||||
@media (min-width: @grid-float-breakpoint) {
|
||||
float: left;
|
||||
// Calculate width based on number of columns available
|
||||
width: percentage(@columns / @grid-columns);
|
||||
width: percentage((@columns / @grid-columns));
|
||||
}
|
||||
// Prevent columns from collapsing when empty
|
||||
min-height: 1px;
|
||||
|
@ -17,7 +17,7 @@
|
||||
.panel-heading {
|
||||
margin: -15px -15px 15px;
|
||||
padding: 10px 15px;
|
||||
font-size: @font-size-base * 1.25;
|
||||
font-size: (@font-size-base * 1.25);
|
||||
font-weight: 500;
|
||||
background-color: @panel-heading-bg;
|
||||
border-bottom: 1px solid @panel-border;
|
||||
|
Loading…
Reference in New Issue
Block a user