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

Merge pull request #468 from ericam/stable

Browse Source 
fix warning logic in vertical-rhythms module
This commit is contained in:
Scott Davis 2011-07-09 22:41:54 -07:00
commit ff94ab79c9
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -68,7 +68,7 @@ $base-half-leader: $base-leader / 2;
// to the smallest integer that is large enough to fit the font. // to the smallest integer that is large enough to fit the font.
// Use $from_size to adjust from a non-base font-size. // Use $from_size to adjust from a non-base font-size.
@mixin adjust-font-size-to($to-size, $lines: lines-for-font-size($to-size), $from-size: $base-font-size) { @mixin adjust-font-size-to($to-size, $lines: lines-for-font-size($to-size), $from-size: $base-font-size) {
@if $relative-font-sizing and $from-size != $base-font-size { @if not $relative-font-sizing and $from-size != $base-font-size {
@warn "$relative-font-sizing is false but a relative font size was passed to adjust-font-size-to"; @warn "$relative-font-sizing is false but a relative font size was passed to adjust-font-size-to";
} }
font-size: $font-unit * $to-size / $from-size; font-size: $font-unit * $to-size / $from-size;
@ -76,7 +76,7 @@ $base-half-leader: $base-leader / 2;
} }
@mixin adjust-leading-to($lines, $font-size: $base-font-size) { @mixin adjust-leading-to($lines, $font-size: $base-font-size) {
@if $relative-font-sizing and $font-size != $base-font-size { @if not $relative-font-sizing and $font-size != $base-font-size {
@warn "$relative-font-sizing is false but a relative font size was passed to adjust-leading-to"; @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; line-height: $font-unit * $lines * $base-line-height / $font-size;
@ -87,7 +87,7 @@ $base-half-leader: $base-leader / 2;
$lines: 1, $lines: 1,
$font-size: $base-font-size $font-size: $base-font-size
) { ) {
@if $relative-font-sizing and $font-size != $base-font-size { @if not $relative-font-sizing and $font-size != $base-font-size {
@warn "$relative-font-sizing is false but a relative font size was passed to the rhythm function"; @warn "$relative-font-sizing is false but a relative font size was passed to the rhythm function";
} }
$rhythm: $font-unit * $lines * $base-line-height / $font-size; $rhythm: $font-unit * $lines * $base-line-height / $font-size;
@ -151,7 +151,7 @@ $base-half-leader: $base-leader / 2;
// Apply a border width to any side without destroying the vertical rhythm // Apply a border width to any side without destroying the vertical rhythm
@mixin apply-side-rhythm-border($side, $width: 1px, $lines: 1, $font-size: $base-font-size, $border-style: $default-rhythm-border-style) { @mixin apply-side-rhythm-border($side, $width: 1px, $lines: 1, $font-size: $base-font-size, $border-style: $default-rhythm-border-style) {
@if $relative-font-sizing and $font-size != $base-font-size { @if not $relative-font-sizing and $font-size != $base-font-size {
@warn "$relative-font-sizing is false but a relative font size was passed to apply-side-rhythm-border"; @warn "$relative-font-sizing is false but a relative font size was passed to apply-side-rhythm-border";
} }
border-#{$side}: { border-#{$side}: {
@ -163,7 +163,7 @@ $base-half-leader: $base-leader / 2;
// Aplly rhythm borders equally to all sides // Aplly rhythm borders equally to all sides
@mixin rhythm-borders($width: 1px, $lines: 1, $font-size: $base-font-size, $border-style: $default-rhythm-border-style) { @mixin rhythm-borders($width: 1px, $lines: 1, $font-size: $base-font-size, $border-style: $default-rhythm-border-style) {
@if $relative-font-sizing and $font-size != $base-font-size { @if not $relative-font-sizing and $font-size != $base-font-size {
@warn "$relative-font-sizing is false but a relative font size was passed to rhythm-borders"; @warn "$relative-font-sizing is false but a relative font size was passed to rhythm-borders";
} }
border: { border: {