github-migration/compass
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #777 from JohnAlbin/vert-rhythm-codestyle-2

Browse Source 
Simplify code in vertical_rhythm's adjust-leading-to() using rhythm() function
This commit is contained in:
Chris Eppstein 2012-03-13 22:40:31 -07:00
commit c1820cc611
1 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
frameworks/compass/stylesheets/compass/typography/_vertical_rhythm.scss
View File

@ -98,10 +98,7 @@ $base-half-leader: $base-leader / 2;
// font should use up. It does not have to be an integer, but it defaults to the // font should use up. It does not have to be an integer, but it defaults to the
// smallest integer that is large enough to fit the font. // smallest integer that is large enough to fit the font.
@mixin adjust-leading-to($lines, $font-size: $base-font-size) { @mixin adjust-leading-to($lines, $font-size: $base-font-size) {
@if not $relative-font-sizing and $font-size != $base-font-size { line-height: rhythm($lines, $font-size);
@warn "$relative-font-sizing is false but a relative font size was passed to adjust-leading-to";
}
line-height: $font-unit * $lines * $base-line-height / $font-size;
} }
// Calculate rhythm units. // Calculate rhythm units.