From e004d2ea7fcda0db93c94497b5878433fa719105 Mon Sep 17 00:00:00 2001 From: reverend Date: Sun, 2 Aug 2020 23:00:55 +0200 Subject: [PATCH 1/7] Defined new viewports --- components/components.scss | 2 ++ 1 file changed, 2 insertions(+) diff --git a/components/components.scss b/components/components.scss index 6ecd82d..461bc34 100644 --- a/components/components.scss +++ b/components/components.scss @@ -28,6 +28,8 @@ $-primary-sans-serif-accent-font: Roboto, Arial, sans-serif; $-viewport-small: 650px; $-viewport-extra-small: 450px; +$-viewport-medium: 750px; +$-viewport-normal: 1000px; @import '01_Atoms/atoms'; From 0bb23d6a71c982ec69cbe884d5e3c447d0690352 Mon Sep 17 00:00:00 2001 From: reverend Date: Sun, 2 Aug 2020 23:01:39 +0200 Subject: [PATCH 2/7] Removed Navigation --- components/02_Molecules/_molecules.scss | 3 +- .../02_Molecules/navigation/_navigation.scss | 46 +++++++++++++++++++ .../navigation/navigation.config.json | 0 .../navigation/navigation.hbs | 0 components/03_Organisms/_organisms.scss | 1 - .../03_Organisms/navigation/_navigation.scss | 24 ---------- 6 files changed, 48 insertions(+), 26 deletions(-) create mode 100644 components/02_Molecules/navigation/_navigation.scss rename components/{03_Organisms => 02_Molecules}/navigation/navigation.config.json (100%) rename components/{03_Organisms => 02_Molecules}/navigation/navigation.hbs (100%) delete mode 100644 components/03_Organisms/navigation/_navigation.scss diff --git a/components/02_Molecules/_molecules.scss b/components/02_Molecules/_molecules.scss index 7219798..600a6b0 100644 --- a/components/02_Molecules/_molecules.scss +++ b/components/02_Molecules/_molecules.scss @@ -1,3 +1,4 @@ @import 'textSection/textSection'; @import 'placeTeaser/placeTeaser'; -@import 'tagList/tagList'; \ No newline at end of file +@import 'tagList/tagList'; +@import 'navigation/navigation'; \ No newline at end of file diff --git a/components/02_Molecules/navigation/_navigation.scss b/components/02_Molecules/navigation/_navigation.scss new file mode 100644 index 0000000..a3398dc --- /dev/null +++ b/components/02_Molecules/navigation/_navigation.scss @@ -0,0 +1,46 @@ +.LP-Menu{ + .LP-Menu__List { + list-style-type: none; + display: flex; + flex-direction: row; + justify-content: space-between; + padding: 0; + margin: 0; + } + + .LP-Menu__Item { + padding: 15px 0; + margin: 0; + width: 100px; + text-align: center; + background-color: transparent; + } + + .LP-Link__Text { + color: $-grey; + font-weight: bold; + text-shadow: 0px 0px 20px white; + &:hover{ + color: $-wine-red; + } + } +} + +@media(max-width: $-viewport-medium){ + .LP-Menu{ + + .LP-Menu__List{ + display: flex; + flex-direction: row; + justify-content: flex-start + } + } +} + +@media(max-width: $-viewport-extra-small){ + .LP-Menu{ + .LP-Menu__List { + justify-content: space-between; + } + } +} \ No newline at end of file diff --git a/components/03_Organisms/navigation/navigation.config.json b/components/02_Molecules/navigation/navigation.config.json similarity index 100% rename from components/03_Organisms/navigation/navigation.config.json rename to components/02_Molecules/navigation/navigation.config.json diff --git a/components/03_Organisms/navigation/navigation.hbs b/components/02_Molecules/navigation/navigation.hbs similarity index 100% rename from components/03_Organisms/navigation/navigation.hbs rename to components/02_Molecules/navigation/navigation.hbs diff --git a/components/03_Organisms/_organisms.scss b/components/03_Organisms/_organisms.scss index 7c51b0a..45a92ab 100644 --- a/components/03_Organisms/_organisms.scss +++ b/components/03_Organisms/_organisms.scss @@ -1,5 +1,4 @@ @import 'header/header'; -@import 'navigation/navigation'; @import 'placeGrid/placeGrid'; @import 'placeList/placeList'; @import 'linkList/linkList'; diff --git a/components/03_Organisms/navigation/_navigation.scss b/components/03_Organisms/navigation/_navigation.scss deleted file mode 100644 index 9818644..0000000 --- a/components/03_Organisms/navigation/_navigation.scss +++ /dev/null @@ -1,24 +0,0 @@ -.LP-Menu{ - &__List { - list-style-type: none; - display: inline-flex; - justify-content: space-around; - } - - &__Item { - padding: 10px 15px; - margin: 0 15px; - width: 100px; - text-align: center; - background-color: transparent; - } - - .LP-Link__Text { - color: $-grey; - font-weight: bold; - text-shadow: 0px 0px 20px white; - &:hover{ - color: $-wine-red; - } - } -} \ No newline at end of file From aa2a5cf3cc0052ce7fea73ed1bec2386e0e0c97e Mon Sep 17 00:00:00 2001 From: reverend Date: Sun, 2 Aug 2020 23:02:06 +0200 Subject: [PATCH 3/7] Made Image more responsive --- components/01_Atoms/image/_image.scss | 6 ++++-- components/01_Atoms/image/image.config.json | 4 +++- components/01_Atoms/image/image.hbs | 24 +-------------------- 3 files changed, 8 insertions(+), 26 deletions(-) diff --git a/components/01_Atoms/image/_image.scss b/components/01_Atoms/image/_image.scss index a90c54e..9581669 100644 --- a/components/01_Atoms/image/_image.scss +++ b/components/01_Atoms/image/_image.scss @@ -1,4 +1,6 @@ .LP-Image{ - max-width:100%; - max-height:100%; + object-fit: cover; + width: 100%; + height: auto; + vertical-align: top; } \ No newline at end of file diff --git a/components/01_Atoms/image/image.config.json b/components/01_Atoms/image/image.config.json index 4eb7c3f..6696d6f 100644 --- a/components/01_Atoms/image/image.config.json +++ b/components/01_Atoms/image/image.config.json @@ -1,3 +1,5 @@ { - + "context":{ + "source": "/images/photo_2020-05-02_18-11-21.jpg" + } } \ No newline at end of file diff --git a/components/01_Atoms/image/image.hbs b/components/01_Atoms/image/image.hbs index 85682c7..ea9d8b5 100644 --- a/components/01_Atoms/image/image.hbs +++ b/components/01_Atoms/image/image.hbs @@ -1,23 +1 @@ - - -
- -
- -

