From d1d101e90336285d74127237a8aa75a34cbb6f92 Mon Sep 17 00:00:00 2001 From: YvetteNikolov Date: Wed, 16 Jul 2025 15:39:52 +0200 Subject: [PATCH 1/3] (feat): several changes for bar theme --- app/Sidebar/Sidebar.php | 3 ++ .../barbarendrecht/assets/img/zaak-header.jpg | Bin 0 -> 2108 bytes .../scss/blocks/personal-heading/_shared.scss | 17 +++++++++++ .../assets/scss/components/_navbar.scss | 27 ++++++++++++++++-- .../assets/scss/components/_zaak-card.scss | 5 ++++ .../assets/scss/components/_zaak-header.scss | 12 ++++++++ .../assets/scss/generic/_typography.scss | 9 ++++++ .../assets/scss/settings/_colors.scss | 4 +-- .../assets/scss/settings/_root.scss | 14 +++++++++ .../barbarendrecht/assets/scss/style.scss | 7 +++++ .../scss/layouts/_template-mijn-zaken.scss | 5 +++- .../templates/mijn-zaken/home/login-digid.php | 4 +-- .../mijn-zaken/home/login-eherkenning.php | 4 +-- .../templates/mijn-zaken/home/login-eidas.php | 2 +- .../templates/template-single-zaak.php | 2 +- 15 files changed, 104 insertions(+), 11 deletions(-) create mode 100644 htdocs/wp-content/themes/barbarendrecht/assets/img/zaak-header.jpg create mode 100644 htdocs/wp-content/themes/barbarendrecht/assets/scss/blocks/personal-heading/_shared.scss create mode 100644 htdocs/wp-content/themes/barbarendrecht/assets/scss/components/_zaak-card.scss create mode 100644 htdocs/wp-content/themes/barbarendrecht/assets/scss/components/_zaak-header.scss diff --git a/app/Sidebar/Sidebar.php b/app/Sidebar/Sidebar.php index 676a7028..e50a3152 100644 --- a/app/Sidebar/Sidebar.php +++ b/app/Sidebar/Sidebar.php @@ -14,6 +14,9 @@ class Sidebar public function register(): void { + if (! function_exists('get_field')) { + return; + } add_action('acf/include_fields', [$this, 'addAcfFields']); add_action('wp_nav_menu_objects', [$this, 'addIconsToMenuItems'], 10, 2); add_action('render_block_core/navigation-link', [$this, 'addIconsToBlockMenuItems'], 10, 2); diff --git a/htdocs/wp-content/themes/barbarendrecht/assets/img/zaak-header.jpg b/htdocs/wp-content/themes/barbarendrecht/assets/img/zaak-header.jpg new file mode 100644 index 0000000000000000000000000000000000000000..93f5fd7d6d7f59378869062de7a9cff6c5b6711a GIT binary patch literal 2108 zcmeHGO;6iE5M4K)4FO^WBm_uZnM+$W_S(ToY>}c66Ez1{6-8>V#$JdO?6qvCFzu{6Zfk93GUjE0Bxvxt;9%{X2$d0%+9`zKgZ`_WjC@90qFN1gCe-H_&Z>= zkvTj849L>-769>iMjV8prwW1_@PEN=TL+=|r5@f;i)FmjIFK#kg5O0H5rNediI zOTuBB>m*&_YyAc65+6f_7i%U$b=XvRrJ*3B)jTwxKnY2*fa(Hj)Fh1Jk#?&?YWS z7>xrm3fmkV_Tm(dH>I7qu4{$5{`XSHNp_IZ2H_sQns+8~uz%uVVGjpn6;R?%#Y=;!{IN?l z?^AKdKfppNSzw*fN5sV6z&nu7X0y3$K9|ei&(m+Nn9mpI%B9j=sZ_3%Q>&C07AuPj zJ=DjH*>js<+ls~>>ru .menu-item { position: relative; display: flex; height: 100%; @@ -28,7 +28,11 @@ } a { - color: $black; + display: flex; + height: 100%; + align-items: center; + justify-content: center; + color: theme-color( 'primary' ); font-size: $font-size-base; @include hover-focus-active() { @@ -36,4 +40,23 @@ } } } + + .menu-item-has-children { + &::after { + color: theme-color( 'secondary' ); + } + } + + .sub-menu { + .menu-item a { + justify-content: flex-start; + border-bottom: 1px solid gray( 'concrete' ); + + @include hover-focus-active() { + background-color: theme-color( 'primary' ); + color: $white; + } + transition: 0.1s ease all; + } + } } diff --git a/htdocs/wp-content/themes/barbarendrecht/assets/scss/components/_zaak-card.scss b/htdocs/wp-content/themes/barbarendrecht/assets/scss/components/_zaak-card.scss new file mode 100644 index 00000000..ca098f58 --- /dev/null +++ b/htdocs/wp-content/themes/barbarendrecht/assets/scss/components/_zaak-card.scss @@ -0,0 +1,5 @@ +.zaak-card.active { + .zaak-card-arrow { + fill: theme-color( 'secondary' ) !important; + } +} diff --git a/htdocs/wp-content/themes/barbarendrecht/assets/scss/components/_zaak-header.scss b/htdocs/wp-content/themes/barbarendrecht/assets/scss/components/_zaak-header.scss new file mode 100644 index 00000000..caa5b11f --- /dev/null +++ b/htdocs/wp-content/themes/barbarendrecht/assets/scss/components/_zaak-header.scss @@ -0,0 +1,12 @@ +body .zaak-header { + border-radius: 0 0 0 20px; + background-color: theme-color( 'primary' ); + + &-image { + display: none; + } + + &-title { + border-radius: 0 0 10px; + } +} diff --git a/htdocs/wp-content/themes/barbarendrecht/assets/scss/generic/_typography.scss b/htdocs/wp-content/themes/barbarendrecht/assets/scss/generic/_typography.scss index 4a0f72c1..827058f4 100644 --- a/htdocs/wp-content/themes/barbarendrecht/assets/scss/generic/_typography.scss +++ b/htdocs/wp-content/themes/barbarendrecht/assets/scss/generic/_typography.scss @@ -1 +1,10 @@ @import url( 'https://fonts.googleapis.com/css2?family=Lato:wght@300;400;700&display=swap' ); + +h1, +h2, +h3, +h4, +h5, +h6 { + color: theme-color( 'primary' ); +} diff --git a/htdocs/wp-content/themes/barbarendrecht/assets/scss/settings/_colors.scss b/htdocs/wp-content/themes/barbarendrecht/assets/scss/settings/_colors.scss index 204d4ecb..797528e3 100644 --- a/htdocs/wp-content/themes/barbarendrecht/assets/scss/settings/_colors.scss +++ b/htdocs/wp-content/themes/barbarendrecht/assets/scss/settings/_colors.scss @@ -3,8 +3,8 @@ --------------------------------------------------------------*/ $theme-colors: ( - primary: #032d57, + primary: #002f5d, secondary: #e5754c, ); -$mijn-zaken-footer-bg-color: #032d57; +$mijn-zaken-footer-bg-color: #002f5d; diff --git a/htdocs/wp-content/themes/barbarendrecht/assets/scss/settings/_root.scss b/htdocs/wp-content/themes/barbarendrecht/assets/scss/settings/_root.scss index 1e661189..57226b05 100644 --- a/htdocs/wp-content/themes/barbarendrecht/assets/scss/settings/_root.scss +++ b/htdocs/wp-content/themes/barbarendrecht/assets/scss/settings/_root.scss @@ -5,4 +5,18 @@ --color-palette-black: #000; --layout-content-size: 800px; --layout-wide-size: #{map-get( $container-max-widths, 'xl' )}; + + /* -------------------------------------------------------------- + Overwrite CSS variables + -------------------------------------------------------------- */ + --zaak-tabs-link-active-border-color: #{theme-color( 'primary' )}; + --zaak-header-title-border-bottom: 2px solid #{theme-color( 'primary' )}; + --zaak-header-title-border-left: 2px solid #{theme-color( 'primary' )}; + + --primary-200: #{theme-color( 'primary' )}; + --primary-300: #{theme-color( 'primary' )}; +} + +.zaak-process-steps { + --zaak-process-steps-color-success: #{theme-color( 'primary' )} !important; } diff --git a/htdocs/wp-content/themes/barbarendrecht/assets/scss/style.scss b/htdocs/wp-content/themes/barbarendrecht/assets/scss/style.scss index b9630b9c..1a4c8d91 100644 --- a/htdocs/wp-content/themes/barbarendrecht/assets/scss/style.scss +++ b/htdocs/wp-content/themes/barbarendrecht/assets/scss/style.scss @@ -9,11 +9,18 @@ Parent theme --------------------------------------------------------------*/ @import '../../../owc-formulieren/assets/scss/style'; +@import 'settings/root'; /*-------------------------------------------------------------- Components --------------------------------------------------------------*/ @import 'components/navbar'; +@import 'components/zaak-card'; + +/*-------------------------------------------------------------- +Blocks +--------------------------------------------------------------*/ +@import 'blocks/personal-heading/shared'; /*-------------------------------------------------------------- Generic diff --git a/htdocs/wp-content/themes/owc-formulieren/assets/scss/layouts/_template-mijn-zaken.scss b/htdocs/wp-content/themes/owc-formulieren/assets/scss/layouts/_template-mijn-zaken.scss index fce7ccd8..511affea 100644 --- a/htdocs/wp-content/themes/owc-formulieren/assets/scss/layouts/_template-mijn-zaken.scss +++ b/htdocs/wp-content/themes/owc-formulieren/assets/scss/layouts/_template-mijn-zaken.scss @@ -5,7 +5,10 @@ display: flex; min-height: 100vh; flex-direction: column; - background-color: var( --color-palette-white ); + background-color: var( + --openpdd-mijn-zaken-background-color, + var( --color-palette-white ) + ); .footer { margin-top: auto; diff --git a/htdocs/wp-content/themes/owc-formulieren/templates/mijn-zaken/home/login-digid.php b/htdocs/wp-content/themes/owc-formulieren/templates/mijn-zaken/home/login-digid.php index afabb4db..a51be7d5 100644 --- a/htdocs/wp-content/themes/owc-formulieren/templates/mijn-zaken/home/login-digid.php +++ b/htdocs/wp-content/themes/owc-formulieren/templates/mijn-zaken/home/login-digid.php @@ -6,13 +6,13 @@
-
+

Inloggen als persoon

Met DigiD
- is_registered('owc-signicat-openid/openid')) : ?> + is_registered('owc-signicat-openid/openid')) : ?> '); ?> diff --git a/htdocs/wp-content/themes/owc-formulieren/templates/mijn-zaken/home/login-eherkenning.php b/htdocs/wp-content/themes/owc-formulieren/templates/mijn-zaken/home/login-eherkenning.php index 08e8ab8d..13e66f30 100644 --- a/htdocs/wp-content/themes/owc-formulieren/templates/mijn-zaken/home/login-eherkenning.php +++ b/htdocs/wp-content/themes/owc-formulieren/templates/mijn-zaken/home/login-eherkenning.php @@ -5,13 +5,13 @@
-
+

