From c239c89fab6344e13e4ed04117f93eaac570639e Mon Sep 17 00:00:00 2001 From: reverend Date: Sat, 18 Jul 2020 18:49:47 +0200 Subject: [PATCH] Gotta go, no time for a nice commit message --- components/01_Atoms/headline/_headline.scss | 4 + components/01_Atoms/icon/_icon.scss | 1 + components/01_Atoms/link/_link.scss | 9 +- components/02_Molecules/place/_place.scss | 10 +- components/02_Molecules/place/place.hbs | 6 + components/03_Organisms/_organisms.scss | 3 +- .../03_Organisms/placeGrid/_placeGrid.scss | 14 ++- .../03_Organisms/placeGrid/placeGrid.hbs | 22 ++-- .../03_Organisms/placeList/_placeList.scss | 58 +++++++++ .../placeList/placeList.config.json | 1 + .../03_Organisms/placeList/placeList.hbs | 32 +++++ .../placeOverview/_placeOverview.scss | 7 +- .../placeOverview/placeOverview.hbs | 12 +- components/components.scss | 3 +- public/components.css | 114 +++++++++++++----- 15 files changed, 246 insertions(+), 50 deletions(-) create mode 100644 components/03_Organisms/placeList/_placeList.scss create mode 100644 components/03_Organisms/placeList/placeList.config.json create mode 100644 components/03_Organisms/placeList/placeList.hbs diff --git a/components/01_Atoms/headline/_headline.scss b/components/01_Atoms/headline/_headline.scss index 477e02d..ddd26ae 100644 --- a/components/01_Atoms/headline/_headline.scss +++ b/components/01_Atoms/headline/_headline.scss @@ -5,4 +5,8 @@ padding-top: 0px; margin-top: 0px; padding-bottom: 0.2rem; + + &--inline{ + display: inline; + } } \ No newline at end of file diff --git a/components/01_Atoms/icon/_icon.scss b/components/01_Atoms/icon/_icon.scss index f8b53c9..3ea2c22 100644 --- a/components/01_Atoms/icon/_icon.scss +++ b/components/01_Atoms/icon/_icon.scss @@ -8,6 +8,7 @@ display: inline-flex; justify-content: space-between; justify-items: stretch; + padding: 0; .LP-Icon__Item{ padding: 0 3px; diff --git a/components/01_Atoms/link/_link.scss b/components/01_Atoms/link/_link.scss index 7d28c70..7037a7f 100644 --- a/components/01_Atoms/link/_link.scss +++ b/components/01_Atoms/link/_link.scss @@ -1,8 +1,15 @@ .LP-Link { color: $-secondary-color; text-decoration: none; - font-family: $-primary-accent-font; + font-family: $-primary-sans-serif-accent-font; &:hover { color: $-secondary-accent-color; } + + .LP-Text{ + font-family: $-primary-sans-serif-accent-font; + &:hover{ + color: $-secondary-accent-color; + } + } } \ No newline at end of file diff --git a/components/02_Molecules/place/_place.scss b/components/02_Molecules/place/_place.scss index 109b0ef..150076b 100644 --- a/components/02_Molecules/place/_place.scss +++ b/components/02_Molecules/place/_place.scss @@ -1,8 +1,6 @@ .LP-Place{ - width: 280px; - height: 235px; .LP-Place__Image{ - width: 100%; + width: 280px; height: 165px; object-fit: fill; } @@ -14,6 +12,7 @@ margin-top: 0.8rem; padding: 0 10px; + padding-bottom: 10px; } .LP-Place__Info{ @@ -26,6 +25,11 @@ margin: 0px; } + .LP-Place__Description{ + font-family: $-primary-sans-serif-accent-font; + color: $-secondary-color; + } + .LP-Place__Detail{ font-family: $-primary-sans-serif-font; padding: 0; diff --git a/components/02_Molecules/place/place.hbs b/components/02_Molecules/place/place.hbs index c708d52..8a43707 100644 --- a/components/02_Molecules/place/place.hbs +++ b/components/02_Molecules/place/place.hbs @@ -5,6 +5,12 @@

{{title}}

{{location}}

+ {{# if description}} +

+ {{description}} +

+ {{/if}} +