From bea6c606fd53073dde715e4ae88338d8527fad1b Mon Sep 17 00:00:00 2001 From: Commander1024 Date: Sat, 1 Aug 2020 16:54:11 +0200 Subject: [PATCH 1/7] Trying to add the invitations module. --- lostplaces/lostplaces/settings.py | 10 +++++++++- lostplaces/lostplaces_app/urls.py | 6 ++++-- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/lostplaces/lostplaces/settings.py b/lostplaces/lostplaces/settings.py index 43764db..55fcde0 100644 --- a/lostplaces/lostplaces/settings.py +++ b/lostplaces/lostplaces/settings.py @@ -41,7 +41,8 @@ INSTALLED_APPS = [ 'django.contrib.sessions', 'django.contrib.messages', 'django.contrib.staticfiles', - 'django_thumbs' + 'django_thumbs', + 'invitations' ] MIDDLEWARE = [ @@ -136,3 +137,10 @@ AUTH_USER_MODEL = 'lostplaces_app.Explorer' # Templates to use for authentication LOGIN_REDIRECT_URL = 'home' LOGOUT_REDIRECT_URL = 'home' + +# User invitation settings +ACCOUNT_INVITATION_DAYS = 14 +ACCOUNT_ACTIVATION_DAYS = 14 +INVITATIONS_PER_USER = 0 + +INVITE_MODE = True \ No newline at end of file diff --git a/lostplaces/lostplaces_app/urls.py b/lostplaces/lostplaces_app/urls.py index de6fd79..2688eb5 100644 --- a/lostplaces/lostplaces_app/urls.py +++ b/lostplaces/lostplaces_app/urls.py @@ -1,4 +1,5 @@ -from django.urls import path +from django.urls import path, include +from django.conf.urls import url from .views import ( hello_world, place_detail_view, @@ -14,5 +15,6 @@ urlpatterns = [ path('place//', place_detail_view, name='place_detail'), path('place/create/', PlaceCreateView.as_view(), name='place_create'), path('place/update//', PlaceUpdateView.as_view(), name='place_edit'), - path('place/', place_list_view, name='place_list') + path('place/', place_list_view, name='place_list'), + (r'^accounts/', include('invitation.urls')) ] From ba3f937086070a8583227cb54b617b7baf7544ae Mon Sep 17 00:00:00 2001 From: Commander1024 Date: Sat, 1 Aug 2020 19:05:13 +0200 Subject: [PATCH 2/7] Revert "Building a voucher-verify form." This reverts commit 9bd85aba7acb7713b16e7b7c3a29370e71feea28. --- lostplaces/lostplaces_app/forms.py | 5 ----- .../lostplaces_app/templates/voucher-verify.html | 15 --------------- lostplaces/lostplaces_app/urls.py | 3 --- lostplaces/lostplaces_app/views.py | 14 +++----------- 4 files changed, 3 insertions(+), 34 deletions(-) delete mode 100644 lostplaces/lostplaces_app/templates/voucher-verify.html diff --git a/lostplaces/lostplaces_app/forms.py b/lostplaces/lostplaces_app/forms.py index d545711..6c78036 100644 --- a/lostplaces/lostplaces_app/forms.py +++ b/lostplaces/lostplaces_app/forms.py @@ -7,11 +7,6 @@ from django import forms from django.contrib.auth.forms import UserCreationForm, UserChangeForm from .models import Explorer, Place, PlaceImage, Voucher -class VoucherVerifyForm(forms.ModelForm): - class Meta: - model = Voucher - fields = ['code'] - class ExplorerCreationForm(UserCreationForm): class Meta: model = Explorer diff --git a/lostplaces/lostplaces_app/templates/voucher-verify.html b/lostplaces/lostplaces_app/templates/voucher-verify.html deleted file mode 100644 index b316ff3..0000000 --- a/lostplaces/lostplaces_app/templates/voucher-verify.html +++ /dev/null @@ -1,15 +0,0 @@ -{% extends 'global.html'%} -{% load static %} - -# {% block title %}Voucher-Überprüfung{% endblock %} - -{% block maincontent %} - -

Voucher-Überprüfung

-
- {% csrf_token %} - {{ form.as_p }} - -
- -{% endblock maincontent %} \ No newline at end of file diff --git a/lostplaces/lostplaces_app/urls.py b/lostplaces/lostplaces_app/urls.py index 913ed4e..2688eb5 100644 --- a/lostplaces/lostplaces_app/urls.py +++ b/lostplaces/lostplaces_app/urls.py @@ -2,7 +2,6 @@ from django.urls import path, include from django.conf.urls import url from .views import ( hello_world, - VoucherVerify, place_detail_view, place_list_view, SignUpView, @@ -13,8 +12,6 @@ from .views import ( urlpatterns = [ path('hello_world/', hello_world), # You know what this is :P path('signup/', SignUpView.as_view(), name='signup'), - path('voucher//', VoucherVerify.as_view(), name='voucher_verify'), - path('voucher/', VoucherVerify.as_view(), name='enter_voucher'), path('place//', place_detail_view, name='place_detail'), path('place/create/', PlaceCreateView.as_view(), name='place_create'), path('place/update//', PlaceUpdateView.as_view(), name='place_edit'), diff --git a/lostplaces/lostplaces_app/views.py b/lostplaces/lostplaces_app/views.py index 53c9239..00b03b2 100644 --- a/lostplaces/lostplaces_app/views.py +++ b/lostplaces/lostplaces_app/views.py @@ -5,24 +5,16 @@ from django.shortcuts import render, redirect, get_object_or_404 from django.urls import reverse_lazy -from django.views.generic.edit import CreateView, UpdateView +from django.views.generic.edit import CreateView from django.views import View from django.http import Http404 +from django.views.generic.edit import UpdateView -from .forms import ExplorerCreationForm, PlaceForm, PlaceImageCreateForm, VoucherVerifyForm +from .forms import ExplorerCreationForm, PlaceForm, PlaceImageCreateForm from .models import Place, PlaceImage, Voucher # Create your views here. -class VoucherVerify(View): - formclass = VoucherVerifyForm - voucher_form = VoucherVerifyForm() - success_url = reverse_lazy('signin') - fields = ['code'] - - def get(self, request, *args, **kwargs): - return render(request, 'voucher-verify.html') - class SignUpView(CreateView): form_class = ExplorerCreationForm success_url = reverse_lazy('login') From f2f32351e1144be8734f288a0f650aa2d6bbd7da Mon Sep 17 00:00:00 2001 From: Commander1024 Date: Sat, 1 Aug 2020 19:05:37 +0200 Subject: [PATCH 3/7] Revert "Trying to add the invitations module." This reverts commit bea6c606fd53073dde715e4ae88338d8527fad1b. --- lostplaces/lostplaces/settings.py | 10 +--------- lostplaces/lostplaces_app/urls.py | 6 ++---- 2 files changed, 3 insertions(+), 13 deletions(-) diff --git a/lostplaces/lostplaces/settings.py b/lostplaces/lostplaces/settings.py index 55fcde0..43764db 100644 --- a/lostplaces/lostplaces/settings.py +++ b/lostplaces/lostplaces/settings.py @@ -41,8 +41,7 @@ INSTALLED_APPS = [ 'django.contrib.sessions', 'django.contrib.messages', 'django.contrib.staticfiles', - 'django_thumbs', - 'invitations' + 'django_thumbs' ] MIDDLEWARE = [ @@ -137,10 +136,3 @@ AUTH_USER_MODEL = 'lostplaces_app.Explorer' # Templates to use for authentication LOGIN_REDIRECT_URL = 'home' LOGOUT_REDIRECT_URL = 'home' - -# User invitation settings -ACCOUNT_INVITATION_DAYS = 14 -ACCOUNT_ACTIVATION_DAYS = 14 -INVITATIONS_PER_USER = 0 - -INVITE_MODE = True \ No newline at end of file diff --git a/lostplaces/lostplaces_app/urls.py b/lostplaces/lostplaces_app/urls.py index 2688eb5..de6fd79 100644 --- a/lostplaces/lostplaces_app/urls.py +++ b/lostplaces/lostplaces_app/urls.py @@ -1,5 +1,4 @@ -from django.urls import path, include -from django.conf.urls import url +from django.urls import path from .views import ( hello_world, place_detail_view, @@ -15,6 +14,5 @@ urlpatterns = [ path('place//', place_detail_view, name='place_detail'), path('place/create/', PlaceCreateView.as_view(), name='place_create'), path('place/update//', PlaceUpdateView.as_view(), name='place_edit'), - path('place/', place_list_view, name='place_list'), - (r'^accounts/', include('invitation.urls')) + path('place/', place_list_view, name='place_list') ] From 81034ef613c2d78010795eea75f72caff4e76f6d Mon Sep 17 00:00:00 2001 From: Commander1024 Date: Sat, 1 Aug 2020 19:08:29 +0200 Subject: [PATCH 4/7] Revert "Building a voucher-verify form." This reverts commit 9bd85aba7acb7713b16e7b7c3a29370e71feea28. --- lostplaces/lostplaces_app/views.py | 1 + 1 file changed, 1 insertion(+) diff --git a/lostplaces/lostplaces_app/views.py b/lostplaces/lostplaces_app/views.py index 00b03b2..b32dfc1 100644 --- a/lostplaces/lostplaces_app/views.py +++ b/lostplaces/lostplaces_app/views.py @@ -38,6 +38,7 @@ class PlaceUpdateView(UpdateView): return reverse_lazy('place_detail', kwargs={'pk':self.get_object().pk}) class PlaceCreateView(View): + def get(self, request, *args, **kwargs): place_image_form = PlaceImageCreateForm() place_form = PlaceForm() From d229fe0fc869fb31ddc8dcadac98350dfa12a8ba Mon Sep 17 00:00:00 2001 From: reverend Date: Sun, 2 Aug 2020 15:57:19 +0200 Subject: [PATCH 5/7] New CSS --- lostplaces/lostplaces_app/static/main.css | 193 ++++++++++++++++++---- 1 file changed, 158 insertions(+), 35 deletions(-) diff --git a/lostplaces/lostplaces_app/static/main.css b/lostplaces/lostplaces_app/static/main.css index 1aa8794..b3a3cac 100644 --- a/lostplaces/lostplaces_app/static/main.css +++ b/lostplaces/lostplaces_app/static/main.css @@ -1,3 +1,11 @@ +@font-face { + font-family: Crimson; + src: url("fonts/Crimson/CrimsonText-Regular.ttf"), url("fonts/Crimson/CrimsonText-Bold.ttf"), url("fonts/Crimson/CrimsonText-Italic.ttf"); } + +@font-face { + font-family: Montserrat; + src: url("fonts/Montserrat/Montserrat-Regular.otf"), url("fonts/Montserrat/Montserrat-Bold.otf"), url("fonts/Montserrat/Montserrat-Italic.otf"); } + .LP-Link { color: #565656; text-decoration: none; @@ -13,7 +21,7 @@ display: inline; } .LP-Headline { - font-family: "Trebuchet MS", Helvetica, sans-serif; + font-family: Montserrat, Helvetica, sans-serif; color: #565656; font-size: 1.7rem; padding-top: 0px; @@ -27,9 +35,9 @@ .LP-Headline--inline { display: inline; } -.LP-Text { +.LP-Paragraph { color: black; - font-family: "Times New Roman", Times, serif; + font-family: Crimson, Times, serif; font-size: 1.2rem; } .LP-Icon { @@ -45,6 +53,78 @@ .LP-Icon__List .LP-Icon__Item { padding: 0 3px; } +.LP-Button { + background-color: #C09F80; + color: #565656; + border: none; + padding: 8px 14px; + border-radius: 2px; + font-weight: bold; } + .LP-Button:active { + background-color: #76323F; + color: #C09F80; } + +.LP-Form .LP-Form__Checkbox { + display: none; } + +.LP-Form .LP-Form__CheckBox__CheckMark { + height: 1em; + width: 1em; + border: 1px solid black; + padding: 0 calc(.5em + 2px); + margin-right: .7em; } + +.LP-Input { + display: flex; + flex-direction: column; + margin-bottom: -30px; + padding: 10px 0; } + .LP-Input .LP-Input__Field { + border: none; + border-bottom: 1px solid #565656; + padding: 8px; + margin-bottom: 30px; } + .LP-Input .LP-Input__Field:focus, .LP-Input .LP-Input__Field:active { + margin-bottom: 29px; + border-bottom: 2px solid #76323F; + background-color: #f9f9f9; + border-radius: 3px 3px 0 0; } + .LP-Input .LP-Input__Label { + font-family: Montserrat, Helvetica, sans-serif; + font-size: 16px; } + .LP-Input .LP-Input__Message { + font-family: Montserrat, Helvetica, sans-serif; + font-style: italic; + font-size: 13px; + padding: 3px; + position: relative; + top: -30px; } + .LP-Input .LP-Input__Message:before { + content: '* '; } + .LP-Input--error .LP-Input__Field { + margin-bottom: 25px; + border-bottom: 2px solid #76323F; + margin-bottom: 29px; } + .LP-Input--error .LP-Input__Message { + color: #76323F; } + .LP-Input--disabled .LP-Input__Field, .LP-Input--disabled .LP-Input__Field:disabled { + background-color: transparent; + border-bottom: 1px dashed #565656; + cursor: not-allowed; } + label + .LP-Input--disabled .LP-Input__Field, label + .LP-Input--disabled .LP-Input__Field:disabled { + color: red; } + .LP-Input--disabled .LP-Input__Field:focus, .LP-Input--disabled .LP-Input__Field:active, .LP-Input--disabled .LP-Input__Field:disabled:focus, .LP-Input--disabled .LP-Input__Field:disabled:active { + margin-bottom: 30px; + border-radius: 0; } + .LP-Input--disabled .LP-Input__Field ~ .LP-Input__Message, .LP-Input--disabled .LP-Input__Field:disabled ~ .LP-Input__Message { + visibility: hidden; } + .LP-Input--disabled .LP-Input__Label { + color: #565656; } + +.LP-Image { + max-width: 100%; + max-height: 100%; } + .LP-Logo { max-width: 100%; max-height: 100%; @@ -61,36 +141,32 @@ .LP-TextSection .LP-Text { line-height: 1.4rem; } -.LP-Place .LP-Place__Image { - width: 280px; - height: 165px; - object-fit: cover; } - -.LP-Place .LP-Place__Assets { - display: flex; - align-items: center; - justify-content: space-between; - margin-top: 0.8rem; - padding: 0 10px; - padding-bottom: 10px; } - -.LP-Place .LP-Place__Info .LP-Place__Title { - font-family: "Trebuchet MS", Helvetica, sans-serif; - color: #565656; - font-size: 1rem; - padding: 0px; - margin: 0px; } - -.LP-Place .LP-Place__Info .LP-Place__Description { - font-family: Roboto, Arial, sans-serif; - color: #565656; } - -.LP-Place .LP-Place__Info .LP-Place__Detail { - font-family: "Trebuchet MS", Helvetica, sans-serif; - padding: 0; - margin: 0; - margin-top: 5px; - font-size: 0.9rem; } +.LP-Place { + width: 280px; } + .LP-Place .LP-Place__Image { + height: 165px; + object-fit: fill; } + .LP-Place .LP-Place__Meta { + display: flex; + align-items: center; + justify-content: space-between; + padding-bottom: 10px; } + .LP-Place .LP-Place__Meta .LP-Paragraph { + font-family: Montserrat, Helvetica, sans-serif; + padding: 0; + margin: 0; + margin-top: 5px; + font-size: 0.9rem; } + .LP-Place .LP-Place__Meta .LP-Headline { + font-family: Montserrat, Helvetica, sans-serif; + color: #565656; + font-size: 1rem; + padding: 0px; + margin: 0px; } + .LP-Place .LP-Place__Description { + font-family: Roboto, Arial, sans-serif; + color: #565656; + display: none; } .LP-SecurityMeasure__List { list-style-type: none; @@ -104,7 +180,7 @@ background-color: #D7CEC7; border-radius: 2px; } .LP-SecurityMeasure__List .LP-SecurityMeasure__Item .LP-Text { - font-family: "Trebuchet MS", Helvetica, sans-serif; + font-family: Montserrat, Helvetica, sans-serif; font-size: 1.2rem; } .LP-Header { @@ -161,10 +237,17 @@ .LP-Place__List { list-style-type: none; } + .LP-Place__List .LP-Link .LP-Place:hover { + color: #565656; + background-color: #f9f9f9; + position: relative; + left: -2px; } + .LP-Place__List .LP-Link .LP-Place:hover > .LP-Place__Image { + border-left: 2px #565656 solid; } .LP-Place__List .LP-Place__Item { max-width: 900px; min-width: 450px; - margin: 25px 0; } + margin: 18px 0; } .LP-Place__List .LP-Place__Item .LP-Place { display: flex; flex-direction: row; @@ -247,6 +330,46 @@ .LP-Footer .LP-LinkList__List .LP-LinkList__Item .LP-Link:hover { background-color: inherit; } +.LP-Form { + max-width: 900px; } + .LP-Form .LP-Form__Fieldset { + border: none; } + .LP-Form .LP-Form__Fieldset .LP-Form__Legend { + margin: 0; + padding: 0; } + .LP-Form .LP-Form__Fieldset .LP-Form__Composition { + display: flex; + flex-direction: row; + justify-content: space-between; } + .LP-Form .LP-Form__Fieldset .LP-Form__Composition .LP-Form__Field { + flex: 3 1 100px; + padding: 6px 15px; } + .LP-Form .LP-Form__Fieldset .LP-Form__Composition .LP-Form__Field--wider { + flex: 5 1 200px; } + .LP-Form .LP-Form__Fieldset .LP-Form__Composition .LP-Form__Field--wide { + flex: 4 1 150px; } + .LP-Form .LP-Form__Fieldset .LP-Form__Composition .LP-Form__Field--narrow { + flex: 2 0 50px; } + .LP-Form .LP-Form__Fieldset .LP-Form__Composition .LP-Form__Field--narrower { + flex: 1 0 25px; } + .LP-Form .LP-Form__Fieldset .LP-Form__Composition .LP-Form__Field input { + width: 100%; } + +@media (max-width: 650px) { + .LP-Form .LP-Form__Fieldset .LP-Form__Composition--breakable { + display: flex; + flex-direction: column; + justify-content: space-between; } } + +@media (max-width: 450px) { + .LP-Form .LP-Form__Fieldset .LP-Form__Composition { + display: flex; + flex-direction: column; + justify-content: space-between; } + .LP-Form .LP-Form__Fieldset .LP-Form__Composition .LP-Form__Field { + flex: 3 1 100px; + padding: 12px 15px; } } + .LP-MainContainer { margin: 0 auto; max-width: 1280px; } From ceb0a2cc68f79323343bc5afffac2f5431b21af6 Mon Sep 17 00:00:00 2001 From: reverend Date: Mon, 3 Aug 2020 17:29:25 +0200 Subject: [PATCH 6/7] Better Rendering of Forms --- Pipfile | 1 + .../templates/partials/form/inputField.html | 16 +++++++++ lostplaces/templates/signup.html | 35 ++++++++++++++++--- 3 files changed, 47 insertions(+), 5 deletions(-) create mode 100644 lostplaces/lostplaces_app/templates/partials/form/inputField.html diff --git a/Pipfile b/Pipfile index 14409c7..0559c57 100644 --- a/Pipfile +++ b/Pipfile @@ -10,6 +10,7 @@ pylint = "*" django = "*" django-thumbs-v2 = "*" image = "*" +django-widget-tweaks = "*" # Commented out to not explicitly specify Python3 subversion. # [requires] # python_version = "3.8" diff --git a/lostplaces/lostplaces_app/templates/partials/form/inputField.html b/lostplaces/lostplaces_app/templates/partials/form/inputField.html new file mode 100644 index 0000000..4206f51 --- /dev/null +++ b/lostplaces/lostplaces_app/templates/partials/form/inputField.html @@ -0,0 +1,16 @@ +{% load widget_tweaks %} + +
+ + {% render_field field class="LP-Input__Field"%} + + + {% if field.errors %} + {% for error in field.errors%} + {{error}} + {% endfor %} + {% elif field.help_text%} + {{ field.help_text }} + {% endif %} + +
\ No newline at end of file diff --git a/lostplaces/templates/signup.html b/lostplaces/templates/signup.html index 47e2598..abfce8d 100644 --- a/lostplaces/templates/signup.html +++ b/lostplaces/templates/signup.html @@ -1,15 +1,40 @@ {% extends 'global.html'%} {% load static %} +{% load widget_tweaks %} # {% block title %}Registrierung{% endblock %} {% block maincontent %} -

Registrierung

-
- {% csrf_token %} - {{ form.as_p }} - + +
+ Registrierung + {% csrf_token %} +
+
+ {% include 'partials/form/inputField.html' with field=form.username %} +
+
+ {% include 'partials/form/inputField.html' with field=form.email %} +
+
+ +
+
+ {% include 'partials/form/inputField.html' with field=form.password1 %} +
+
+
+
+ {% include 'partials/form/inputField.html' with field=form.password2 %} +
+
+ +
+ +
+
+
{% endblock maincontent %} \ No newline at end of file From a232c15c1cc418bd92fccb4c79c9f35571586896 Mon Sep 17 00:00:00 2001 From: reverend Date: Mon, 3 Aug 2020 17:29:39 +0200 Subject: [PATCH 7/7] Groundkeepin i guess... --- lostplaces/lostplaces/settings.py | 3 +- lostplaces/lostplaces_app/static/main.css | 294 +++++++++++++--------- 2 files changed, 173 insertions(+), 124 deletions(-) diff --git a/lostplaces/lostplaces/settings.py b/lostplaces/lostplaces/settings.py index 43764db..086f9d6 100644 --- a/lostplaces/lostplaces/settings.py +++ b/lostplaces/lostplaces/settings.py @@ -41,7 +41,8 @@ INSTALLED_APPS = [ 'django.contrib.sessions', 'django.contrib.messages', 'django.contrib.staticfiles', - 'django_thumbs' + 'django_thumbs', + 'widget_tweaks', ] MIDDLEWARE = [ diff --git a/lostplaces/lostplaces_app/static/main.css b/lostplaces/lostplaces_app/static/main.css index b3a3cac..7bcb71c 100644 --- a/lostplaces/lostplaces_app/static/main.css +++ b/lostplaces/lostplaces_app/static/main.css @@ -62,7 +62,9 @@ font-weight: bold; } .LP-Button:active { background-color: #76323F; - color: #C09F80; } + color: #f9f9f9; } + .LP-Button--cancel { + background-color: #f9f9f9; } .LP-Form .LP-Form__Checkbox { display: none; } @@ -84,11 +86,12 @@ border-bottom: 1px solid #565656; padding: 8px; margin-bottom: 30px; } - .LP-Input .LP-Input__Field:focus, .LP-Input .LP-Input__Field:active { + .LP-Input .LP-Input__Field:focus, .LP-Input .LP-Input__Field:active, .LP-Input .LP-Input__Field:invalid { margin-bottom: 29px; border-bottom: 2px solid #76323F; background-color: #f9f9f9; - border-radius: 3px 3px 0 0; } + border-radius: 3px 3px 0 0; + box-shadow: none; } .LP-Input .LP-Input__Label { font-family: Montserrat, Helvetica, sans-serif; font-size: 16px; } @@ -99,8 +102,6 @@ padding: 3px; position: relative; top: -30px; } - .LP-Input .LP-Input__Message:before { - content: '* '; } .LP-Input--error .LP-Input__Field { margin-bottom: 25px; border-bottom: 2px solid #76323F; @@ -122,8 +123,10 @@ color: #565656; } .LP-Image { - max-width: 100%; - max-height: 100%; } + object-fit: cover; + width: 100%; + height: auto; + vertical-align: top; } .LP-Logo { max-width: 100%; @@ -131,6 +134,18 @@ width: auto; object-fit: contain; } +.LP-Tag { + padding: 8px 14px; + background-color: #D7CEC7; + border-radius: 2px; + width: max-content; } + .LP-Tag .LP-Paragraph { + padding: 0; + margin: 0; + font-family: Montserrat, Helvetica, sans-serif; + font-size: 1em; + display: inline; } + .LP-Content { padding: 35px; } @@ -141,68 +156,90 @@ .LP-TextSection .LP-Text { line-height: 1.4rem; } -.LP-Place { +.LP-PlaceTeaser { width: 280px; } - .LP-Place .LP-Place__Image { + .LP-PlaceTeaser .LP-PlaceTeaser__Image { height: 165px; - object-fit: fill; } - .LP-Place .LP-Place__Meta { + width: 280px; + overflow: hidden; } + .LP-PlaceTeaser .LP-PlaceTeaser__Image .LP-Image { + max-width: unset; + max-height: unset; + object-fit: cover; } + .LP-PlaceTeaser .LP-PlaceTeaser__Meta { display: flex; align-items: center; justify-content: space-between; padding-bottom: 10px; } - .LP-Place .LP-Place__Meta .LP-Paragraph { + .LP-PlaceTeaser .LP-PlaceTeaser__Meta .LP-Paragraph { font-family: Montserrat, Helvetica, sans-serif; padding: 0; margin: 0; margin-top: 5px; font-size: 0.9rem; } - .LP-Place .LP-Place__Meta .LP-Headline { + .LP-PlaceTeaser .LP-PlaceTeaser__Meta .LP-Headline { font-family: Montserrat, Helvetica, sans-serif; color: #565656; font-size: 1rem; padding: 0px; margin: 0px; } - .LP-Place .LP-Place__Description { + .LP-PlaceTeaser .LP-PlaceTeaser__Description { font-family: Roboto, Arial, sans-serif; color: #565656; display: none; } -.LP-SecurityMeasure__List { +@media (min-width: 650px) { + .LP-PlaceTeaser--extended { + display: flex; + flex-direction: row; + width: auto; + padding-right: 25px; + height: 165px; } + .LP-PlaceTeaser--extended .LP-PlaceTeaser__Meta { + margin: 0; + padding: 5px; + padding-left: 25px; + display: flex; + flex-direction: column; + justify-content: space-between; + align-items: flex-start; } + .LP-PlaceTeaser--extended .LP-PlaceTeaser__Meta .LP-PlaceTeaser__Info .LP-Headline { + font-size: 28px; } + .LP-PlaceTeaser--extended .LP-PlaceTeaser__Meta .LP-PlaceTeaser__Icons { + margin-top: auto; } + .LP-PlaceTeaser--extended .LP-PlaceTeaser__Meta .LP-PlaceTeaser__Icons ul { + padding: 0; + margin: 0; } + .LP-PlaceTeaser--extended .LP-PlaceTeaser__Description { + display: block; + max-height: 55px; + overflow: hidden; } + .LP-PlaceTeaser--extended .LP-PlaceTeaser__Image { + height: 165px; + width: 280px; + flex-shrink: 0; + flex-grow: 0; } } + +.LP-TagList .LP-TagList__List { list-style-type: none; display: flex; flex-wrap: wrap; padding: 0; margin: 0; } - .LP-SecurityMeasure__List .LP-SecurityMeasure__Item { - margin: 5px 5px; - padding: 5px 8px; - background-color: #D7CEC7; - border-radius: 2px; } - .LP-SecurityMeasure__List .LP-SecurityMeasure__Item .LP-Text { - font-family: Montserrat, Helvetica, sans-serif; - font-size: 1.2rem; } + .LP-TagList .LP-TagList__List .LP-TagList__Item { + margin: 6px; } -.LP-Header { - display: flex; - align-items: center; - justify-content: space-between; - margin-bottom: 70px; } - .LP-Header__Logo { - max-width: 300px; - width: 35%; - object-fit: contain; } - .LP-Header .LP-Header__Logo { - margin: 25px; } - -.LP-Menu__List { +.LP-Menu .LP-Menu__List { list-style-type: none; - display: inline-flex; - justify-content: space-around; } + display: flex; + flex-direction: row; + justify-content: space-between; + padding: 0; + margin: 0; } -.LP-Menu__Item { - padding: 10px 15px; - margin: 0 15px; +.LP-Menu .LP-Menu__Item { + padding: 15px 0; + margin: 0; width: 100px; text-align: center; background-color: transparent; } @@ -214,72 +251,80 @@ .LP-Menu .LP-Link__Text:hover { color: #76323F; } -.LP-Introduction .LP-Headline { - font-size: 2rem; } +@media (max-width: 750px) { + .LP-Menu .LP-Menu__List { + display: flex; + flex-direction: row; + justify-content: flex-start; } } -.LP-Introduction .LP-Text { - font-size: 1.3rem; } +@media (max-width: 450px) { + .LP-Menu .LP-Menu__List { + justify-content: space-between; } } -.LP-Place__Grid { +.LP-Header { + display: flex; + align-items: center; + justify-content: space-between; + margin-bottom: 70px; + height: 60px; } + .LP-Header__Logo { + height: 60px; + margin: 25px; + object-fit: cover; + max-height: 100%; + overflow: hidden; } + .LP-Header__Logo .LP-Image { + height: 60px; } + +@media (max-width: 750px) { + .LP-Header__Logo { + width: 60px; } + .LP-Header__Logo .LP-Image { + object-position: 0 0; + object-fit: cover; } } + +@media (max-width: 450px) { + .LP-Header__Logo { + display: none; } + .LP-Header__Navigation { + width: 100%; } } + +.LP-PlaceGrid .LP-PlaceGrid__Grid { margin: 0; padding: 0; list-style-type: none; display: flex; flex-direction: row; flex-wrap: wrap; } - .LP-Place__Grid > .LP-Place__Item { - margin: 0 15px; - margin-bottom: 50px; } - .LP-Place__Grid .LP-Link .LP-Place__Description { - display: none; } - .LP-Place__Grid .LP-Link .LP-Place:hover { - box-shadow: 0 0 8px #565656; } + .LP-PlaceGrid .LP-PlaceGrid__Grid .LP-PlaceGrid__Item { + margin: 18px; } + .LP-PlaceGrid .LP-PlaceGrid__Grid .LP-Link .LP-PlaceTeaser:hover { + box-shadow: 0 0 2px #565656; } -.LP-Place__List { +.LP-PlaceList .LP-PlaceList__List { list-style-type: none; } - .LP-Place__List .LP-Link .LP-Place:hover { + .LP-PlaceList .LP-PlaceList__List .LP-Link .LP-Place:hover { color: #565656; background-color: #f9f9f9; position: relative; left: -2px; } - .LP-Place__List .LP-Link .LP-Place:hover > .LP-Place__Image { + .LP-PlaceList .LP-PlaceList__List .LP-Link .LP-Place:hover > .LP-Place__Image { border-left: 2px #565656 solid; } - .LP-Place__List .LP-Place__Item { + .LP-PlaceList .LP-PlaceList__List .LP-PlaceList__Item { max-width: 900px; min-width: 450px; margin: 18px 0; } - .LP-Place__List .LP-Place__Item .LP-Place { - display: flex; - flex-direction: row; - width: auto; - padding-right: 25px; } - .LP-Place__List .LP-Place__Item .LP-Place .LP-Place__Assets { - margin: 0; - padding: 0; - padding-left: 25px; - display: flex; - flex-direction: column; - justify-content: space-between; - align-items: flex-start; } - .LP-Place__List .LP-Place__Item .LP-Place .LP-Place__Assets .LP-Place__Info .LP-Place__Title { - font-size: 28px; } - .LP-Place__List .LP-Place__Item .LP-Place .LP-Place__Assets .LP-Icon__List { - justify-self: flex-end; } - .LP-Place__List .LP-Place__Item .LP-Place > .LP-Place__Image { - height: 168px; - width: 280px; } .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; } .LP-LinkList__List .LP-LinkList__Item { border-left: 1px solid #C09F80; width: 100%; - margin-top: 12px; - height: 55px; } + margin-top: 12px; } .LP-LinkList__List .LP-LinkList__Item .LP-Link { padding: 1em 0 1em 1em; width: calc(100% - $-link-padding); @@ -330,30 +375,28 @@ .LP-Footer .LP-LinkList__List .LP-LinkList__Item .LP-Link:hover { background-color: inherit; } -.LP-Form { - max-width: 900px; } - .LP-Form .LP-Form__Fieldset { - border: none; } - .LP-Form .LP-Form__Fieldset .LP-Form__Legend { - margin: 0; - padding: 0; } - .LP-Form .LP-Form__Fieldset .LP-Form__Composition { - display: flex; - flex-direction: row; - justify-content: space-between; } - .LP-Form .LP-Form__Fieldset .LP-Form__Composition .LP-Form__Field { - flex: 3 1 100px; - padding: 6px 15px; } - .LP-Form .LP-Form__Fieldset .LP-Form__Composition .LP-Form__Field--wider { - flex: 5 1 200px; } - .LP-Form .LP-Form__Fieldset .LP-Form__Composition .LP-Form__Field--wide { - flex: 4 1 150px; } - .LP-Form .LP-Form__Fieldset .LP-Form__Composition .LP-Form__Field--narrow { - flex: 2 0 50px; } - .LP-Form .LP-Form__Fieldset .LP-Form__Composition .LP-Form__Field--narrower { - flex: 1 0 25px; } - .LP-Form .LP-Form__Fieldset .LP-Form__Composition .LP-Form__Field input { - width: 100%; } +.LP-Form .LP-Form__Fieldset { + border: none; } + .LP-Form .LP-Form__Fieldset .LP-Form__Legend { + margin: 0; + padding: 0; + font-family: Montserrat, Helvetica, sans-serif; + font-size: 21px; } + .LP-Form .LP-Form__Fieldset .LP-Form__Composition { + display: flex; + flex-direction: row; + justify-content: space-between; } + .LP-Form .LP-Form__Fieldset .LP-Form__Composition .LP-Form__Field { + flex: 3 1 100px; + padding: 6px 15px; } + .LP-Form .LP-Form__Fieldset .LP-Form__Composition .LP-Form__Field--wider { + flex: 5 1; } + .LP-Form .LP-Form__Fieldset .LP-Form__Composition .LP-Form__Field--wide { + flex: 4 1; } + .LP-Form .LP-Form__Fieldset .LP-Form__Composition .LP-Form__Field--narrow { + flex: 2 0; } + .LP-Form .LP-Form__Fieldset .LP-Form__Composition .LP-Form__Field--narrower { + flex: 1 0; } @media (max-width: 650px) { .LP-Form .LP-Form__Fieldset .LP-Form__Composition--breakable { @@ -377,45 +420,50 @@ .LP-HorizontalLine { color: #565656; } +@media (max-width: 650px) { + .LP-MainContainer { + width: 100%; } } + .LP-PlaceOverview .LP-PlaceOverview__Info .LP-PlaceOveriew__Image { width: 700px; - height: 450px; box-shadow: 0 0 10px #565656; object-fit: cover; + object-position: 0 0; float: right; margin-left: 35px; - margin-bottom: 35px; } + margin-bottom: 35px; + overflow: hidden; } .LP-PlaceOverview .LP-PlaceOverview__Info .LP-PlaceOverView__Description { padding: 0px; position: relative; top: -15px; } + .LP-PlaceOverview .LP-PlaceOverview__Info .LP-PlaceOverView__Description .LP-Headline { + position: relative; + top: 15px; } .LP-PlaceOverview .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 .LP-PlaceOverView__ImageList .LP-PlaceOverView__ImageItem img { - box-shadow: 0 0 5px #565656; - height: 200px; - width: 290px; - object-fit: cover; + .LP-PlaceOverview .LP-PlaceOverView__ImageList .LP-PlaceOverView__ImageItem { margin-top: 10px; } + .LP-PlaceOverview .LP-PlaceOverView__ImageList .LP-PlaceOverView__ImageItem .LP-Link { + overflow: hidden; } + .LP-PlaceOverview .LP-PlaceOverView__ImageList .LP-PlaceOverView__ImageItem .LP-Image { + box-shadow: 0 0 5px #565656; + height: 200px; + width: 290px; + object-fit: cover; } -@media (max-width: 1290px) { +@media (max-width: 1000px) { .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; } + margin-top: 30px; } .LP-PlaceOverview .LP-PlaceOverview__Info .LP-PlaceOveriew__Image { float: none; - width: calc(100vw - 30px); + width: 100%; + height: auto; margin: 0; - padding: 0; - margin-left: 7px; } } + padding: 0; } }