From 07a1c493baef02fbfa032c5e7018cb0b08e95cbd Mon Sep 17 00:00:00 2001 From: Antoine Boulanger Date: Tue, 30 Sep 2014 10:38:41 -0400 Subject: [PATCH] headings, settings --- project-x/assets/styles/src/_settings.scss | 1 + .../assets/styles/src/base/_headings.scss | 36 +++++++++---------- 2 files changed, 19 insertions(+), 18 deletions(-) diff --git a/project-x/assets/styles/src/_settings.scss b/project-x/assets/styles/src/_settings.scss index 52b65f2..2e82dde 100644 --- a/project-x/assets/styles/src/_settings.scss +++ b/project-x/assets/styles/src/_settings.scss @@ -14,6 +14,7 @@ $heading-3: 19px; // .gamma $heading-4: 16px; // .delta $heading-5: 13px; // .epsilon $heading-6: 11px; // .zeta +$heading-line-height: 1.2; $milli-size: 10px !default; $micro-size: 8px !default; diff --git a/project-x/assets/styles/src/base/_headings.scss b/project-x/assets/styles/src/base/_headings.scss index 2bd9d39..899ed64 100644 --- a/project-x/assets/styles/src/base/_headings.scss +++ b/project-x/assets/styles/src/base/_headings.scss @@ -1,30 +1,30 @@ h1, .h1, .alpha{ - font-size: em($heading-1); - line-height:1; - margin-top:0; + font-size: $heading-1; + line-height: $heading-line-height; + margin-top: 0; } h2, .h2, .beta{ - font-size: em($heading-2); - line-height:1; - margin-top:0; + font-size: $heading-2; + line-height: $heading-line-height; + margin-top: 0; } h3, .h3, .gamma{ - font-size: em($heading-3); - line-height:1; - margin-top:0; + font-size: $heading-3; + line-height: $heading-line-height; + margin-top: 0; } h4, .h4, .delta{ - font-size: em($heading-4); - line-height:1; - margin-top:0; + font-size: $heading-4; + line-height: $heading-line-height; + margin-top: 0; } h5, .h5, .epsilon{ - font-size: em($heading-5); - line-height:1; - margin-top:0; + font-size: $heading-5; + line-height: $heading-line-height; + margin-top: 0; } h6, .h6, .zeta{ - font-size: em($heading-6); - line-height:1; - margin-top:0; + font-size: $heading-6; + line-height: $heading-line-height; + margin-top: 0; }