Inloggen als organisatie

Met eHerkenning
- is_registered('owc-signicat-openid/openid')) : ?> + is_registered('owc-signicat-openid/openid')) : ?> '); ?> diff --git a/htdocs/wp-content/themes/owc-formulieren/templates/mijn-zaken/home/login-eidas.php b/htdocs/wp-content/themes/owc-formulieren/templates/mijn-zaken/home/login-eidas.php index f339b08c..ccc5b0ac 100644 --- a/htdocs/wp-content/themes/owc-formulieren/templates/mijn-zaken/home/login-eidas.php +++ b/htdocs/wp-content/themes/owc-formulieren/templates/mijn-zaken/home/login-eidas.php @@ -5,7 +5,7 @@
-
+
diff --git a/htdocs/wp-content/themes/owc-formulieren/templates/template-single-zaak.php b/htdocs/wp-content/themes/owc-formulieren/templates/template-single-zaak.php index bc2a8f7e..169285c3 100644 --- a/htdocs/wp-content/themes/owc-formulieren/templates/template-single-zaak.php +++ b/htdocs/wp-content/themes/owc-formulieren/templates/template-single-zaak.php @@ -15,7 +15,7 @@
- " alt="" class="zaak-header-image" /> +

title(); ?>

From b002bdc0f79678d7980d592e1eabf66892669cd1 Mon Sep 17 00:00:00 2001 From: YvetteNikolov Date: Thu, 24 Jul 2025 09:21:51 +0200 Subject: [PATCH 2/3] (feat): add has_wide_editing to home config --- .../themes/barbarendrecht/config/home.php | 1 + .../assets/scss/components/_navbar.scss | 8 --- .../themes/hoekschewaard/config/home.php | 1 + .../templates/template-mijn-zaken-home.php | 57 ------------------- .../themes/owc-formulieren/config/home.php | 1 + .../templates/template-mijn-zaken-home.php | 20 ++++++- 6 files changed, 20 insertions(+), 68 deletions(-) delete mode 100644 htdocs/wp-content/themes/hoekschewaard/templates/template-mijn-zaken-home.php diff --git a/htdocs/wp-content/themes/barbarendrecht/config/home.php b/htdocs/wp-content/themes/barbarendrecht/config/home.php index 219a29ce..924bba7e 100644 --- a/htdocs/wp-content/themes/barbarendrecht/config/home.php +++ b/htdocs/wp-content/themes/barbarendrecht/config/home.php @@ -7,4 +7,5 @@ 'eherkenning_provider' => 'owc-signicat-openid', 'eidas_is_active' => true, 'eidas_provider' => 'owc-signicat-openid', + 'has_wide_editing' => true, ]; diff --git a/htdocs/wp-content/themes/hoekschewaard/assets/scss/components/_navbar.scss b/htdocs/wp-content/themes/hoekschewaard/assets/scss/components/_navbar.scss index 937c2420..f67283c2 100644 --- a/htdocs/wp-content/themes/hoekschewaard/assets/scss/components/_navbar.scss +++ b/htdocs/wp-content/themes/hoekschewaard/assets/scss/components/_navbar.scss @@ -43,14 +43,6 @@ } } - .menu-item-has-children > a { - &::after { - @include fontawesome( '\f078' ); - margin-left: 0.5rem; - font-size: 0.8rem; - } - } - .sub-menu { min-width: 25rem; border-bottom: 5px solid theme-color( 'primary' ); diff --git a/htdocs/wp-content/themes/hoekschewaard/config/home.php b/htdocs/wp-content/themes/hoekschewaard/config/home.php index 006487bb..90862d18 100644 --- a/htdocs/wp-content/themes/hoekschewaard/config/home.php +++ b/htdocs/wp-content/themes/hoekschewaard/config/home.php @@ -7,4 +7,5 @@ 'eherkenning_provider' => 'owc-signicat-openid', 'eidas_is_active' => false, 'eidas_provider' => 'owc-signicat-openid', + 'has_wide_editing' => true, ]; diff --git a/htdocs/wp-content/themes/hoekschewaard/templates/template-mijn-zaken-home.php b/htdocs/wp-content/themes/hoekschewaard/templates/template-mijn-zaken-home.php deleted file mode 100644 index b9d7cea3..00000000 --- a/htdocs/wp-content/themes/hoekschewaard/templates/template-mijn-zaken-home.php +++ /dev/null @@ -1,57 +0,0 @@ - -
-
-

