diff options
| author | Mark Otto <[email protected]> | 2013-04-22 23:04:24 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-04-22 23:04:24 -0700 |
| commit | c81f0b5af23c7ef0edc41f941b217d4f0b841a7f (patch) | |
| tree | 5c0e1ac61ab8ef188b450c29d857ea56959e892e | |
| parent | a4f896ef1a020edce1c5d3495deffc3bcd849f58 (diff) | |
| parent | 10a1a0af861f2797a2194ec5f7ac637507f4eb8e (diff) | |
| download | bootstrap-c81f0b5af23c7ef0edc41f941b217d4f0b841a7f.tar.xz bootstrap-c81f0b5af23c7ef0edc41f941b217d4f0b841a7f.zip | |
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
| -rw-r--r-- | less/mixins.less | 2 | ||||
| -rw-r--r-- | less/panels.less | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/less/mixins.less b/less/mixins.less index de054784d..f33b1ec6b 100644 --- a/less/mixins.less +++ b/less/mixins.less @@ -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; diff --git a/less/panels.less b/less/panels.less index fe13a278f..0d5a07ad4 100644 --- a/less/panels.less +++ b/less/panels.less @@ -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; |