Skip to content

Commit 90516b3

Browse files
tischsoicclaude
andauthored
IBX-11909: new main menu design (#1944)
Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
1 parent 9b0a81c commit 90516b3

19 files changed

Lines changed: 780 additions & 702 deletions

src/bundle/Resources/public/js/scripts/helpers/tooltips.helper.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -260,7 +260,9 @@ const hideAll = (baseElement = doc) => {
260260
const tooltipsNode = baseElement.querySelectorAll(TOOLTIPS_SELECTOR);
261261

262262
for (const tooltipNode of tooltipsNode) {
263-
bootstrap.Tooltip.getOrCreateInstance(tooltipNode).hide();
263+
const tooltipInstance = bootstrap.Tooltip.getInstance(tooltipNode);
264+
265+
tooltipInstance?.hide();
264266
}
265267
};
266268
const observe = (baseElement = doc) => {

src/bundle/Resources/public/js/scripts/sidebar/main.menu.js

Lines changed: 186 additions & 179 deletions
Large diffs are not rendered by default.

src/bundle/Resources/public/scss/_custom-tooltip.scss

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
@use '@ibexa-admin-ui/src/bundle/Resources/public/scss/custom.scss' as *;
22
@use '@ibexa-admin-ui/src/bundle/Resources/public/scss/functions/calculate.rem' as *;
33
@use '@ibexa-admin-ui/src/bundle/Resources/public/scss/mixins/tooltips' as *;
4+
@use '@ibexa-admin-ui-assets/src/bundle/Resources/public/vendors/ids-assets/dist/scss/variables/colors' as *;
5+
@use '@ibexa-admin-ui-assets/src/bundle/Resources/public/vendors/ids-assets/dist/scss/variables/typography' as *;
46
@use 'sass:color';
57

68
.ibexa-tooltip {
@@ -61,7 +63,7 @@
6163
border-radius: $ibexa-border-radius-small;
6264
background-color: $ibexa-color-white;
6365
color: $ibexa-color-dark;
64-
font-size: $ibexa-text-font-size;
66+
font-size: $text-font-size-m;
6567
text-align: left;
6668
line-height: calculateRem(21px);
6769
box-shadow: 0 calculateRem(4px) calculateRem(6px) rgba(135, 135, 135, 0.35);
@@ -76,7 +78,7 @@
7678
}
7779

7880
&--navigation {
79-
@include tooltip-variant($ibexa-color-dark, $ibexa-color-complementary-primary-400);
81+
@include tooltip-variant($color-neutral-10, $color-primary-80);
8082

8183
.ibexa-tooltip {
8284
&__inner {

src/bundle/Resources/public/scss/_main-menu-popup.scss

Lines changed: 37 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,33 @@
22
@use '@ibexa-admin-ui/src/bundle/Resources/public/scss/functions/calculate.rem' as *;
33

44
.ibexa-main-menu-popup {
5+
background-color: $ibexa-color-dark;
6+
border-color: $ibexa-color-dark-500;
7+
8+
&__item-content {
9+
color: $ibexa-color-white;
10+
padding: calculateRem(7.5px) calculateRem(12px);
11+
12+
> .ibexa-main-menu__item-text-column {
13+
padding: 0;
14+
}
15+
16+
&:hover {
17+
color: $ibexa-color-complementary-primary-400;
18+
background-color: transparent;
19+
}
20+
21+
&--current {
22+
> .ibexa-main-menu__item-text-column {
23+
color: $ibexa-color-complementary-primary-400;
24+
}
25+
}
26+
}
27+
528
&__group-item {
629
flex-direction: column;
730
height: 100%;
831
align-items: initial;
9-
border-top: calculateRem(1px) solid $ibexa-color-info-800;
1032

1133
.ibexa-popup-menu {
1234
&__item {
@@ -15,14 +37,25 @@
1537
}
1638
}
1739

18-
.ibexa-main-menu-popup &__group-name {
19-
color: $ibexa-color-light-700;
40+
&__group-item-content {
41+
color: $ibexa-color-dark-300;
42+
padding: 0;
43+
}
44+
45+
&__group-name {
46+
border-top: calculateRem(1px) solid $ibexa-color-dark-500;
47+
color: $ibexa-color-dark-500;
2048
font-size: $ibexa-text-font-size-small;
2149
cursor: initial;
50+
padding: calculateRem(1px) 0;
51+
margin-left: calculateRem(12px);
52+
margin-top: calculateRem(8px);
53+
border-radius: 0;
54+
width: initial;
2255

2356
&:hover {
2457
background-color: initial;
25-
color: $ibexa-color-light-700;
58+
color: $ibexa-color-dark-500;
2659
}
2760
}
2861
}

0 commit comments

Comments
 (0)