diff --git a/components/01_Atoms/headline/_headline.scss b/components/01_Atoms/headline/_headline.scss index ddd26ae..8b6949e 100644 --- a/components/01_Atoms/headline/_headline.scss +++ b/components/01_Atoms/headline/_headline.scss @@ -4,7 +4,14 @@ font-size: 1.7rem; padding-top: 0px; margin-top: 0px; - padding-bottom: 0.2rem; + padding-bottom: 0px; + margin-bottom: 0px; + + &--main{ + position: relative; + top: 2rem; + font-size: 2rem; + } &--inline{ display: inline; diff --git a/components/01_Atoms/headline/headline.config.json b/components/01_Atoms/headline/headline.config.json index 7f7b02c..77be02e 100644 --- a/components/01_Atoms/headline/headline.config.json +++ b/components/01_Atoms/headline/headline.config.json @@ -1,5 +1,14 @@ { "context": { "headline": "Hello here is my headline" - } + }, + "title": "Headline", + "variants": [ + { + "name": "main", + "context": { + "modifier": "--main" + } + } + ] } \ No newline at end of file diff --git a/components/01_Atoms/headline/headline.hbs b/components/01_Atoms/headline/headline.hbs index 7330099..f217867 100644 --- a/components/01_Atoms/headline/headline.hbs +++ b/components/01_Atoms/headline/headline.hbs @@ -1 +1 @@ -

{{headline}}

\ No newline at end of file +

{{headline}}

\ No newline at end of file diff --git a/components/01_Atoms/link/_link.scss b/components/01_Atoms/link/_link.scss index 7037a7f..d73a5a0 100644 --- a/components/01_Atoms/link/_link.scss +++ b/components/01_Atoms/link/_link.scss @@ -12,4 +12,8 @@ color: $-secondary-accent-color; } } +} + +.LP-Link__IconWrapper{ + display: inline; } \ No newline at end of file diff --git a/components/01_Atoms/text/text.hbs b/components/01_Atoms/text/text.hbs index 0ac42b6..391e23a 100644 --- a/components/01_Atoms/text/text.hbs +++ b/components/01_Atoms/text/text.hbs @@ -1 +1 @@ -

{{text}}

\ No newline at end of file +

{{text}}

