Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

BC: Fixed navigation menu when 'Dropdown type is set to 'None'. #94

Merged
merged 1 commit into from
Mar 7, 2024
Merged

BC: Fixed navigation menu when 'Dropdown type is set to 'None'. #94

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
24 changes: 24 additions & 0 deletions components/00-base/_variables.components.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -965,6 +965,18 @@ $ct-navigation-drawer-top-offset: ct-spacing(2) !default;
$ct-navigation-drawer-column-gutter: ct-spacing(4) !default;

// Colors.
$ct-navigation-light-menu-border-color: ct-color-light('interaction-background') !default;
$ct-navigation-light-menu-color: ct-color-light('interaction-background') !default;
$ct-navigation-light-menu-hover-color: ct-color-light('interaction-hover-background') !default;
$ct-navigation-light-menu-active-color: ct-color-light('interaction-hover-background') !default;
$ct-navigation-light-menu-item-background-color: transparent !default;
$ct-navigation-light-menu-item-border-color: transparent !default;
$ct-navigation-light-menu-item-hover-background-color: transparent !default;
$ct-navigation-light-menu-item-hover-border-color: ct-color-light('interaction-hover-background') !default;
$ct-navigation-light-menu-item-active-background-color: transparent !default;
$ct-navigation-light-menu-item-active-border-color: ct-color-light('highlight') !default;
$ct-navigation-light-menu-item-active-trail-background-color: ct-color-light('interaction-background') !default;
$ct-navigation-light-menu-item-active-trail-color: ct-color-light('background') !default;
$ct-navigation-light-drawer-border-color: ct-color-light('interaction-background') !default;
$ct-navigation-light-drawer-color: ct-color-light('interaction-background') !default;
$ct-navigation-light-drawer-hover-color: ct-color-light('interaction-hover-background') !default;
Expand All @@ -987,6 +999,18 @@ $ct-navigation-light-drawer-sub-menu-item-hover-background-color: ct-color-light
$ct-navigation-light-drawer-sub-menu-item-hover-color: ct-color-light('interaction-hover-text') !default;
$ct-navigation-light-drawer-sub-menu-item-active-background-color: ct-color-light('body') !default;
$ct-navigation-light-drawer-sub-menu-item-active-color: ct-color-light('background') !default;
$ct-navigation-dark-menu-border-color: ct-color-dark('interaction-background') !default;
$ct-navigation-dark-menu-color: ct-color-dark('interaction-background') !default;
$ct-navigation-dark-menu-hover-color: ct-color-dark('interaction-hover-background') !default;
$ct-navigation-dark-menu-active-color: ct-color-dark('interaction-hover-background') !default;
$ct-navigation-dark-menu-item-background-color: transparent !default;
$ct-navigation-dark-menu-item-border-color: transparent !default;
$ct-navigation-dark-menu-item-hover-background-color: transparent !default;
$ct-navigation-dark-menu-item-hover-border-color: ct-color-dark('interaction-hover-background') !default;
$ct-navigation-dark-menu-item-active-background-color: transparent !default;
$ct-navigation-dark-menu-item-active-border-color: ct-color-dark('highlight') !default;
$ct-navigation-dark-menu-item-active-trail-background-color: ct-color-dark('interaction-background') !default;
$ct-navigation-dark-menu-item-active-trail-color: ct-color-dark('background') !default;
$ct-navigation-dark-drawer-border-color: ct-color-dark('interaction-background') !default;
$ct-navigation-dark-drawer-color: ct-color-dark('interaction-background') !default;
$ct-navigation-dark-drawer-hover-color: ct-color-dark('interaction-hover-background') !default;
Expand Down
73 changes: 67 additions & 6 deletions components/03-organisms/navigation/navigation.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,14 @@

&#{$root}--none {
#{$root}__items {
display: none;
align-items: center;
height: 100%;

@include ct-breakpoint($ct-navigation-breakpoint) {
display: flex;
}

#{$root}__menu {
&.ct-menu,
.ct-menu {
Expand All @@ -28,17 +36,70 @@
margin: 0;
}

.ct-menu__sub-menu {
margin-top: ct-spacing(2);
// First-level items to be displayed inline.
&.ct-menu--level-0 {
display: flex;
}

.ct-menu__item {
margin-bottom: ct-spacing(2);
margin-left: ct-spacing(2);
// Links - level 0.
&--level-0 {
border-bottom: solid ct-particle(0.5);

> .ct-link {
display: block;
padding: ct-spacing(2);
text-align: center;

&::after {
right: ct-spacing();
margin-top: -1 * ct-particle(0.25);
top: ct-spacing(2);
}
}
}
}
}
}

@include ct-component-theme($root) using($root, $theme) {
#{$root}__items {
.ct-menu__item {
// Links - level 0.
&--level-0 {
border-bottom-color: ct-component-var($root, $theme, menu-item, border-color);

&:hover {
@include ct-component-property($root, $theme, menu-item, hover, background-color);

border-bottom-color: ct-component-var($root, $theme, menu-item, hover, border-color);
}

&:active {
@include ct-component-property($root, $theme, menu-item, active, background-color);

&.ct-menu > .ct-menu__item {
margin-left: 0;
border-bottom-color: ct-component-var($root, $theme, menu-item, active, border-color);
}

&.ct-menu__item--active-trail {
border-bottom-color: ct-component-var($root, $theme, menu, border-color);
}

> .ct-link {
@include ct-component-property($root, $theme, menu-item, background-color);
@include ct-component-property($root, $theme, menu, color);

&:hover {
@include ct-component-property($root, $theme, menu-item, hover, background-color);
@include ct-component-property($root, $theme, menu, hover, color);
}

&:active {
@include ct-component-property($root, $theme, menu-item, active, background-color);
@include ct-component-property($root, $theme, menu, active, color);
}
}
}
}
}
}
Expand Down
7 changes: 7 additions & 0 deletions components/03-organisms/navigation/navigation.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,13 @@
{% endif %}
{% endif %}
{% endfor %}
{% else %}
{% for key in items|keys %}
{% if items[key].below %}
{% set items_without_below = items[key]|merge({ 'below': null }) %}
{% set items = items|merge({(key): items_without_below}) %}
{% endif %}
{% endfor %}
{% endif %}

<div class="ct-navigation {{ modifier_class }}" {% if attributes is not empty %}{{ attributes|raw }}{% endif %}>
Expand Down
Loading