Compare commits

..

9 Commits

Author SHA1 Message Date
71fda3ddbf Cleaned out preview 2020-08-01 00:27:55 +02:00
a20d599e3f Restructured PlaceTeaser 2020-08-01 00:27:38 +02:00
48d32a8dac Moving 2020-08-01 00:27:15 +02:00
915a70e270 Renamed teaser to detail 2020-08-01 00:26:57 +02:00
5c6303f653 Cleaned Molecules 2020-08-01 00:26:35 +02:00
906e037c5c Moved Styles and included other components 2020-08-01 00:10:10 +02:00
0ffb2d5bc6 Moved cases to variants 2020-08-01 00:09:34 +02:00
8048aea9df Renamed text to paragraph 2020-08-01 00:09:09 +02:00
afb1397f4a Adding a another variation of headline 2020-08-01 00:08:07 +02:00
22 changed files with 100 additions and 89 deletions

View File

@ -1,8 +1,9 @@
@import 'link/link'; @import 'link/link';
@import 'headline/headline'; @import 'headline/headline';
@import 'text/text'; @import 'paragraph/paragraph';
@import 'icon/icon'; @import 'icon/icon';
@import 'button/button'; @import 'button/button';
@import 'checkbox/checkbox'; @import 'checkbox/checkbox';
@import 'input/input'; @import 'input/input';
@import 'image/image'; @import 'image/image';
@import 'logo/logo';

View File

@ -15,5 +15,13 @@
&--inline{ &--inline{
display: inline; display: inline;
} }
&--teaser{
font-family: $-primary-sans-serif-font;
color: $-secondary-color;
font-size: 1rem;
padding: 0px;
margin: 0px;
}
} }

View File

@ -9,6 +9,12 @@
"context": { "context": {
"modifier": "--main" "modifier": "--main"
} }
},
{
"name": "teaser",
"context": {
"modifier": "--teaser"
}
} }
] ]
} }

View File

@ -1,7 +1,28 @@
{ {
"context": { "context": {
"label": "Enter your value here", "label": "Enter your value here",
"placeholder": "A sample value", "placeholder": "A sample value"
"message": "Please fill in anything valuable" },
} "variants": [
{
"name": "With message",
"context":{
"message": "Please fill in anything valuable"
}
},
{
"name": "disabled",
"context": {
"modifier": "--disabled",
"disabled": true
}
},
{
"name": "error",
"context": {
"modifier": "--error",
"message": "This field is required"
}
}
]
} }

View File

