From 31b5c4ab614a9129474173ec255b41d26959466e Mon Sep 17 00:00:00 2001 From: Brian Talbot Date: Mon, 20 May 2013 14:02:00 -0400 Subject: [PATCH] studio - adds back in older lh() Sass function/mixin and moves it to the inheritied/to-be-sunsetted mixins sheet --- cms/static/sass/_mixins-inherited.scss | 6 ++++++ common/static/sass/_mixins.scss | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/cms/static/sass/_mixins-inherited.scss b/cms/static/sass/_mixins-inherited.scss index a766919c74..c0d9df77ce 100644 --- a/cms/static/sass/_mixins-inherited.scss +++ b/cms/static/sass/_mixins-inherited.scss @@ -5,6 +5,12 @@ // talbs: we need to slowly ween ourselves off of these // ==================== + +// line-height (old way) +@function lh($amount: 1) { + @return $body-line-height * $amount; +} + // inherited - vertical and horizontal centering @mixin vertically-and-horizontally-centered ($height, $width) { left: 50%; diff --git a/common/static/sass/_mixins.scss b/common/static/sass/_mixins.scss index 6e1a34aaaa..c3a548bbf7 100644 --- a/common/static/sass/_mixins.scss +++ b/common/static/sass/_mixins.scss @@ -8,7 +8,7 @@ } // mixins - line height -@mixin lh($fontSize: auto){ +@mixin line-height($fontSize: auto){ line-height: ($fontSize*1.48) + px; line-height: (($fontSize/10)*1.48) + rem; }