- -
- -
- -

- -
- -
- -

- -
- -
\ No newline at end of file + \ No newline at end of file From e2addb919fea7187714c67d7dfeea1cb2d87a85c Mon Sep 17 00:00:00 2001 From: reverend Date: Sun, 2 Aug 2020 23:02:11 +0200 Subject: [PATCH 4/7] Fixed Markup --- components/01_Atoms/logo/logo.hbs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/components/01_Atoms/logo/logo.hbs b/components/01_Atoms/logo/logo.hbs index 13716f5..34fd648 100644 --- a/components/01_Atoms/logo/logo.hbs +++ b/components/01_Atoms/logo/logo.hbs @@ -1,3 +1,5 @@ - +
+ +
\ No newline at end of file From 96882aef1234101a3a3b9f6a7745e90ed3297e9a Mon Sep 17 00:00:00 2001 From: reverend Date: Sun, 2 Aug 2020 23:02:25 +0200 Subject: [PATCH 5/7] Optimized header for small viewports --- components/03_Organisms/header/_header.scss | 35 +++++++++++++++++---- components/03_Organisms/header/header.hbs | 2 +- 2 files changed, 30 insertions(+), 7 deletions(-) diff --git a/components/03_Organisms/header/_header.scss b/components/03_Organisms/header/_header.scss index 2add0b5..86bba8b 100644 --- a/components/03_Organisms/header/_header.scss +++ b/components/03_Organisms/header/_header.scss @@ -3,14 +3,37 @@ align-items: center; justify-content: space-between; margin-bottom: 70px; - + height: 60px; + &__Logo { - max-width: 300px; - width: 35%; - object-fit:contain; + height: 60px; + margin: 25px; + object-fit:cover; + max-height: 100%; + overflow: hidden; + + .LP-Image{ + height: 60px; + } + } +} + +@media(max-width: $-viewport-medium){ + .LP-Header__Logo{ + width: 60px; + .LP-Image{ + object-position: 0 0; + object-fit: cover; + } + } +} + +@media(max-width: $-viewport-extra-small){ + .LP-Header__Logo{ + display: none; } - .LP-Header__Logo{ - margin: 25px; + .LP-Header__Navigation{ + width: 100%; } } \ No newline at end of file diff --git a/components/03_Organisms/header/header.hbs b/components/03_Organisms/header/header.hbs index b7b40e5..d103bc1 100644 --- a/components/03_Organisms/header/header.hbs +++ b/components/03_Organisms/header/header.hbs @@ -1,6 +1,6 @@
{{> @navigation}} From 09d1ab522bfd108bcd4e0607a01858ab80a84c28 Mon Sep 17 00:00:00 2001 From: reverend Date: Sun, 2 Aug 2020 23:02:56 +0200 Subject: [PATCH 6/7] Move responseive --- .../03_Organisms/linkList/_linkList.scss | 2 +- .../placeOverview/_placeOverview.scss | 36 ++++++++++--------- .../placeOverview/placeOverview.config.json | 12 ++++++- .../placeOverview/placeOverview.hbs | 27 +++++--------- 4 files changed, 39 insertions(+), 38 deletions(-) diff --git a/components/03_Organisms/linkList/_linkList.scss b/components/03_Organisms/linkList/_linkList.scss index 006c996..941fd94 100644 --- a/components/03_Organisms/linkList/_linkList.scss +++ b/components/03_Organisms/linkList/_linkList.scss @@ -1,7 +1,7 @@ .LP-LinkList__List{ list-style-type: none; display: grid; - grid-template-columns: repeat(auto-fit, 300px); + grid-template-columns: repeat(auto-fit, minmax(300px, 1fr)); margin: 0; padding: 0; diff --git a/components/04_Templates/placeOverview/_placeOverview.scss b/components/04_Templates/placeOverview/_placeOverview.scss index 1c0771f..d59f838 100644 --- a/components/04_Templates/placeOverview/_placeOverview.scss +++ b/components/04_Templates/placeOverview/_placeOverview.scss @@ -3,64 +3,66 @@ .LP-PlaceOveriew__Image{ width: 700px; - height: 450px; box-shadow: 0 0 10px $-grey; object-fit: cover; + object-position: 0 0; float: right; margin-left: 35px; margin-bottom: 35px; + overflow: hidden; } .LP-PlaceOverView__Description{ padding: 0px; position: relative; top: -15px; + + .LP-Headline{ + position: relative; + top: 15px; + } } } .LP-PlaceOverView__ImageList{ list-style-type: none; display: grid; - grid-template-columns: repeat(auto-fit,300px); + grid-template-columns: repeat(auto-fit, minmax(300px, 1fr)); margin: 0px; padding: 0px; .LP-PlaceOverView__ImageItem{ - - img { + margin-top:10px; + + .LP-Link{ + overflow: hidden; + } + + .LP-Image { box-shadow: 0 0 5px $-grey; height: 200px; width: 290px; object-fit: cover; - margin-top:10px; } } } } -@media (max-width: 1290px){ +@media (max-width: $-viewport-normal){ .LP-PlaceOverview{ .LP-PlaceOverview__Info{ .LP-TextSection{ - margin-top: -100px; - } - - .LP-Headline{ - position: relative; - top: -400px; - margin-bottom: 100px; - width: 100vw; - display: block; + margin-top: 30px; } .LP-PlaceOveriew__Image{ float: none; - width: calc(100vw - 30px); + width: 100%; + height: auto; margin: 0; padding: 0; - margin-left: 7px; } } } diff --git a/components/04_Templates/placeOverview/placeOverview.config.json b/components/04_Templates/placeOverview/placeOverview.config.json index 9e26dfe..4264502 100644 --- a/components/04_Templates/placeOverview/placeOverview.config.json +++ b/components/04_Templates/placeOverview/placeOverview.config.json @@ -1 +1,11 @@ -{} \ No newline at end of file +{ + "context": { + "images": [ + "/images/Bildschirmfoto_von_2020-07-13_11-03-07.png", + "/images/photo_2020-05-02_18-11-21.jpg", + "/images/Bildschirmfoto_von_2020-07-13_20-15-00.png", + "/images/photo_2020-05-02_18-11-21.jpg", + "/images/Bildschirmfoto_von_2020-07-13_11-03-07.png" + ] + } +} \ No newline at end of file diff --git a/components/04_Templates/placeOverview/placeOverview.hbs b/components/04_Templates/placeOverview/placeOverview.hbs index 6843e75..221990d 100644 --- a/components/04_Templates/placeOverview/placeOverview.hbs +++ b/components/04_Templates/placeOverview/placeOverview.hbs @@ -1,10 +1,12 @@
- +
+ {{> @image source='/images/Bildschirmfoto_von_2020-07-13_20-15-00.png'}} +
{{> @headline--main headline='Kokerei Wiescherhöfen'}} - {{> @text text='Do you see any Teletubbies in here? Do you see a slender plastic tag clipped to my shirt with my name printed on it? Do you see a little Asian child with a blank expression on his face sitting outside on a mechanical helicopter that shakes when you put quarters in it? No? Well, thats what you see at a toy store. And you must think youre in a toy store, because youre here shopping for an infant named Jeb. My moneys in that office, right? If she start giving me some bullshit about it aint there, and we got to go someplace else and get it, Im gonna shoot you in the head then and there. Then Im gonna shoot that bitch in the kneecaps, find out where my goddamn money is. She gonna tell me too. Hey, look at me when Im talking to you, motherfucker. You listen: we go in there, and that nigga Winston or anybody else is in there, you the first motherfucker to get shot. You understand? + {{> @paragraph text='Do you see any Teletubbies in here? Do you see a slender plastic tag clipped to my shirt with my name printed on it? Do you see a little Asian child with a blank expression on his face sitting outside on a mechanical helicopter that shakes when you put quarters in it? No? Well, thats what you see at a toy store. And you must think youre in a toy store, because youre here shopping for an infant named Jeb. My moneys in that office, right? If she start giving me some bullshit about it aint there, and we got to go someplace else and get it, Im gonna shoot you in the head then and there. Then Im gonna shoot that bitch in the kneecaps, find out where my goddamn money is. She gonna tell me too. Hey, look at me when Im talking to you, motherfucker. You listen: we go in there, and that nigga Winston or anybody else is in there, you the first motherfucker to get shot. You understand? Do you see any Teletubbies in here? Do you see a slender plastic tag clipped to my shirt with my name printed on it? Do you see a little Asian child with a blank expression on his face sitting outside on a mechanical helicopter that shakes when you put quarters in it? No? Well, thats what you see at a toy store. And you must think youre in a toy store, because youre here shopping for an infant named Jeb.Do you see any Teletubbies in here? Do you see a slender plastic tag clipped to my shirt with my name printed on it? Do you see a little Asian child with a blank expression on his face sitting outside on a mechanical helicopter that shakes when you put quarters in it? No? Well, thats what you see at a toy store. And you must think youre in a toy store, because youre here shopping for an infant named Jeb. My moneys in that office, right? If she start giving me some bullshit about it aint there, and we got to go someplace else and get it, Im gonna shoot you in the head then and there. Then Im gonna shoot that bitch in the kneecaps, find out where my goddamn money is. She gonna tell me too. Hey, look at me when Im talking to you, motherfucker. You listen: we go in there, and that nigga Winston or anybody else is in there, you the first motherfucker to get shot. You understand? @@ -16,7 +18,7 @@ Do you see any Teletubbies in here? Do you see a slender plastic tag clipped to {{> @headline headline='Sicherheitsmaßnahmen'}}
- {{> @securitymeasurelist}} + {{> @taglist}}
@@ -33,24 +35,11 @@ Do you see any Teletubbies in here? Do you see a slender plastic tag clipped to
    + {{#each images}}
  • - -
    • -
  • - -
    • -
  • - -
    • -
  • - -
    • -
  • - -
    • -
  • - +
    • + {{/each}}
From 00d01b0abfdf2ce9a03f157247ccf78a597188bf Mon Sep 17 00:00:00 2001 From: reverend Date: Sun, 2 Aug 2020 23:03:11 +0200 Subject: [PATCH 7/7] More context --- components/04_Templates/home/home.config.json | 31 ++++++++++++++++++- components/04_Templates/home/home.hbs | 4 +-- 2 files changed, 32 insertions(+), 3 deletions(-) diff --git a/components/04_Templates/home/home.config.json b/components/04_Templates/home/home.config.json index 9e26dfe..628c2bf 100644 --- a/components/04_Templates/home/home.config.json +++ b/components/04_Templates/home/home.config.json @@ -1 +1,30 @@ -{} \ No newline at end of file +{ + "context":{ + "places": [ + { + "image": "/images/photo_2020-04-09_18-27-13.jpg", + "name": "Haus Maikotten", + "location": "Münster (westfalen)", + "description": "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat." + }, + { + "image": "/images/Bildschirmfoto_von_2020-07-13_11-03-07.png", + "name": "Kokerei in Hamm", + "location": "Hamm (westfalen)", + "description": "" + }, + { + "image": "/images/Bildschirmfoto_von_2020-07-13_20-15-00.png", + "name": "Noch ein Zementwerk", + "location": "Beckum (Westfalen)", + "description": "" + }, + { + "image": "/images/photo_2020-05-02_18-11-21.jpg", + "name": "Zementwerk Mersmann", + "location": "Beckum (Westfalen)", + "description": "" + } + ] + } +} \ No newline at end of file diff --git a/components/04_Templates/home/home.hbs b/components/04_Templates/home/home.hbs index ce2460f..b79e53d 100644 --- a/components/04_Templates/home/home.hbs +++ b/components/04_Templates/home/home.hbs @@ -1,5 +1,5 @@ - {{> @introduction}} - {{> @placegrid}} + {{> @textsection 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.'}} + {{> @placegrid places=places}} Icons made by Freepik from www.flaticon.com \ No newline at end of file