diff --git a/source/screens/demo/examples/card.njk b/source/screens/demo/examples/card.njk index 353fed9..6902255 100644 --- a/source/screens/demo/examples/card.njk +++ b/source/screens/demo/examples/card.njk @@ -3,13 +3,14 @@ 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 %}{{ title }}{% endblock %} +{% block title %}Karte{% endblock %} {% block head %} {{ super() }} @@ -46,7 +47,7 @@ tags:
-

Titel
und Beschreibung

+

Titel
and description

{{ ph.name() }}

{{ ph.email('card_address') }}
diff --git a/source/screens/demo/examples/portal.njk b/source/screens/demo/examples/portal.njk index 8c6bb73..b472f8e 100644 --- a/source/screens/demo/examples/portal.njk +++ b/source/screens/demo/examples/portal.njk @@ -3,13 +3,15 @@ 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 %}{{ title }}{% endblock %} +{% block title %}Portal{% endblock %} {% block head %} {{ super() }} diff --git a/source/style/hippie-style b/source/style/hippie-style index ca9dbcb..84ddbce 160000 --- a/source/style/hippie-style +++ b/source/style/hippie-style @@ -1 +1 @@ -Subproject commit ca9dbcb48ceb8347aaff4b69e852e419f55ef65a +Subproject commit 84ddbceb9a130943c3833b3d937bd7beac2e71d3 diff --git a/source/style/modules/portal/_portal_module.scss b/source/style/modules/portal/_portal_module.scss index 6477b6b..325dcef 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: $transition_best; + transition: flex 500ms cubic-bezier(0, 0, 0.2, 1.4), background 800ms ease; &:hover { flex: 3; diff --git a/source/templates/hippie/macros/_placeholder.njk b/source/templates/hippie/macros/_placeholder.njk index 52f35be..d82e4ff 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='Vorname Nachname') %} +{% macro name(class='', text='Prename Surname') %} {{ text }} {% endmacro %} -{% macro address(class='', text='Straße Nr., PLZ Ort') %} +{% macro address(class='', text='Street No., Postcode City') %} {{ text }} {% endmacro %} diff --git a/source/templates/hippie/partials/_head_meta.njk b/source/templates/hippie/partials/_head_meta.njk index 00c2efd..38c3b82 100644 --- a/source/templates/hippie/partials/_head_meta.njk +++ b/source/templates/hippie/partials/_head_meta.njk @@ -1,6 +1,6 @@ - +