From 7ae8799d4fd11ec566565bc2e8111ece73192950 Mon Sep 17 00:00:00 2001 From: sthag Date: Wed, 14 Aug 2024 17:57:41 +0200 Subject: [PATCH 1/3] feat: add variables to templates --- source/screens/demo/examples/card.njk | 3 +-- source/screens/demo/examples/portal.njk | 4 +--- source/templates/hippie/partials/_head_meta.njk | 2 +- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/source/screens/demo/examples/card.njk b/source/screens/demo/examples/card.njk index 6902255..df35f2e 100644 --- a/source/screens/demo/examples/card.njk +++ b/source/screens/demo/examples/card.njk @@ -3,14 +3,13 @@ title: Card tags: - demoExample --- -{% set pageBase = "../" %} {% set pageId = page.fileSlug %} {% set pageClass = "html_card" %} {% extends "demo/_default.njk" %} {% import "hippie/macros/_placeholder.njk" as ph %} -{% block title %}Karte{% endblock %} +{% block title %}{{ title }}{% endblock %} {% block head %} {{ super() }} diff --git a/source/screens/demo/examples/portal.njk b/source/screens/demo/examples/portal.njk index b472f8e..8c6bb73 100644 --- a/source/screens/demo/examples/portal.njk +++ b/source/screens/demo/examples/portal.njk @@ -3,15 +3,13 @@ title: Portal tags: - demoExample --- -{% set pageBase = "../" %} {% set pageId = page.fileSlug %} {% set bodyClass = "body_portal" %} {% extends "demo/_default.njk" %} - {% import "demo/macros/_gates.njk" as gate %} -{% block title %}Portal{% endblock %} +{% block title %}{{ title }}{% endblock %} {% block head %} {{ super() }} diff --git a/source/templates/hippie/partials/_head_meta.njk b/source/templates/hippie/partials/_head_meta.njk index 38c3b82..00c2efd 100644 --- a/source/templates/hippie/partials/_head_meta.njk +++ b/source/templates/hippie/partials/_head_meta.njk @@ -1,6 +1,6 @@ - + From 95a18e636f96391b3e7683bc6620905743dbbc60 Mon Sep 17 00:00:00 2001 From: sthag Date: Wed, 14 Aug 2024 18:02:45 +0200 Subject: [PATCH 2/3] fix: change placeholder language --- source/screens/demo/examples/card.njk | 2 +- source/templates/hippie/macros/_placeholder.njk | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/source/screens/demo/examples/card.njk b/source/screens/demo/examples/card.njk index df35f2e..353fed9 100644 --- a/source/screens/demo/examples/card.njk +++ b/source/screens/demo/examples/card.njk @@ -46,7 +46,7 @@ tags:
-

Titel
and description

+

Titel
und Beschreibung

{{ ph.name() }}

{{ ph.email('card_address') }}
diff --git a/source/templates/hippie/macros/_placeholder.njk b/source/templates/hippie/macros/_placeholder.njk index d82e4ff..52f35be 100644 --- a/source/templates/hippie/macros/_placeholder.njk +++ b/source/templates/hippie/macros/_placeholder.njk @@ -5,9 +5,9 @@ {% macro link(class='', text='domain.tld', href='http://domain.internal') %} {{ text }} {% endmacro %} -{% macro name(class='', text='Prename Surname') %} +{% macro name(class='', text='Vorname Nachname') %} {{ text }} {% endmacro %} -{% macro address(class='', text='Street No., Postcode City') %} +{% macro address(class='', text='Straße Nr., PLZ Ort') %} {{ text }} {% endmacro %} From 42a20c83f50a2b81debb99b7869cc34c303dc277 Mon Sep 17 00:00:00 2001 From: sthag Date: Wed, 14 Aug 2024 18:08:41 +0200 Subject: [PATCH 3/3] feat: replace transition with new variable --- source/style/hippie-style | 2 +- source/style/modules/portal/_portal_module.scss | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/source/style/hippie-style b/source/style/hippie-style index 84ddbce..ca9dbcb 160000 --- a/source/style/hippie-style +++ b/source/style/hippie-style @@ -1 +1 @@ -Subproject commit 84ddbceb9a130943c3833b3d937bd7beac2e71d3 +Subproject commit ca9dbcb48ceb8347aaff4b69e852e419f55ef65a diff --git a/source/style/modules/portal/_portal_module.scss b/source/style/modules/portal/_portal_module.scss index 325dcef..6477b6b 100644 --- a/source/style/modules/portal/_portal_module.scss +++ b/source/style/modules/portal/_portal_module.scss @@ -21,7 +21,7 @@ $portal_icon_size: 64px; padding-left: $portal_margin; overflow-x: hidden; overflow-y: auto; - transition: flex 500ms cubic-bezier(0, 0, 0.2, 1.4), background 800ms ease; + transition: $transition_best; &:hover { flex: 3;