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 00000000..93f5fd7d Binary files /dev/null and b/htdocs/wp-content/themes/barbarendrecht/assets/img/zaak-header.jpg differ diff --git a/htdocs/wp-content/themes/barbarendrecht/assets/scss/blocks/personal-heading/_shared.scss b/htdocs/wp-content/themes/barbarendrecht/assets/scss/blocks/personal-heading/_shared.scss new file mode 100644 index 00000000..56335ca5 --- /dev/null +++ b/htdocs/wp-content/themes/barbarendrecht/assets/scss/blocks/personal-heading/_shared.scss @@ -0,0 +1,17 @@ +.openpdd-personal-heading { + background-image: none !important; + + &__image-wrapper { + overflow: hidden; + margin-bottom: 1rem; + mask-image: none !important; + + @include media-breakpoint-up( sm ) { + border-radius: 0 0 0 30px; + } + + @include media-breakpoint-up( xl ) { + margin-left: 1rem; + } + } +} diff --git a/htdocs/wp-content/themes/barbarendrecht/assets/scss/components/_navbar.scss b/htdocs/wp-content/themes/barbarendrecht/assets/scss/components/_navbar.scss index 094177df..5c6773ba 100644 --- a/htdocs/wp-content/themes/barbarendrecht/assets/scss/components/_navbar.scss +++ b/htdocs/wp-content/themes/barbarendrecht/assets/scss/components/_navbar.scss @@ -1,5 +1,5 @@ .navbar { - .menu-item { + .navbar-menu-list > .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/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/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-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']); ?> 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(); ?>