From d559483c7b7ade569ba892fe262ed00933a81c0c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tautvidas=20Sipavi=C4=8Dius?= Date: Wed, 13 Apr 2016 17:01:01 +0300 Subject: [PATCH] - Add bottom margin to headings - Fix top and bottom margin for UL tags - Add bottom margin to LI tags --- .../newsletter_editor/contentBlocks/base.styl | 23 +++++++++++++++++-- .../newsletter_editor/contentBlocks/text.styl | 17 ++++---------- .../css/src/newsletter_editor/variables.styl | 2 ++ 3 files changed, 27 insertions(+), 15 deletions(-) diff --git a/assets/css/src/newsletter_editor/contentBlocks/base.styl b/assets/css/src/newsletter_editor/contentBlocks/base.styl index 3e92931b74..e1ec013259 100644 --- a/assets/css/src/newsletter_editor/contentBlocks/base.styl +++ b/assets/css/src/newsletter_editor/contentBlocks/base.styl @@ -1,4 +1,5 @@ $block-hover-highlight-color = $primary-active-color +$block-text-line-height = $text-line-height .mailpoet_block box-sizing: border-box @@ -30,8 +31,26 @@ $block-hover-highlight-color = $primary-active-color .mailpoet_content position: relative - line-height: 1.61803398875 + line-height: $block-text-line-height p, h1, h2, h3, h4, h5, h6 - line-height: 1.61803398875 + line-height: $block-text-line-height + padding: 0 + margin: 0 font-style: normal + font-weight: normal + + h1, h2, h3, h4, h5, h6 + margin-bottom: 0.3em + + p + margin-top: 0 + font-weight: normal + + ul + padding: 0 + margin-top: 10px + margin-bottom: 10px + + li + margin-bottom: 10px diff --git a/assets/css/src/newsletter_editor/contentBlocks/text.styl b/assets/css/src/newsletter_editor/contentBlocks/text.styl index ea5a578aba..9bc92eaf40 100644 --- a/assets/css/src/newsletter_editor/contentBlocks/text.styl +++ b/assets/css/src/newsletter_editor/contentBlocks/text.styl @@ -9,16 +9,7 @@ padding-left: 20px padding-right: 20px - h1, h2, h3, h4, h5, h6 - padding: 0 - margin: 0 - font-weight: normal - - p - margin-top: 0 - font-weight: normal - -blockquote - margin: 1em - padding-left: 1em - border-left: 2px #565656 solid + blockquote + margin: 1em + padding-left: 1em + border-left: 2px #565656 solid diff --git a/assets/css/src/newsletter_editor/variables.styl b/assets/css/src/newsletter_editor/variables.styl index 73beff2aeb..7ff7624b67 100644 --- a/assets/css/src/newsletter_editor/variables.styl +++ b/assets/css/src/newsletter_editor/variables.styl @@ -24,3 +24,5 @@ $error-text-color = #d54e21 // Dimensions $newsletter-width = 660px + +$text-line-height = 1.6em