- -

Inloggen

- -
- $home_config['digid_is_active'], - 'digid_provider' => $home_config['digid_provider'], - ]); ?> - $home_config['eherkenning_is_active'], - 'eherkenning_provider' => $home_config['eherkenning_provider'], - ]); ?> - $home_config['eidas_is_active'], - 'eidas_provider' => $home_config['eidas_provider'], - ]); ?> -
-
- -
-
-
-
-
-
-

Dit vindt u in MijnHW:

-
    -
  • Uw lopende en afgeronde zaken
    • -
  • Uw persoonlijke berichten van de gemeente
    • -
  • Uw gegevens en voorkeuren
    • -
  • Nieuws en evenementen bij u in de buurt
    • -
-
-
-
- -
- - - 'w-100 h-400px object-fit-cover']); ?> - -
- 'owc-signicat-openid', 'eidas_is_active' => true, 'eidas_provider' => 'owc-signicat-openid', + 'has_wide_editing' => false, ]; diff --git a/htdocs/wp-content/themes/owc-formulieren/templates/template-mijn-zaken-home.php b/htdocs/wp-content/themes/owc-formulieren/templates/template-mijn-zaken-home.php index 6ac18125..e5186c05 100644 --- a/htdocs/wp-content/themes/owc-formulieren/templates/template-mijn-zaken-home.php +++ b/htdocs/wp-content/themes/owc-formulieren/templates/template-mijn-zaken-home.php @@ -27,19 +27,33 @@ 'eidas_provider' => $home_config['eidas_provider'], ]); ?>
+ +
+ +
+
- + +

