From 73a355463cd34a95d6f90d20a46810b842ad1bc4 Mon Sep 17 00:00:00 2001 From: Frode Petterson Date: Fri, 21 Oct 2016 15:00:52 +0200 Subject: [PATCH 1/3] Uses margin instead of padding For consistency and avoiding double spacing. HFP-45 --- css/dialogcards.css | 25 +++++-------------------- 1 file changed, 5 insertions(+), 20 deletions(-) diff --git a/css/dialogcards.css b/css/dialogcards.css index 6adbb2c..575062b 100644 --- a/css/dialogcards.css +++ b/css/dialogcards.css @@ -7,13 +7,6 @@ margin-bottom: 0; } -.h5p-dialogcards .h5p-dialogcards-title p, -.h5p-dialogcards .h5p-dialogcards-card-text-area p { - font-size: inherit; - line-height: inherit; - margin: inherit; -} - .h5p-dialogcards { overflow: hidden; position: relative; @@ -21,11 +14,11 @@ .h5p-no-frame .h5p-dialogcards .h5p-dialogcards-title, .h5p-transparent .h5p-dialogcards .h5p-dialogcards-title { - padding: 0 0 0.375em 0; + margin: 0 0 0.375em 0; } .h5p-dialogcards .h5p-dialogcards-title { - padding: 1em 1em 0.375em; + margin: 1em 1em 0.375em; } .h5p-dialogcards .h5p-dialogcards-title-inner { @@ -46,10 +39,9 @@ } .h5p-dialogcards .h5p-dialogcards-footer { - margin: auto; + margin: 1em auto; overflow: hidden; line-height: 2.35em; - padding: 1em; max-width: 32em; position: relative; } @@ -124,10 +116,6 @@ text-align: center; } -.h5p-dialogcards.h5p-text-scaling .h5p-dialogcards-card-text-wrapper { - height: 12em; -} - .h5p-dialogcards .h5p-dialogcards-audio-wrapper { display: block; margin: 0 auto; @@ -146,9 +134,6 @@ position: relative; height: calc(100% - 2.25em); padding: 1em 1.5em; -} - -.h5p-dialogcards.h5p-text-scaling .h5p-dialogcards-card-text-inner { box-sizing: border-box; } @@ -167,7 +152,7 @@ .h5p-dialogcards .h5p-dialogcards-card-text { display: inline-block; margin: 0.5em 0; - height: 4.5em; + min-height: 4.5em; line-height: 1.5; } @@ -297,6 +282,6 @@ box-shadow: inset 0 4px 0 #0e407a; } -.h5p-course-presentation .h5p-element .h5p-dialogcards-outer-element .h5p-element-inner.h5p-dialogcards.h5p-text-scaling { +.h5p-course-presentation .h5p-element .h5p-dialogcards-outer-element .h5p-element-inner.h5p-dialogcards { overflow-y: hidden; } From b04592fc4e27095018dc13634acc050e3a90d40e Mon Sep 17 00:00:00 2001 From: Frode Petterson Date: Fri, 21 Oct 2016 15:03:18 +0200 Subject: [PATCH 2/3] Revert "Uses margin instead of padding" This reverts commit 73a355463cd34a95d6f90d20a46810b842ad1bc4. --- css/dialogcards.css | 25 ++++++++++++++++++++----- 1 file changed, 20 insertions(+), 5 deletions(-) diff --git a/css/dialogcards.css b/css/dialogcards.css index 575062b..6adbb2c 100644 --- a/css/dialogcards.css +++ b/css/dialogcards.css @@ -7,6 +7,13 @@ margin-bottom: 0; } +.h5p-dialogcards .h5p-dialogcards-title p, +.h5p-dialogcards .h5p-dialogcards-card-text-area p { + font-size: inherit; + line-height: inherit; + margin: inherit; +} + .h5p-dialogcards { overflow: hidden; position: relative; @@ -14,11 +21,11 @@ .h5p-no-frame .h5p-dialogcards .h5p-dialogcards-title, .h5p-transparent .h5p-dialogcards .h5p-dialogcards-title { - margin: 0 0 0.375em 0; + padding: 0 0 0.375em 0; } .h5p-dialogcards .h5p-dialogcards-title { - margin: 1em 1em 0.375em; + padding: 1em 1em 0.375em; } .h5p-dialogcards .h5p-dialogcards-title-inner { @@ -39,9 +46,10 @@ } .h5p-dialogcards .h5p-dialogcards-footer { - margin: 1em auto; + margin: auto; overflow: hidden; line-height: 2.35em; + padding: 1em; max-width: 32em; position: relative; } @@ -116,6 +124,10 @@ text-align: center; } +.h5p-dialogcards.h5p-text-scaling .h5p-dialogcards-card-text-wrapper { + height: 12em; +} + .h5p-dialogcards .h5p-dialogcards-audio-wrapper { display: block; margin: 0 auto; @@ -134,6 +146,9 @@ position: relative; height: calc(100% - 2.25em); padding: 1em 1.5em; +} + +.h5p-dialogcards.h5p-text-scaling .h5p-dialogcards-card-text-inner { box-sizing: border-box; } @@ -152,7 +167,7 @@ .h5p-dialogcards .h5p-dialogcards-card-text { display: inline-block; margin: 0.5em 0; - min-height: 4.5em; + height: 4.5em; line-height: 1.5; } @@ -282,6 +297,6 @@ box-shadow: inset 0 4px 0 #0e407a; } -.h5p-course-presentation .h5p-element .h5p-dialogcards-outer-element .h5p-element-inner.h5p-dialogcards { +.h5p-course-presentation .h5p-element .h5p-dialogcards-outer-element .h5p-element-inner.h5p-dialogcards.h5p-text-scaling { overflow-y: hidden; } From 44c8a1a9748b4167ffd5a4bc6753a210b0457766 Mon Sep 17 00:00:00 2001 From: Frode Petterson Date: Fri, 21 Oct 2016 15:03:47 +0200 Subject: [PATCH 3/3] Uses margin instead of padding For consistency and avoiding double spacing. HFP-45 --- css/dialogcards.css | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/css/dialogcards.css b/css/dialogcards.css index 6adbb2c..cb62346 100644 --- a/css/dialogcards.css +++ b/css/dialogcards.css @@ -21,11 +21,11 @@ .h5p-no-frame .h5p-dialogcards .h5p-dialogcards-title, .h5p-transparent .h5p-dialogcards .h5p-dialogcards-title { - padding: 0 0 0.375em 0; + margin: 0 0 0.375em 0; } .h5p-dialogcards .h5p-dialogcards-title { - padding: 1em 1em 0.375em; + margin: 1em 1em 0.375em; } .h5p-dialogcards .h5p-dialogcards-title-inner { @@ -46,10 +46,9 @@ } .h5p-dialogcards .h5p-dialogcards-footer { - margin: auto; + margin: 1em auto; overflow: hidden; line-height: 2.35em; - padding: 1em; max-width: 32em; position: relative; }