@ -1,28 +1,11 @@
<h3>Regular with message</h3> <div class="LP-Input LP-Input{{modifier}}">
<div class="LP-Input">
<label for="input123" class="LP-Input__Label">{{label}}</label> <label for="input123" class="LP-Input__Label">{{label}}</label>
<input type="text" id="input123" class="LP-Input__Field" placeholder="{{placeholder}}"/> <input type="text" id="input123" class="LP-Input__Field" placeholder="{{placeholder}}"
<span class="LP-Input__Message">{{message}}</span> {{#if disabled}}
</div> disabled="disabled"
<h3>Regular without message</h3> {{/if}}
<div class="LP-Input"> />
<label for="input123" class="LP-Input__Label">{{label}}</label> {{#if message}}
<input type="text" id="input123" class="LP-Input__Field" placeholder="{{placeholder}}"/>
</div>
<h3>Regular without placeholder</h3>
<div class="LP-Input">
<label for="input123" class="LP-Input__Label">{{label}}</label>
<input type="text" id="input123" class="LP-Input__Field" placeholder=""/>
<span class="LP-Input__Message">{{message}}</span>
</div>
<h3>Disabled</h3>
<div class="LP-Input LP-Input--disabled">
<label for="input123" class="LP-Input__Label">{{label}}</label>
<input type="text" id="input123" class="LP-Input__Field" placeholder="{{placeholder}}" disabled="disabled"/>
</div>
<h3>Error</h3>
<div class="LP-Input LP-Input--error">
<label for="input123" class="LP-Input__Label">{{label}}</label>
<input type="text" id="input123" class="LP-Input__Field" placeholder="{{placeholder}}"/>
<span class="LP-Input__Message">{{message}}</span> <span class="LP-Input__Message">{{message}}</span>
{{/if}}
</div> </div>

View File

@ -0,0 +1,13 @@
.LP-Paragraph {
color: black;
font-family: $-primary-serif-font;
font-size: 1.2rem;
&--detail{
font-family: $-primary-sans-serif-font;
padding: 0;
margin: 0;
margin-top: 5px;
font-size: 0.9rem;
}
}

View File

@ -1,5 +1,14 @@
{ {
"context": { "context": {
"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."
} },
"variants": [
{
"name": "Detail",
"context":{
"text": "Hamm (Westf)",
"modifier": "--detail"
}
}
]
} }

View File

@ -0,0 +1 @@
<p class="LP-Paragraph LP-Paragraph{{modifier}}">{{text}}</p>

View File

@ -1,5 +0,0 @@
.LP-Text {
color: black;
font-family: $-primary-serif-font;
font-size: 1.2rem;
}

View File

@ -1 +0,0 @@
<p class="LP-Text LP-Content">{{text}}</p>

View File

@ -1,5 +1,3 @@
@import 'logo/logo';
@import 'textSection/textSection'; @import 'textSection/textSection';
@import 'placeTeaser/placeTeaser'; @import 'placeTeaser/placeTeaser';
@import 'securityMeasureList/securityMeasureList'; @import 'securityMeasureList/securityMeasureList';
@import 'form/form';

View File

@ -1,42 +1,22 @@
.LP-Place{ .LP-Place{
width: 280px;
.LP-Place__Image{ .LP-Place__Image{
width: 280px;
height: 165px; height: 165px;
object-fit: fill; object-fit: fill;
} }
.LP-Place__Assets{ .LP-Place__Meta{
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: space-between; justify-content: space-between;
margin-top: 0.8rem;
padding: 0 10px;
padding-bottom: 10px; padding-bottom: 10px;
} }
.LP-Place__Info{ .LP-Place__Description{
font-family: $-primary-sans-serif-accent-font;
.LP-Place__Title{ color: $-secondary-color;
font-family: $-primary-sans-serif-font; display: none;
color: $-secondary-color; }
font-size: 1rem;
padding: 0px;
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;
margin: 0;
margin-top: 5px;
font-size: 0.9rem;
}
}
} }

View File

@ -2,6 +2,7 @@
"context": { "context": {
"image": "/images/photo_2020-05-02_18-11-21.jpg", "image": "/images/photo_2020-05-02_18-11-21.jpg",
"title": "Kokerei Wiescherhöfen", "title": "Kokerei Wiescherhöfen",
"location": "Hamm (Westfalen)" "location": "Hamm (Westfalen)",
"description": "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. "
} }
} }

View File

@ -2,21 +2,20 @@
<div class="LP-Place__Image"> <div class="LP-Place__Image">
<img class="LP-Image" src="{{image}}"/> <img class="LP-Image" src="{{image}}"/>
</div> </div>
<div class="LP-Place__Detail"> <div class="LP-Place__Meta">
<div class="LP-Place__Info"> <div class="LP-Place__Info">
<h3 class="LP-Place__Title">{{title}}</h3> <span class="LP-Place__Title">{{> @headline headline=title modifier='--teaser'}}</span>
<p class="LP-Place__Detail" >{{location}}</p> <span class="LP-Place__Detail" >{{> @paragraph text=location modifier='--detail'}}</span>
</div> </div>
{{# if description}} <div class="LP-Place__Description">
<p class="LP-Place__Description"> {{> @paragraph text=description}}
{{description}} </div>
</p> <div class="LP-Place__Icons">
{{/if}} <ul class="LP-Icon__List">
<li class="LP-Icon__Item"><img class="LP-Icon" src="/icons/favourite.svg"/></li>
<ul class="LP-Icon__List"> <li class="LP-Icon__Item"><img class="LP-Icon" src="/icons/location.svg"/></li>
<li class="LP-Icon__Item"><img class="LP-Icon" src="/icons/favourite.svg"/></li> <li class="LP-Icon__Item"><img class="LP-Icon" src="/icons/flag.svg"/></li>
<li class="LP-Icon__Item"><img class="LP-Icon" src="/icons/location.svg"/></li> </ul>
<li class="LP-Icon__Item"><img class="LP-Icon" src="/icons/flag.svg"/></li> </div>
</ul>
</div> </div>
</article> </article>

View File

@ -5,3 +5,4 @@
@import 'placeList/placeList'; @import 'placeList/placeList';
@import 'linkList/linkList'; @import 'linkList/linkList';
@import 'footer/footer'; @import 'footer/footer';
@import 'form/form';

View File

@ -6,10 +6,6 @@
<title>Preview</title> <title>Preview</title>
</head> </head>
<body> <body>
{{> @header}} {{{ yield }}}
<article class="LP-MainContainer">
{{{ yield }}}
</article>
{{> @footer}}
</body> </body>
</html> </html>