Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions web/app/themes/sage/config/gutenberg.php
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,7 @@
'core/list-item',
'core/list',
'core/paragraph',
'core/quote',
'yard/icon',
'yard/iconlist-item',
'yard/iconlist',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,14 @@
"supports": {
"html": false,
"multiple": false,
"reusable": false
"reusable": false,
"color": {
"text": false,
"background": true,

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nee dat willen we niet standaard in brave. Door het wel al als support toe te voegen is het wel makkelijk te gebruiken als een thema het wel nodig heeft.

"__experimentalDefaultControls": {
"background": true
}
}
},
"attributes": {
"focalPoint": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,3 +37,11 @@
.wp-block-theme-banner__image {
@apply aspect-(--banner-image-ratio) w-(--banner-image-width) max-w-none object-cover md:absolute md:top-0 md:bottom-0 md:left-0 md:h-full! md:min-h-0;
}

.wp-block-theme-banner:has( + .wp-block-theme-section.has-background ) {
@apply mb-0;

+ .wp-block-theme-section.has-background {

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Denk dat hier wel bewust was gekozen om het onderwerp van de regel in het bijhorende CSS bestand te stoppen. Als in we stijlen een sectie, dan vind je de CSS in het bestand voor secties. De vraag is wat bepaalt waar CSS staat, het onderwerp of de context. Voor beide valt waarschijnlijk wel iets te zeggen, als het maar consistent is.

De regel leest zo wel een beetje raar: 'verwijder de bovenste marge van een sectie blok met een achtergrond dat volgt op een banner blok dat vooraf gaat aan sectie blok met een achtergrond' i.p.v. 'verwijder de bovenste marge van een sectie blok met een achtergrond dat volgt op een banner blok'. Heeft waarschijnlijk ook gevolgen voor hoe specifiek de regel is, hoewel dat in de praktijk waarschijnlijk nooit voor problemen zorgt.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

"een banner blok dat vooraf gaat aan sectie blok met een achtergrond" dat gedeelte klopt niet. De situatie die hiermee afgehandeld is, is als volgt:
[Banner]
[Sectie met achtergrondkleur]

De margin tussen deze blokken wil je weg hebben. Je verhaal over in welk bestand het moet staan, die snap ik wel ja. In dit geval heb ik voor de banner gekozen omdat in eerste instantie de margin van de banner wordt weggehaald en daarna ook die van de sectie. Ik zou het persoonlijk gek vinden om het in 2 losse bestanden te gaan zetten omdat het wel met elkaar te maken heeft.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Dat is alleen het laatste deel van de zin 😉 Snap dat beide marges in deze situaties weg moeten. Mijn punt was alleen dat .wp-block-theme-banner + .wp-block-theme-section.has-background (0,3,0) naar mijn mening duidelijker en efficienter is dan .wp-block-theme-banner:has(+ .wp-block-theme-section.has-background) + .wp-block-theme-section.has-background (0,5,0). Maar helemaal prima zo! 👍😄

@apply mt-0;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
"description": "Gebruik dit blok om een kaart te maken met een afbeelding, titel en tekst.",
"ancestor": [ "core/group" ],
"supports": {
"anchor": true,

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Wybe: note to self wat doet anchor ookalweer

"html": false,
"reusable": false,
"color": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,3 @@
}
}
}

.wp-block-theme-banner + .wp-block-theme-section.has-background {
@apply mt-0;
}
4 changes: 2 additions & 2 deletions web/app/themes/sage/resources/styles/base/utilities.css
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,7 @@
}

