Permalink
Browse files

Merge remote-tracking branch 'ericam/stable' into stable

  • Loading branch information...
chriseppstein committed Nov 14, 2011
2 parents 1d13ce1 + 33ee8b0 commit 88c90f43972d3cc89916b668ca2a46c21b8145ad
Showing with 10 additions and 2 deletions.
  1. +10 −2 frameworks/compass/stylesheets/compass/typography/_vertical_rhythm.scss
@@ -1,3 +1,5 @@
+@import "compass/layout/grid-background";
+
// The base font size
$base-font-size: 16px !default;
@@ -58,8 +60,14 @@ $base-half-leader: $base-leader / 2;
}
// Show a background image that can be used to debug your alignments.
-@mixin debug-vertical-alignment($img: 'underline.png') {
- background: url($img);
+// include the $img argument if you would rather use your own image than the
+// Compass default gradient image.
+@mixin debug-vertical-alignment($img: false) {
+ @if $img {
+ background: image-url($img);
+ } @else {
+ @include baseline-grid-background($base-rhythm-unit);
+ }
}
// Adjust a block to have a different font size and leading to maintain the rhythm.

0 comments on commit 88c90f4

Please sign in to comment.