Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip

c81f0b5a · Mark Otto · a4f896ef · 10a1a0af · c81f0b5a · c81f0b5a
Commit c81f0b5a authored 12 years ago by Mark Otto
Hide whitespace changes
Inline Side-by-side

Showing

with 2 additions and 2 deletions
+2 -2
--- 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;

--- 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;