Unverified Commit b0e23271 authored by Lauri Timmanee's avatar Lauri Timmanee
Browse files

Issue #3173022 by anmolgoyal74, mherchel, andy-blum, vsujeetkumar, hinal05,... 

Issue #3173022 by anmolgoyal74, mherchel, andy-blum, vsujeetkumar, hinal05, kostyashupenko: Figure out a clean way to manage the style of Olivero's menu block in the sidebar region
parent 33ba4582

core/themes/olivero/css/components/sidebar.css→core/themes/olivero/css/components/navigation/menu-sidebar.css

+25 −21
Original line number Diff line number Diff line
@@ -7,34 +7,38 @@ 


/**

 * @file

 * Styles for sidebar region.

 * Styles for menu placed in sidebar region.

 */



.region--sidebar .menu {

.menu--sidebar {

  list-style: none

}



.menu--sidebar .menu {

    list-style: none;

  }



.region--sidebar .menu--level-1 {

.menu--sidebar .menu--level-1 {

    margin: 0;

  }



[dir="ltr"] .region--sidebar .menu__link {

    padding-left: 0;

[dir="ltr"] .menu--sidebar .menu__link {

    padding-left: 0

}



[dir="rtl"] .region--sidebar .menu__link {

    padding-right: 0;

[dir="rtl"] .menu--sidebar .menu__link {

    padding-right: 0

}



[dir="ltr"] .region--sidebar .menu__link {

    padding-right: 0;

[dir="ltr"] .menu--sidebar .menu__link {

    padding-right: 0

}



[dir="rtl"] .region--sidebar .menu__link {

    padding-left: 0;

[dir="rtl"] .menu--sidebar .menu__link {

    padding-left: 0

}



.region--sidebar .menu__link {

.menu--sidebar .menu__link {

    position: relative;

    display: block;

    padding-top: 0.84375rem;
@@ -45,15 +49,15 @@ 
    /* Bottom divider line. */

  }



[dir="ltr"] .region--sidebar .menu__link:after {

      left: 0;

[dir="ltr"] .menu--sidebar .menu__link:after {

      left: 0

}



[dir="rtl"] .region--sidebar .menu__link:after {

      right: 0;

[dir="rtl"] .menu--sidebar .menu__link:after {

      right: 0

}



.region--sidebar .menu__link:after {

.menu--sidebar .menu__link:after {

      position: absolute;

      bottom: 0;

      width: 4.5rem;
@@ -62,21 +66,21 @@ 
      border-top: solid 2px #e7edf1;

    }



.region--sidebar .menu__link--link {

.menu--sidebar .menu__link--link {

    text-decoration: none;

    color: #0d1214;

    font-weight: 600

  }



.region--sidebar .menu__link--link:hover {

.menu--sidebar .menu__link--link:hover {

      color: #2494db;

    }



.region--sidebar {

.menu--sidebar {



  /* No bottom divider line for last menu item. */

}



.region--sidebar .menu__item--level-1:last-child > .menu__link:last-child:after, .region--sidebar .menu__item--level-1:last-child > .menu__item--level-2:last-child > .menu__link:last-child:after {

.menu--sidebar .menu__item--level-1:last-child > .menu__link:last-child:after, .menu--sidebar .menu__item--level-1:last-child > .menu__item--level-2:last-child > .menu__link:last-child:after {

      content: none;

    }

core/themes/olivero/css/components/sidebar.pcss.css→core/themes/olivero/css/components/navigation/menu-sidebar.pcss.css

+5 −3
Original line number Diff line number Diff line 
/**

 * @file

 * Styles for sidebar region.

 * Styles for menu placed in sidebar region.

 */



@import "../base/variables.pcss.css";

@import "../../base/variables.pcss.css";



.menu--sidebar {

  list-style: none;



.region--sidebar {

  & .menu {

    list-style: none;

  }

core/themes/olivero/olivero.libraries.yml

+5 −2
Original line number Diff line number Diff line
@@ -134,10 +134,13 @@ messages: 
  js:

    js/messages.js: {}



sidebar:

menu-sidebar:

  css:

    component:

      css/components/sidebar.css: {}

      css/components/navigation/menu-sidebar.css: {}



sidebar:

  css:

    layout:

      css/layout/layout-sidebar.css: {}

core/themes/olivero/olivero.theme

+26 −17
Original line number Diff line number Diff line
@@ -120,29 +120,26 @@ function olivero_preprocess_block(&$variables) { 
      ->load($variables['elements']['#id']);

    if ($block) {

      $region = $block->getRegion();

      if ($region == 'primary_menu') {



      if ($variables['base_plugin_id'] === 'system_menu_block') {

        $variables['content']['#attributes']['region'] = $region;

        }

        elseif ($variables['base_plugin_id'] === 'search_form_block') {

          // Attaching library for search block if present at primary menu

          // region.

          $variables['#attached']['library'][] = 'olivero/search-narrow';

        if ($region === 'sidebar') {

          $variables['#attached']['library'][] = 'olivero/menu-sidebar';

        }

      }

      elseif ($region === 'secondary_menu' && $variables['base_plugin_id'] === 'system_menu_block') {

        $variables['content']['#attributes']['region'] = $region;



      if ($variables['base_plugin_id'] === 'search_form_block') {

        if ($region === 'primary_menu') {

          $variables['#attached']['library'][] = 'olivero/search-narrow';

          $variables['content']['actions']['submit']['#theme_wrappers'] = ['input__submit__header_search'];

        }

      elseif ($region === 'secondary_menu' && $variables['base_plugin_id'] === 'search_form_block') {

        // Attaching library for search block if present at secondary menu

        // region.

        elseif ($region === 'secondary_menu') {

          $variables['#attached']['library'][] = 'olivero/search-wide';

      }

      if ($variables['base_plugin_id'] === 'search_form_block' && in_array($region, ['primary_menu', 'secondary_menu'], TRUE)) {

          $variables['content']['actions']['submit']['#theme_wrappers'] = ['input__submit__header_search'];

        }

      }

    }

  }



  if ($variables['plugin_id'] === 'system_branding_block') {

    $site_branding_color = theme_get_setting('site_branding_bg_color');
@@ -166,6 +163,18 @@ function olivero_theme_suggestions_menu_alter(&$suggestions, array $variables) { 
  }

}



/**

 * Implements hook_preprocess_HOOK().

 */

function olivero_preprocess_menu(&$variables) {

  if (isset($variables['attributes']['region'])) {

    if ($variables['attributes']['region'] === 'sidebar') {

      $variables['attributes']['class'][] = 'menu--sidebar';

    }

    unset($variables['attributes']['region']);

  }

}



/**

 * Implements hook_theme_suggestions_HOOK_alter() for form templates.

 */