Skip to content

Commit

Permalink
Styles & layouts
Browse files Browse the repository at this point in the history
  • Loading branch information
eebbi committed Dec 18, 2024
1 parent ee73fef commit 9a811de
Show file tree
Hide file tree
Showing 6 changed files with 83 additions and 54 deletions.
2 changes: 2 additions & 0 deletions CHANGELOG.MD
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
## [Unreleased]

- Modify theme files
- Modify hero-component
- Modify header & navigation
- Add key-figures as a component
- Add new timeline-component

Expand Down
2 changes: 0 additions & 2 deletions assets/styles/settings/brand/_main-content.scss
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
main.main-content {
overflow: hidden;

&::before {
content: '';
display: block;
Expand Down
4 changes: 3 additions & 1 deletion assets/styles/ui-components/header/_primary-nav.scss
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,8 @@
}

.navbar-dropdown {
width: 200px !important;
width: 220px !important;
margin-top: $theme-spacing-half !important;
min-width: auto !important;
border-top: none !important;
background-color: $white !important;
Expand Down Expand Up @@ -92,6 +93,7 @@
background-color: transparent !important;
font-weight: $weight-medium;
border-bottom: none !important;
padding: $theme-spacing-half !important;

.icon {
width: $theme-spacing-half !important;
Expand Down
14 changes: 7 additions & 7 deletions partials/shared/contact.dust
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
{#phone_repeater}
<div class="is-flex is-align-items-center">
<div class="contacts__icon-container">
{>"ui/icon" icon="phone" class="icon--large is-accent" /}
{>"ui/icon" icon="phone" class="icon--large is-primary" /}
</div>

<div>
Expand All @@ -54,7 +54,7 @@
{?email}
<div class="is-flex is-align-items-center mb-3">
<div class="contacts__icon-container">
{>"ui/icon" icon="email" class="icon--large is-accent" /}
{>"ui/icon" icon="email" class="icon--large is-primary" /}
</div>

<a href="mailto:{email|s}" class="has-text-paragraph">
Expand All @@ -66,7 +66,7 @@
{?office}
<div class="is-flex is-align-items-center mb-3">
<div class="contacts__icon-container">
{>"ui/icon" icon="building" class="icon--large is-accent" /}
{>"ui/icon" icon="building" class="icon--large is-primary" /}
</div>

<div>
Expand All @@ -78,7 +78,7 @@
{?domain}
<div class="is-flex is-align-items-center mb-3">
<div class="contacts__icon-container">
{>"ui/icon" icon="location" class="icon--large is-accent" /}
{>"ui/icon" icon="location" class="icon--large is-primary" /}
</div>

<div>
Expand All @@ -90,7 +90,7 @@
{?unit}
<div class="is-flex is-align-items-center mb-3">
<div class="contacts__icon-container">
{>"ui/icon" icon="location" class="icon--large is-accent" /}
{>"ui/icon" icon="location" class="icon--large is-primary" /}
</div>

<div>
Expand All @@ -102,7 +102,7 @@
{@isset key1=visiting_address_street key2=visiting_address_zip_code key3=visiting_address_city method="OR" }
<div class="is-flex is-align-items-center mb-3">
<div class="contacts__icon-container">
{>"ui/icon" icon="location" class="icon--large is-accent" /}
{>"ui/icon" icon="location" class="icon--large is-primary" /}
</div>

{visiting_address_street|s}
Expand All @@ -114,7 +114,7 @@
{@isset key1=mail_address_street key2=mail_address_zip_code key3=mail_address_city method="OR" }
<div class="is-flex is-align-items-center mb-3">
<div class="contacts__icon-container">
{>"ui/icon" icon="location" class="icon--large is-accent" /}
{>"ui/icon" icon="location" class="icon--large is-primary" /}
</div>

{mail_address_street|s}
Expand Down
10 changes: 5 additions & 5 deletions partials/ui/event-highlight.dust
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<div class="column is-6 is-4-desktop is-flex">
<div class="events__item entry mb-6 has-height-100">
<div class="events__item entry mb-6 has-width-100 has-height-100">
<div class="image is-5by3 mb-3">
{?primary_keyword}
<span href="{category.permalink|url}" class="pill is-absolute has-top-0 has-left-0 m-4 is-family-secondary {category_link_classes|attr}">
Expand All @@ -24,7 +24,7 @@

<div class="is-flex is-align-items-center mt-2 mb-2 {classes.event_item_text|attr}">
<span class="is-flex" aria-label="{Strings.s.event.date|attr}">
{>"ui/icon" icon="date" class="icon--large is-primary mr-4 {classes.event_item_icon|attr}" /}
{>"ui/icon" icon="date" class="icon--large is-primary mr-4" /}
</span>

<p class="m-0 is-family-secondary">
Expand All @@ -34,7 +34,7 @@

<div class="is-flex is-align-items-center mt-2 mb-2 {classes.event_item_text|attr}">
<span class="is-flex" aria-label="{Strings.s.event.time|attr}">
{>"ui/icon" icon="time" class="icon--large is-primary mr-4 {classes.event_item_icon|attr}" /}
{>"ui/icon" icon="time" class="icon--large is-primary mr-4" /}
</span>

<p class="m-0 is-family-secondary">
Expand All @@ -45,7 +45,7 @@
{?location.name}
<div class="is-flex is-align-items-center mt-2 mb-2 {classes.event_item_text|attr}">
<span class="is-flex" aria-label="{Strings.s.event.location|attr}">
{>"ui/icon" icon="location" class="icon--large is-primary mr-4 {classes.event_item_icon|attr}" /}
{>"ui/icon" icon="location" class="icon--large is-primary mr-4" /}
</span>

<p class="m-0 is-family-secondary">
Expand All @@ -59,7 +59,7 @@
{?is_free}
<div class="is-flex is-align-items-center mt-2 mb-2 {classes.event_item_text|attr}">
<span class="is-flex" aria-label="{Strings.s.event.price|attr}">
{>"ui/icon" icon="euro" class="icon--large is-primary mr-2 {item_classes.grid.icon|attr}" /}
{>"ui/icon" icon="euro" class="icon--large is-primary mr-2" /}
</span>
<p class="m-0 is-family-secondary">
{price|html}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,54 +1,81 @@
<div class="events__item has-height-100 {item_classes.grid.item|s}">
{?image}
<div class="image is-relative is-4by3" aria-hidden="true">
<a href="{url}" aria-hidden="true" tabindex="-1">
<img src="{image}" alt="" class="objectfit-image">
</a>

<div class="events__item entry mb-6 has-width-100 has-height-100">
<div class="image is-5by3 mb-3">
{?primary_keyword}
<span class="pill is-absolute has-bottom-2 has-left-2 is-bordered is-secondary">
{primary_keyword|s}
<span href="{category.permalink|url}" class="pill is-absolute has-top-0 has-left-0 m-4 is-family-secondary {category_link_classes|attr}">
{primary_keyword|html}
</span>
{/primary_keyword}

{?image}
<a href="{url|url}" aria-hidden="true" tabindex="-1"
class="is-block is-absolute has-top-0 has-right-0 has-bottom-0 has-left-0">
<img src="{image|url}" loading="lazy" alt="" class="objectfit-image">
</a>
{/image}
</div>
{/image}

<div class="events__item-inner pt-5 pb-6 {item_classes.grid.item_inner|s}">
<h3 class="h5 mt-0 mb-5">
<a href="{url}" class="has-text-black">
{name|s}
</a>
</h3>
<div class="events__item-inner p-3">
<h2 class="is-family-secondary h5 mt-0 mb-3">
<a href="{url|url}">
{name|html}
</a>
</h2>

<p class="has-text-small">
{short_description|s}
</p>
<p class="has-text-small">
{short_description|s}
</p>

<div class="events__meta is-flex is-family-secondary is-align-items-center">
<span class="is-flex" aria-label="{Strings.s.event.date|s}">
{>"ui/icon" icon="date" class="icon--large is-primary mr-2 {item_classes.grid.icon|s}" /}
</span>

{date|s}
</div>

<div class="events__meta is-flex is-family-secondary is-align-items-center">
<span class="is-flex" aria-label="{Strings.s.event.time|s}">
{>"ui/icon" icon="time" class="icon--large is-primary mr-2 {item_classes.grid.icon|s}" /}
</span>
<div class="is-flex is-align-items-center mt-2 mb-2 {classes.event_item_text|attr}">
<span class="is-flex" aria-label="{Strings.s.event.date|attr}">
{>"ui/icon" icon="date" class="icon--large is-primary mr-4" /}
</span>

{time|s}
</div>
<p class="m-0 is-family-secondary">
{date|kses}
</p>
</div>

{?location.name}
<div class="events__meta is-flex is-family-secondary is-align-items-center">
<span class="is-flex" aria-label="{Strings.s.event.location|s}">
{>"ui/icon" icon=location_icon class="icon--large is-primary mr-2 {item_classes.grid.icon|s}" /}
<div class="is-flex is-align-items-center mt-2 mb-2 {classes.event_item_text|attr}">
<span class="is-flex" aria-label="{Strings.s.event.time|attr}">
{>"ui/icon" icon="time" class="icon--large is-primary mr-4" /}
</span>

{location.name|s}
<p class="m-0 is-family-secondary">
{time|kses}
</p>
</div>
{/location.name}

{?location.name}
<div class="is-flex is-align-items-center mt-2 mb-2 {classes.event_item_text|attr}">
<span class="is-flex" aria-label="{Strings.s.event.location|attr}">
{>"ui/icon" icon="location" class="icon--large is-primary mr-4" /}
</span>

<p class="m-0 is-family-secondary">
{location.name|html}
</p>

</div>
{/location.name}

{#price}
{?is_free}
<div class="is-flex is-align-items-center mt-2 mb-2 {classes.event_item_text|attr}">
<span class="is-flex" aria-label="{Strings.s.event.price|attr}">
{>"ui/icon" icon="euro" class="icon--large is-primary mr-2" /}
</span>
<p class="m-0 is-family-secondary">
{price|html}
</p>
</div>
{/is_free}
{/price}

{?url}
<a href="{url|url}" class="button is-primary is-outlined is-small is-hidden-desktop mt-4">
{Strings.s.common.read_more|html}
</a>
{/url}
</div>
</div>
</div>

0 comments on commit 9a811de

Please sign in to comment.