@utility is-text-input {
@apply rounded-(--input-radius) border-0 border-b-(length:--input-border-width) border-(--input-border-color) bg-(--input-bg-color) p-(--input-padding) text-(length:--input-font-size) leading-snug shadow-(--input-box-shadow);
@apply rounded-(--input-radius) border-0 border-b-(length:--input-border-width) border-(--input-border-color) bg-(--input-bg-color) p-(--input-padding) text-(length:--input-font-size) leading-snug text-(--input-color) shadow-(--input-box-shadow);

&:focus {
@apply outline-none;
Expand Down Expand Up @@ -218,7 +218,7 @@
}

@utility is-select {
@apply cursor-pointer rounded-(--select-radius) border-(length:--select-border-width) border-(--select-border-color) bg-(--select-bg-color) p-(--select-padding) text-(length:--select-font-size) leading-snug shadow-(--select-box-shadow) transition-all;
@apply cursor-pointer rounded-(--select-radius) border-(length:--select-border-width) border-(--select-border-color) bg-(--select-bg-color) p-(--select-padding) text-(length:--select-font-size) leading-snug text-(--select-color) shadow-(--select-box-shadow) transition-all;
appearance: base-select;

&::picker-icon {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,5 +24,5 @@
}

.wp-block-yard-collapse-item__header-toggle-button {
@apply flex aspect-square size-(--collapse-button-icon-size) items-center justify-center rounded-(--collapse-radius)! bg-(--collapse-button-icon-bg-color)! p-0 text-[length:inherit] leading-[inherit] text-(--collapse-button-icon-color)!;
@apply flex aspect-square size-(--collapse-button-icon-size) items-center justify-center rounded-(--collapse-button-icon-radius)! bg-(--collapse-button-icon-bg-color)! p-0 text-[length:inherit] leading-[inherit] text-(--collapse-button-icon-color)!;
}
10 changes: 10 additions & 0 deletions web/app/themes/sage/resources/styles/blocks/gallery/shared.css
Original file line number Diff line number Diff line change
@@ -1,4 +1,14 @@
:root {
--gallery-block-spacing: 1.5rem;

@variant md {
--gallery-block-spacing: 2rem;
}
}

.wp-block-gallery {
@apply not-first:mt-(--gallery-block-spacing) not-last:mb-(--gallery-block-spacing);

/* Not cropped usually means images like logo's */
&:not( .is-cropped ) figure.wp-block-image {
@apply mt-auto! items-center;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
&.is-image-fill-element {
.wp-block-media-text__media {
&:has( img ) {
@apply aspect-video;
@apply aspect-video min-h-0 max-w-full;
}

img {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,15 +1,7 @@
.wp-block-social-links {
@apply pl-0;
}

.wp-block-social-link {
@apply bg-white! text-primary! shadow-lg;

@variant hocus {
@apply transform-none! bg-primary! text-white! transition-all;
}
}

.wp-block-social-link-anchor {
@apply p-[0.25em]!;
}
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
/* Block styling which doesn't need their own CSS file */
.wp-block-cover,
.wp-block-embed,
.wp-block-gallery,
.wp-block-image,
.wp-block-post-featured-image {
@apply mb-6 md:mb-8;
Expand Down
2 changes: 2 additions & 0 deletions web/app/themes/sage/resources/styles/elements/forms.css
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
--input-border-width: 2px;
--input-box-shadow: var( --shadow-sm );
--input-font-size: 1rem;
--input-color: var( --body-text-color );
--input-padding: 0.75em 1em;
--input-radius: var( --radius-theme );

Expand All @@ -15,6 +16,7 @@
--select-border-color: var( --input-border-color );
--select-border-width: 1px;
--select-box-shadow: var( --input-box-shadow );
--select-color: var( --input-color );
--select-font-size: var( --input-font-size );
--select-padding: var( --input-padding );
--select-radius: var( --input-radius );
Expand Down
4 changes: 4 additions & 0 deletions web/app/themes/sage/resources/styles/vendor/facetwp.css
Original file line number Diff line number Diff line change
Expand Up @@ -256,3 +256,7 @@ dialog .facetwp-type-date_range {
}
}
}

.fdate-grid .selected {
@apply bg-primary-50!;
}
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
$name = isset($template['name']) ? str_replace('_', '-', $template['name']) : null;
@endphp

<div @class(['facetwp', $align, 'facetwp-' . $name])>
<div @class(['facetwp mt-8 mb-section', $align, 'facetwp-' . $name])>
@if (!function_exists('facetwp_display'))
<x-alert type="danger">
De plugin FacetWP is niet geïnstalleerd of geactiveerd.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<div @class([
$attributes['class'] => isset($attributes['class']),
$attributes->get('class', ''),
'group relative m-0 flex h-full max-w-full rounded-(--card-radius) border-none bg-(--card-bg-color) p-0 shadow-(--card-shadow) transition-all',
$cardClass(),
'card-column flex-col' => $direction->isColumn(),
Expand Down Expand Up @@ -38,7 +38,7 @@
@endif

@if ($displayDate && $dateTime && $dateString)
<time class="card-date -order-1 mb-2! text-sm leading-none text-gray-500" datetime="{{ $dateTime }}">
<time class="card-date mb-2! -order-1 text-sm leading-none text-gray-500" datetime="{{ $dateTime }}">
{{ $dateString }}
</time>
@endif
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@
<x-brave::dialog.trigger :dialogId="$dialogId" class="hamburger flex min-h-[46px] flex-col gap-y-2 lg:hidden">
<span class="size-(--search-bar-trigger-icon-size) flex items-center justify-center">
<span class="flex w-8 flex-col gap-y-2">
<span class="block h-0.5 w-8 rounded-full bg-black transition-all duration-300 ease-in-out"></span>
<span class="block h-0.5 w-6 rounded-full bg-black transition-all duration-300 ease-in-out"></span>
<span class="block h-0.5 w-4 rounded-full bg-black transition-all duration-300 ease-in-out"></span>
<span class="block h-0.5 w-8 rounded-full bg-black"></span>
<span class="block h-0.5 w-6 rounded-full bg-black"></span>
<span class="block h-0.5 w-4 rounded-full bg-black"></span>
</span>
</span>
<span class="mt-auto text-center text-xs leading-none">{{ $label }}</span>
Expand All @@ -29,8 +29,9 @@
])>
<div class="flex h-full flex-col">
<div class="z-1 sticky top-0 flex items-center justify-between gap-2 border-b border-gray-100 bg-white px-6 py-4">
<h2 class="mb-0 is-body-text">{{ $label }}</h2>
<x-brave::dialog.trigger :dialogId="$dialogId" class="leading-0 size-11.5 -m-2 flex items-center justify-center text-2xl">
<h2 class="is-body-text mb-0">{{ $label }}</h2>
<x-brave::dialog.trigger :dialogId="$dialogId"
class="leading-0 size-11.5 -m-2 flex items-center justify-center text-2xl">
<i class="fa-light fa-xmark" aria-hidden="true"></i>
<span class="sr-only">Sluit menu</span>
</x-brave::dialog.trigger>
Expand All @@ -41,7 +42,8 @@
<x-brave::nav.list class="mb-6">
@foreach ($primaryNavigation->all() as $item)
<x-brave::nav.item class="group">
<x-brave::nav.link :item="$item" class="block py-3 text-lg text-(--body-text-color) no-underline focus:text-inherit"
<x-brave::nav.link :item="$item"
class="text-(--body-text-color) block py-3 text-lg no-underline focus:text-inherit"
activeClass="text-primary font-bold">
{!! $item->label !!}
@if ($item->children)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,17 @@
])

<x-brave::dialog.trigger :dialogId="$dialogId"
class="search-bar-open-btn is-search-bar-trigger ease-base ml-auto flex min-h-[46px] flex-col items-center justify-center gap-y-2 text-2xl transition-colors duration-500 lg:ml-0 lg:self-center"
class="search-bar-open-btn is-search-bar-trigger ease-base ml-auto flex flex-col items-center justify-center gap-y-2 text-2xl transition-colors duration-500 max-lg:min-h-[46px] lg:ml-0 lg:self-center"
aria-label="{{ __('Open zoekbalk om te zoeken', 'sage') }}">
<span class="is-search-bar-trigger-icon lg:contents">
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512" class="size-5 fill-current lg:size-6">
<path
d="M384 208A176 176 0 1 0 32 208a176 176 0 1 0 352 0zM343.3 366C307 397.2 259.7 416 208 416C93.1 416 0 322.9 0 208S93.1 0 208 0S416 93.1 416 208c0 51.7-18.8 99-50 135.3L507.3 484.7c6.2 6.2 6.2 16.4 0 22.6s-16.4 6.2-22.6 0L343.3 366z" />
</svg>
</span>
<span class="[display:var(--search-bar-trigger-label-display)] mt-auto text-xs leading-none lg:hidden">{{ __('Zoeken', 'sage') }}</span>
<span class="mt-auto text-xs leading-none [display:var(--search-bar-trigger-label-display)] lg:hidden">
{{ __('Zoeken', 'sage') }}
</span>
</x-brave::dialog.trigger>

<x-brave-dialog :id="$dialogId" :ariaLabel="__('Zoekbalk', 'sage')" @class([
Expand Down
17 changes: 0 additions & 17 deletions web/app/themes/sage/theme.json
Original file line number Diff line number Diff line change
Expand Up @@ -112,23 +112,6 @@
"core/group": {
"spacing": {
"margin": true
},
"color": {
"text": false,
"heading": false,
"button": false,
"palette": [
{
"slug": "primary",
"color": "var(--color-primary)",
"name": "Primair"
},
{
"slug": "white",
"color": "var(--color-white)",
"name": "Wit"
}
]
}
},
"core/media-text": {
Expand Down
Loading