From 598bfac764f46cac9ebea2fb648540c846d99f60 Mon Sep 17 00:00:00 2001 From: Commander1024 Date: Tue, 8 Sep 2020 20:41:03 +0200 Subject: [PATCH] Fixed text TextSection handlebars and moved font selection up the tree. --- components/02_Molecules/textSection/_textSection.scss | 4 ++-- components/02_Molecules/textSection/textSection.config.json | 4 +++- components/02_Molecules/textSection/textSection.hbs | 4 ++-- public/main.css | 4 ++-- 4 files changed, 9 insertions(+), 7 deletions(-) diff --git a/components/02_Molecules/textSection/_textSection.scss b/components/02_Molecules/textSection/_textSection.scss index f2049db..dd653e9 100644 --- a/components/02_Molecules/textSection/_textSection.scss +++ b/components/02_Molecules/textSection/_textSection.scss @@ -9,11 +9,11 @@ } .LP-TextSection{ - + &__Text { line-height: 1.4rem; + font-family: $-primary-serif-font; .LP-Link{ - font-family: $-primary-serif-font; margin: 0 3px; } } diff --git a/components/02_Molecules/textSection/textSection.config.json b/components/02_Molecules/textSection/textSection.config.json index b26352c..b4ef225 100644 --- a/components/02_Molecules/textSection/textSection.config.json +++ b/components/02_Molecules/textSection/textSection.config.json @@ -1,6 +1,8 @@ { "context": { "headline": "At vero eos et accusam et justo duo dolores", - "text": "Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet." + "text": [ + "Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet.", "Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet.", "Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet." + ] } } \ No newline at end of file diff --git a/components/02_Molecules/textSection/textSection.hbs b/components/02_Molecules/textSection/textSection.hbs index 0a0d8d6..9a91d84 100644 --- a/components/02_Molecules/textSection/textSection.hbs +++ b/components/02_Molecules/textSection/textSection.hbs @@ -3,8 +3,8 @@ {{> @headline headline=headline}}
- {{#each paragraphs}} - {{> @paragraph text=this}} + {{#each text}} + {{> @paragraph text=this}} {{/each}}
\ No newline at end of file diff --git a/public/main.css b/public/main.css index 7bbdf36..6eaef3d 100644 --- a/public/main.css +++ b/public/main.css @@ -856,9 +856,9 @@ body { padding: 15px; } } .LP-TextSection__Text { - line-height: 1.4rem; } + line-height: 1.4rem; + font-family: "Crimson Text", Times, serif; } .LP-TextSection__Text .LP-Link { - font-family: "Crimson Text", Times, serif; margin: 0 3px; } .LP-PlaceTeaser {