diff --git a/_sass/_coderay.scss b/_sass/_coderay.scss index 200fd8c..fd30bb2 100644 --- a/_sass/_coderay.scss +++ b/_sass/_coderay.scss @@ -1,7 +1,7 @@ .CodeRay { background-color: #efefef; font-family: $code-font; - @include font(12); + @include font-size(12); color: #333332; margin-bottom: 1.5em; @include rounded(4px); diff --git a/_sass/_mixins.scss b/_sass/_mixins.scss index d7427f7..96516ed 100644 --- a/_sass/_mixins.scss +++ b/_sass/_mixins.scss @@ -19,34 +19,6 @@ margin-right: auto; } -// TYPOGRAPHY -// -------------------------------------------------- - -// Full-fat vertical rhythm -// ------------------------ -@mixin font-size($size) { - font-size: 0px + $size; - font-size: 0rem + $size / $doc-font-size; - line-height: 0 + round($doc-line-height / $size*10000) / 10000; - margin-bottom: 0px + $doc-line-height; - margin-bottom: 0rem + ($doc-line-height / $doc-font-size); -} - -// Just the REMs -// ------------- -@mixin font-rem($size) { - font-size: 0px + $size; - font-size: 0rem + $size / $doc-font-size; -} - -// Just font-size and line-height -// ------------------------------ -@mixin font($size) { - font-size: 0px + $size; - font-size: 0rem + $size / $doc-font-size; - line-height: 0 + round($doc-line-height / $size*10000) / 10000; -} - @mixin text-overflow() { overflow: hidden; text-overflow: ellipsis;