Dit vindt u in de Mijn-omgeving:

+
    +
  • Uw lopende en afgeronde zaken
    • +
  • Uw persoonlijke berichten van de gemeente
    • +
  • Uw gegevens en voorkeuren
    • +
  • Nieuws en evenementen bij u in de buurt
    • +
+ + +
-
- + 'w-100 h-400px object-fit-cover']); ?> From 58ebca006b730cab3ba0173ea8245d7e9c0735e7 Mon Sep 17 00:00:00 2001 From: YvetteNikolov Date: Thu, 24 Jul 2025 10:07:59 +0200 Subject: [PATCH 3/3] (feat): style owc openkaarten components to theme primary variables --- .../assets/scss/components/_openkaarten.scss | 46 +++++++++++++++++++ .../assets/scss/settings/_root.scss | 5 ++ .../owc-formulieren/assets/scss/style.scss | 1 + 3 files changed, 52 insertions(+) create mode 100644 htdocs/wp-content/themes/owc-formulieren/assets/scss/components/_openkaarten.scss diff --git a/htdocs/wp-content/themes/owc-formulieren/assets/scss/components/_openkaarten.scss b/htdocs/wp-content/themes/owc-formulieren/assets/scss/components/_openkaarten.scss new file mode 100644 index 00000000..74e0d0de --- /dev/null +++ b/htdocs/wp-content/themes/owc-formulieren/assets/scss/components/_openkaarten.scss @@ -0,0 +1,46 @@ +div#owc-openkaarten-streetmap { + --owc-filters-primary: var( --openkaarten-primary-color ); + --search-primary-color: var( --openkaarten-primary-color ); + --owc-openkaarten-streetmap--close-btn-color: var( + --openkaarten-primary-color + ); + --button-color: var( --openkaarten-primary-color ); + --owc-openkaarten-streetmap--primary-color: var( + --openkaarten-primary-color + ); +} + +.owc-openkaarten-streetmap__tooltip-card__button { + &:hover { + color: var( --open-kaarten-button-hover-color, #fff ); + text-decoration: none; + } +} + +// Overwrite all SVG's in the OWC Openkaarten Streetmap plugin +.leaflet-control-filters, +.owc-openkaarten-streetmap__tooltip-card__close-btn { + svg path { + fill: var( --openkaarten-primary-color ); + } +} + +.leaflet-control-list-view { + svg g { + stroke: var( --openkaarten-primary-color ); + } +} + +// List view overwrites +.list-view .list-view__controls button:not( [class*='search'] ) { + border: 1px solid var( --openkaarten-primary-color ); + + svg path { + fill: var( --openkaarten-primary-color ); + } + + .leaflet-control-map-view__control-text, + span { + color: var( --openkaarten-primary-color ); + } +} diff --git a/htdocs/wp-content/themes/owc-formulieren/assets/scss/settings/_root.scss b/htdocs/wp-content/themes/owc-formulieren/assets/scss/settings/_root.scss index 280259a2..fe054f7c 100644 --- a/htdocs/wp-content/themes/owc-formulieren/assets/scss/settings/_root.scss +++ b/htdocs/wp-content/themes/owc-formulieren/assets/scss/settings/_root.scss @@ -16,4 +16,9 @@ -------------------------------------------------------------- */ --denhaag-sidenav-link-hover-color: #{theme-color( 'primary' )}; --denhaag-sidenav-link-active-color: #{theme-color( 'primary' )}; + + /* -------------------------------------------------------------- + Open Kaarten + -------------------------------------------------------------- */ + --openkaarten-primary-color: #{theme-color( 'primary' )}; } diff --git a/htdocs/wp-content/themes/owc-formulieren/assets/scss/style.scss b/htdocs/wp-content/themes/owc-formulieren/assets/scss/style.scss index dbb2b0aa..6e959a6b 100644 --- a/htdocs/wp-content/themes/owc-formulieren/assets/scss/style.scss +++ b/htdocs/wp-content/themes/owc-formulieren/assets/scss/style.scss @@ -35,6 +35,7 @@ @import 'components/gravityforms-legacy'; @import 'components/gravityforms-theme'; @import 'components/navbar'; +@import 'components/openkaarten'; @import 'components/progress-bar'; @import 'components/sidebar'; @import 'components/site-branding';