From ffb5b50ee716b72967d2a78d4984d78c129a34fa Mon Sep 17 00:00:00 2001 From: jlukic Date: Mon, 6 Oct 2014 18:28:20 -0400 Subject: [PATCH] Add line height offset to headers --- src/definitions/elements/header.less | 6 +++--- .../packages/default/elements/header.variables | 12 ++++++++---- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/src/definitions/elements/header.less b/src/definitions/elements/header.less index 9c8b6522c..bc6c535fa 100755 --- a/src/definitions/elements/header.less +++ b/src/definitions/elements/header.less @@ -72,13 +72,13 @@ /* Positioning */ .ui.header:first-child { - margin-top: 0em; + margin-top: @firstMargin; } .ui.header:last-child { - margin-bottom: 0em; + margin-bottom: @lastMargin; } .ui.header + p { - margin-top: @precedingParagraphMargin; + margin-top: @nextParagraphTopMargin; } diff --git a/src/themes/packages/default/elements/header.variables b/src/themes/packages/default/elements/header.variables index a4399b3ca..3770c1dbd 100755 --- a/src/themes/packages/default/elements/header.variables +++ b/src/themes/packages/default/elements/header.variables @@ -6,16 +6,20 @@ Element --------------------*/ -@pageFont : Source Sans Pro, Helvetica Neue, Helvetica, Arial, sans-serif; @fontWeight: bold; @textTransform: none; -@topMargin: 2rem; +@lineHeight: 1.33em; +@lineHeightOffset: -(@lineHeight - 1em) / 2; + +@topMargin: ~"calc(2rem + "@lineHeightOffset~")"; @bottomMargin: 1rem; +@firstMargin: @lineHeightOffset; +@lastMargin: 0em; + @horizontalPadding: 0em; @verticalPadding: 0em; -@lineHeight: 1.33em; /* HTML Headings */ @h1: 2rem; @@ -50,7 +54,7 @@ @contentAlignment: top; /* Paragraph after Header */ -@precedingParagraphMargin: 0em; +@nextParagraphTopMargin: 0em; /*------------------- Variations