\ No newline at end of file diff --git a/components/02_Molecules/securityMeasureList/_securityMeasureList.scss b/components/02_Molecules/securityMeasureList/_securityMeasureList.scss index fc3507d..d767e59 100644 --- a/components/02_Molecules/securityMeasureList/_securityMeasureList.scss +++ b/components/02_Molecules/securityMeasureList/_securityMeasureList.scss @@ -5,9 +5,10 @@ margin: 0; .LP-SecurityMeasure__Item{ - margin: 0 5px; - padding: 5px 8px; + margin: 0 8px; + padding: 8px 14px; background-color: #D7CEC7; + border-radius: 2px; .LP-Text{ font-family: $-primary-sans-serif-font; font-size: 1.2rem; diff --git a/components/02_Molecules/textSection/_textSection.scss b/components/02_Molecules/textSection/_textSection.scss index 1837fe0..680ec2b 100644 --- a/components/02_Molecules/textSection/_textSection.scss +++ b/components/02_Molecules/textSection/_textSection.scss @@ -1,5 +1,11 @@ .LP-Content{ - padding: 15px; + padding: 35px; +} + +@media (max-width: 1290px){ + .LP-Content{ + padding: 15px; + } } .LP-TextSection{ diff --git a/components/02_Molecules/textSection/textSection.hbs b/components/02_Molecules/textSection/textSection.hbs index efc2b36..4bf5d0e 100644 --- a/components/02_Molecules/textSection/textSection.hbs +++ b/components/02_Molecules/textSection/textSection.hbs @@ -1,4 +1,4 @@ -
+
{{> @headline headline=headline}} {{> @text text=text}}
\ No newline at end of file diff --git a/components/03_Organisms/_organisms.scss b/components/03_Organisms/_organisms.scss index 5e1136d..8155ad7 100644 --- a/components/03_Organisms/_organisms.scss +++ b/components/03_Organisms/_organisms.scss @@ -2,4 +2,6 @@ @import 'navigation/navigation'; @import 'introduction/introduction'; @import 'placeGrid/placeGrid'; -@import 'placeList/placeList'; \ No newline at end of file +@import 'placeList/placeList'; +@import 'linkList/linkList'; +@import 'footer/footer'; \ No newline at end of file diff --git a/components/03_Organisms/footer/_footer.scss b/components/03_Organisms/footer/_footer.scss new file mode 100644 index 0000000..22dd053 --- /dev/null +++ b/components/03_Organisms/footer/_footer.scss @@ -0,0 +1,30 @@ +.LP-Footer{ + margin-top: 75px; + width: 100%; + background-color: $-secondary-color; + padding: 25px; + + .LP-LinkList__List{ + display: flex; + align-items: center; + justify-content: center; + .LP-LinkList__Item{ + border: none; + padding: 5px; + width: auto; + + .LP-Text{ + color: $-secondary-background-color; + font-size: 17px; + } + + .LP-Link{ + display: inline; + + &:hover{ + background-color: inherit; + } + } + } + } +} \ No newline at end of file diff --git a/components/03_Organisms/footer/footer.config.json b/components/03_Organisms/footer/footer.config.json new file mode 100644 index 0000000..2fd8bcc --- /dev/null +++ b/components/03_Organisms/footer/footer.config.json @@ -0,0 +1,3 @@ +{ + "title": "Footer" +} \ No newline at end of file diff --git a/components/03_Organisms/footer/footer.hbs b/components/03_Organisms/footer/footer.hbs new file mode 100644 index 0000000..4c99c14 --- /dev/null +++ b/components/03_Organisms/footer/footer.hbs @@ -0,0 +1,7 @@ + \ No newline at end of file diff --git a/components/03_Organisms/linkList/_linkList.scss b/components/03_Organisms/linkList/_linkList.scss new file mode 100644 index 0000000..cde7980 --- /dev/null +++ b/components/03_Organisms/linkList/_linkList.scss @@ -0,0 +1,59 @@ +.LP-LinkList__List{ + list-style-type: none; + display: grid; + grid-template-columns: repeat(auto-fit, 300px); + margin: 0; + padding: 0; + + .LP-LinkList__Item{ + border-left: 1px solid $-secondary-accent-color; + width: 100%; + margin-top: 12px; + height: 55px; + + .LP-Link{ + $-link-padding: 1em; + padding: $-link-padding 0 $-link-padding $-link-padding; + width: calc(100% - $-link-padding); + display: block; + color: $-secondary-color; + + + &--iconized{ + padding-top: 0; + padding-bottom: 1.1em; + + &:hover{ + background-color: #ccc !important; + } + + .LP-Text{ + padding-top: .1em; + } + } + + + &:hover{ + background-color: $-secondary-background-color; + color: $-primary-accent-color; + } + + .LP-Text{ + color: inherit; + } + } + } +} + +.LP-Link__Icon{ + width: 2em; + height: 2em; + fill: $-primary-accent-color; + line-height: 5em; +} + +.LP-LinkList__Item .LP-Link__Icon{ + position: relative; + top: .7em; + margin-right: .6em; +} diff --git a/components/03_Organisms/linkList/linkLilst.config.json b/components/03_Organisms/linkList/linkLilst.config.json new file mode 100644 index 0000000..7d9f619 --- /dev/null +++ b/components/03_Organisms/linkList/linkLilst.config.json @@ -0,0 +1,3 @@ +{ + "title": "LinkList" +} \ No newline at end of file diff --git a/components/03_Organisms/linkList/linkList.hbs b/components/03_Organisms/linkList/linkList.hbs new file mode 100644 index 0000000..c532370 --- /dev/null +++ b/components/03_Organisms/linkList/linkList.hbs @@ -0,0 +1,19 @@ + \ No newline at end of file diff --git a/components/03_Organisms/placeGrid/placeGrid.hbs b/components/03_Organisms/placeGrid/placeGrid.hbs index 0866875..3253207 100644 --- a/components/03_Organisms/placeGrid/placeGrid.hbs +++ b/components/03_Organisms/placeGrid/placeGrid.hbs @@ -1,35 +1,37 @@ -
- {{> @headline headline='Explorere the latest locations'}} - +
diff --git a/components/04_Templates/home/_home.scss b/components/04_Templates/home/_home.scss index 62b1d16..fcbaabe 100644 --- a/components/04_Templates/home/_home.scss +++ b/components/04_Templates/home/_home.scss @@ -1,4 +1,8 @@ .LP-MainContainer { margin: 0 auto; max-width: 1280px; +} + +.LP-HorizontalLine{ + color: $-secondary-color; } \ No newline at end of file diff --git a/components/04_Templates/placeOverview/_placeOverview.scss b/components/04_Templates/placeOverview/_placeOverview.scss index ad7ce71..915bfa7 100644 --- a/components/04_Templates/placeOverview/_placeOverview.scss +++ b/components/04_Templates/placeOverview/_placeOverview.scss @@ -1,10 +1,9 @@ .LP-PlaceOverview{ .LP-PlaceOverview__Info{ - margin-bottom: 40px; .LP-PlaceOveriew__Image{ - width: 600px; - height: 400px; + width: 700px; + height: 450px; box-shadow: 0 0 10px $-secondary-color; object-fit: cover; @@ -13,7 +12,7 @@ margin-bottom: 35px; } .LP-PlaceOverView__Description{ - padding: 0 25px; + padding: 0px; position: relative; top: -15px; } @@ -21,18 +20,48 @@ .LP-PlaceOverView__ImageList{ list-style-type: none; - display: flex; - flex-wrap: wrap; + display: grid; + grid-template-columns: repeat(auto-fit,300px); + margin: 0px; + padding: 0px; .LP-PlaceOverView__ImageItem{ - padding: 15px; + img { box-shadow: 0 0 5px $-secondary-color; height: 200px; - width: 300px; + width: 290px; object-fit: cover; + margin-top:10px; } } } +} + +@media (max-width: 1290px){ + .LP-PlaceOverview{ + .LP-PlaceOverview__Info{ + + .LP-TextSection{ + margin-top: -100px; + } + + .LP-Headline{ + position: relative; + top: -400px; + margin-bottom: 100px; + width: 100vw; + display: block; + } + + .LP-PlaceOveriew__Image{ + float: none; + width: calc(100vw - 30px); + margin: 0; + padding: 0; + margin-left: 7px; + } + } + } } \ No newline at end of file diff --git a/components/04_Templates/placeOverview/placeOverview.hbs b/components/04_Templates/placeOverview/placeOverview.hbs index 695c7a8..6843e75 100644 --- a/components/04_Templates/placeOverview/placeOverview.hbs +++ b/components/04_Templates/placeOverview/placeOverview.hbs @@ -2,45 +2,57 @@
- {{> @textsection headline='Kokerei Wiescherhöfen' 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? +
+ {{> @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? 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? 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.'}} +
- {{> @headline headline='Map Links'}} - Google Maps - TIM Online (GER/NRW Only) - Open Street Map + {{> @headline headline='Sicherheitsmaßnahmen'}} +
+
+ {{> @securitymeasurelist}} +
+
- {{> @headline headline='Sicherheitsmaßnahmen'}} - {{> @securitymeasurelist}} + {{> @headline headline='Links'}} +
+
+ {{> @linklist}} +
+
+
+
+ {{> @headline headline='Bilder'}} +
+
+
    +
  • + +
  • +
  • + +
  • +
  • + +
  • +
  • + +
  • +
  • + +
  • +
  • + +
  • +
+
+
- - {{> @headline headline='Lade deine Bilder hoch'}} -
- -
\ No newline at end of file diff --git a/components/_preview.hbs b/components/_preview.hbs index 8e70f91..14f7d55 100644 --- a/components/_preview.hbs +++ b/components/_preview.hbs @@ -7,6 +7,9 @@ {{> @header}} -
{{{ yield }}}
+
+ {{{ yield }}} +
+ {{> @footer}} \ No newline at end of file diff --git a/public/components.css b/public/components.css index 34b59ca..354fccb 100644 --- a/public/components.css +++ b/public/components.css @@ -9,13 +9,21 @@ .LP-Link .LP-Text:hover { color: #C09F80; } +.LP-Link__IconWrapper { + display: inline; } + .LP-Headline { font-family: "Trebuchet MS", Helvetica, sans-serif; color: #565656; font-size: 1.7rem; padding-top: 0px; margin-top: 0px; - padding-bottom: 0.2rem; } + padding-bottom: 0px; + margin-bottom: 0px; } + .LP-Headline--main { + position: relative; + top: 2rem; + font-size: 2rem; } .LP-Headline--inline { display: inline; } @@ -44,7 +52,11 @@ object-fit: contain; } .LP-Content { - padding: 15px; } + padding: 35px; } + +@media (max-width: 1290px) { + .LP-Content { + padding: 15px; } } .LP-TextSection .LP-Text { line-height: 1.4rem; } @@ -86,9 +98,10 @@ padding: 0; margin: 0; } .LP-SecurityMeasure__List .LP-SecurityMeasure__Item { - margin: 0 5px; - padding: 5px 8px; - background-color: #D7CEC7; } + margin: 0 8px; + padding: 8px 14px; + background-color: #D7CEC7; + border-radius: 2px; } .LP-SecurityMeasure__List .LP-SecurityMeasure__Item .LP-Text { font-family: "Trebuchet MS", Helvetica, sans-serif; font-size: 1.2rem; } @@ -179,33 +192,113 @@ height: 168px; width: 280px; } +.LP-LinkList__List { + list-style-type: none; + display: grid; + grid-template-columns: repeat(auto-fit, 300px); + margin: 0; + padding: 0; } + .LP-LinkList__List .LP-LinkList__Item { + border-left: 1px solid #C09F80; + width: 100%; + margin-top: 12px; + height: 55px; } + .LP-LinkList__List .LP-LinkList__Item .LP-Link { + padding: 1em 0 1em 1em; + width: calc(100% - $-link-padding); + display: block; + color: #565656; } + .LP-LinkList__List .LP-LinkList__Item .LP-Link--iconized { + padding-top: 0; + padding-bottom: 1.1em; } + .LP-LinkList__List .LP-LinkList__Item .LP-Link--iconized:hover { + background-color: #ccc !important; } + .LP-LinkList__List .LP-LinkList__Item .LP-Link--iconized .LP-Text { + padding-top: .1em; } + .LP-LinkList__List .LP-LinkList__Item .LP-Link:hover { + background-color: #f9f9f9; + color: #76323F; } + .LP-LinkList__List .LP-LinkList__Item .LP-Link .LP-Text { + color: inherit; } + +.LP-Link__Icon { + width: 2em; + height: 2em; + fill: #76323F; + line-height: 5em; } + +.LP-LinkList__Item .LP-Link__Icon { + position: relative; + top: .7em; + margin-right: .6em; } + +.LP-Footer { + margin-top: 75px; + width: 100%; + background-color: #565656; + padding: 25px; } + .LP-Footer .LP-LinkList__List { + display: flex; + align-items: center; + justify-content: center; } + .LP-Footer .LP-LinkList__List .LP-LinkList__Item { + border: none; + padding: 5px; + width: auto; } + .LP-Footer .LP-LinkList__List .LP-LinkList__Item .LP-Text { + color: #f9f9f9; + font-size: 17px; } + .LP-Footer .LP-LinkList__List .LP-LinkList__Item .LP-Link { + display: inline; } + .LP-Footer .LP-LinkList__List .LP-LinkList__Item .LP-Link:hover { + background-color: inherit; } + .LP-MainContainer { margin: 0 auto; max-width: 1280px; } -.LP-PlaceOverview .LP-PlaceOverview__Info { - margin-bottom: 40px; } - .LP-PlaceOverview .LP-PlaceOverview__Info .LP-PlaceOveriew__Image { - width: 600px; - height: 400px; - box-shadow: 0 0 10px #565656; - object-fit: cover; - float: right; - margin-left: 35px; - margin-bottom: 35px; } - .LP-PlaceOverview .LP-PlaceOverview__Info .LP-PlaceOverView__Description { - padding: 0 25px; - position: relative; - top: -15px; } +.LP-HorizontalLine { + color: #565656; } + +.LP-PlaceOverview .LP-PlaceOverview__Info .LP-PlaceOveriew__Image { + width: 700px; + height: 450px; + box-shadow: 0 0 10px #565656; + object-fit: cover; + float: right; + margin-left: 35px; + margin-bottom: 35px; } + +.LP-PlaceOverview .LP-PlaceOverview__Info .LP-PlaceOverView__Description { + padding: 0px; + position: relative; + top: -15px; } .LP-PlaceOverview .LP-PlaceOverView__ImageList { list-style-type: none; - display: flex; - flex-wrap: wrap; } - .LP-PlaceOverview .LP-PlaceOverView__ImageList .LP-PlaceOverView__ImageItem { - padding: 15px; } - .LP-PlaceOverview .LP-PlaceOverView__ImageList .LP-PlaceOverView__ImageItem img { - box-shadow: 0 0 5px #565656; - height: 200px; - width: 300px; - object-fit: cover; } + display: grid; + grid-template-columns: repeat(auto-fit, 300px); + margin: 0px; + padding: 0px; } + .LP-PlaceOverview .LP-PlaceOverView__ImageList .LP-PlaceOverView__ImageItem img { + box-shadow: 0 0 5px #565656; + height: 200px; + width: 290px; + object-fit: cover; + margin-top: 10px; } + +@media (max-width: 1290px) { + .LP-PlaceOverview .LP-PlaceOverview__Info .LP-TextSection { + margin-top: -100px; } + .LP-PlaceOverview .LP-PlaceOverview__Info .LP-Headline { + position: relative; + top: -400px; + margin-bottom: 100px; + width: 100vw; + display: block; } + .LP-PlaceOverview .LP-PlaceOverview__Info .LP-PlaceOveriew__Image { + float: none; + width: calc(100vw - 30px); + margin: 0; + padding: 0; + margin-left: 7px; } }