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

[Blueprint] Fix a bug that was introduced by some earlier refactoring.

Browse Source
This commit is contained in:
Chris Eppstein 2010-04-24 23:26:01 -07:00
parent b43b0386ca
commit 26dbb68a39
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
frameworks/blueprint/stylesheets/blueprint/_fancy-type.scss
View File

@ -1,6 +1,6 @@
@import "typography"; @import "typography";
$alternate_text_font : "Warnock Pro", "Goudy Old Style", "Palatino", "Book Antiqua", Georgia, serif !default; $alternate-text-font : "Warnock Pro", "Goudy Old Style", "Palatino", "Book Antiqua", Georgia, serif !default;
// To install the fancy type plugin: // To install the fancy type plugin:
// 1. import the fancy_type module: @import blueprint/fancy_type // 1. import the fancy_type module: @import blueprint/fancy_type
// 2. mixin +fancy-type to your project's body or at the top level of your stylesheet: // 2. mixin +fancy-type to your project's body or at the top level of your stylesheet:
@ -27,8 +27,8 @@ $alternate_text_font : "Warnock Pro", "Goudy Old Style", "Palatino", "Book Antiq
// Best used on prepositions and ampersands. // Best used on prepositions and ampersands.
@mixin alt { @mixin alt {
color: $alternate_text_color; color: $alt-text-color;
font-family: $alternate_text_font; font-family: $alternate-text-font;
font-style: italic; font-style: italic;
font-weight: normal; font-weight: normal;
} }
@ -52,18 +52,18 @@ $alternate_text_font : "Warnock Pro", "Goudy Old Style", "Palatino", "Book Antiq
// every four lines of normal sized type, there is five lines of the sidenote. eg: // every four lines of normal sized type, there is five lines of the sidenote. eg:
// //
// Arguments: // Arguments:
// font_size - The desired font size in pixels. This will be converted to ems for you. Defaults to 10px. // `$font-size` - The desired font size in pixels. This will be converted to ems for you. Defaults to 10px.
// base_font_size - The base font size in pixels. Defaults to 12px // `$base-font-size` - The base font size in pixels. Defaults to 12px
// old_line_height - The old line height. Defaults to 1.5 times the base_font_size // `$old-line-height` - The old line height. Defaults to 1.5 times the base-font-size
@mixin incr @mixin incr
( (
$font_size: 10px, $font-size: 10px,
$base_font_size: $blueprint_font_size, $base-font-size: $blueprint-font-size,
$old_line_height: $base_font_size * 1.5 $old-line-height: $base-font-size * 1.5
) { ) {
font-size: 1em * $font_size / $base_font_size; font-size: 1em * $font-size / $base-font-size;
line-height: 1em * $old_line_height / $font_size * 4 / 5; line-height: 1em * $old-line-height / $font-size * 4 / 5;
margin-bottom: 1.5em; margin-bottom: 1.5em;
} }