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

Merge branch 'stable' of https://github.com/chriseppstein/compass into stable

Browse Source
This commit is contained in:
Eric Meyer 2012-04-27 15:47:04 -06:00
commit 41b84a5ab1
4 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc-src/content/index.haml
View File

@ -91,7 +91,7 @@ layout: homepage
%img(src="/images/compass.app.png")
%p
Buy <a href="http://compass.handlino.com/">Compass.app</a>
for Windows and Mac for just $7.
for Windows and Mac for just $10.
%p.note
Note: Compass.app is a product of Handlino, Inc but
30% of all proceeds go to Compass's charity of choice: <a href="http://umdf.org/compass">UMDF.org</a>.

2
frameworks/compass/stylesheets/compass/reset/_utilities.scss
View File

@ -67,8 +67,8 @@
// Reset the font and vertical alignment.
@mixin reset-font {
font-size: 100%;
font: inherit;
font-size: 100%;
vertical-align: baseline; }
// Resets the outline when focus.

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

@ -111,12 +111,13 @@ $base-half-leader: $base-leader / 2;
// Calculate rhythm units.
@function rhythm(
$lines: 1,
$font-size: $base-font-size
$font-size: $base-font-size,
$offset: 0
) {
@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";
}
$rhythm: $font-unit * $lines * $base-line-height / $font-size;
$rhythm: $font-unit * ($lines * $base-line-height - $offset) / $font-size;
// Round the pixels down to nearest integer.
@if unit($rhythm) == px {
$rhythm: floor($rhythm);
@ -183,7 +184,7 @@ $base-half-leader: $base-leader / 2;
style: $border-style;
width: $font-unit * $width / $font-size;
};
padding-#{$side}: $font-unit / $font-size * ($lines * $base-line-height - $width);
padding-#{$side}: rhythm($lines, $font-size, $offset: $width);
}
// Apply borders and whitespace equally to all sides.
@ -195,7 +196,7 @@ $base-half-leader: $base-leader / 2;
style: $border-style;
width: $font-unit * $width / $font-size;
};
padding: $font-unit / $font-size * ($lines * $base-line-height - $width);
padding: rhythm($lines, $font-size, $offset: $width);
}
// Apply a leading border.

2
test/fixtures/stylesheets/blueprint/css/screen.css vendored
View File

@ -14,8 +14,8 @@ time, mark, audio, video {
margin: 0;
padding: 0;
border: 0;
font-size: 100%;
font: inherit;
font-size: 100%;
vertical-align: baseline; }
body {