Skip to content

Commit 8e35c0f

Browse files
[DURACOM-195] add background on mouse over to dropdown user menu items
1 parent bff93a0 commit 8e35c0f

5 files changed

Lines changed: 47 additions & 37 deletions

File tree

src/app/shared/auth-nav-menu/auth-nav-menu.component.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,9 @@
2929
[attr.data-test]="'user-menu' | dsBrowserOnly"
3030
ngbDropdownToggle>
3131
<i class="fas fa-user-circle fa-lg fa-fw"></i></a>
32-
<ul id="logoutDropdownMenu" class="p-3" ngbDropdownMenu role="presentation">
33-
<ds-themed-user-menu></ds-themed-user-menu>
34-
</ul>
32+
<div id="logoutDropdownMenu" ngbDropdownMenu>
33+
<ds-themed-user-menu [inExpandableNavbar]="false"></ds-themed-user-menu>
34+
</div>
3535
</div>
3636
</div>
3737
</div>

src/app/shared/auth-nav-menu/user-menu/user-menu.component.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<ds-themed-loading *ngIf="(loading$ | async)"></ds-themed-loading>
22
<ul *ngIf="!(loading$ | async)" class="user-menu" role="menu"
3-
[ngClass]="{ 'pb-2 mb-2 border-bottom' : inExpandableNavbar }"
3+
[ngClass]="inExpandableNavbar ? 'user-menu-mobile pb-2 mb-2 border-bottom' : 'user-menu-dropdown'"
44
[attr.aria-label]="'nav.user-profile-menu-and-logout' |translate" id="user-menu-dropdown">
55
<li class="ds-menu-item-wrapper username-email-wrapper" role="presentation">
66
{{dsoNameService.getName(user$ | async)}}<br>

src/app/shared/auth-nav-menu/user-menu/user-menu.component.scss

Lines changed: 37 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,43 @@
33
list-style: none;
44
margin: 0;
55
padding: 0;
6-
}
76

8-
.ds-menu-item {
9-
display: inline-block;
10-
padding: var(--ds-user-menu-item-vertical-padding) var(--ds-user-menu-item-horizontal-padding);
7+
&.user-menu-dropdown {
8+
.ds-menu-item-wrapper {
9+
a.ds-menu-item, &.username-email-wrapper {
10+
padding: var(--ds-user-menu-item-vertical-padding) var(--ds-user-menu-dropdown-padding);
11+
}
12+
13+
a.ds-menu-item {
14+
display: block;
15+
color: var(--ds-expandable-navbar-link-color);
16+
&:hover {
17+
color: var(--ds-expandable-navbar-link-color-hover);
18+
background-color: var(--ds-user-menu-dropdown-link-background-hover);
19+
}
20+
}
21+
}
22+
}
23+
24+
&.user-menu-mobile {
25+
.ds-menu-item-wrapper {
26+
padding-top: var(--ds-user-menu-item-vertical-padding);
27+
padding-bottom: var(--ds-user-menu-item-vertical-padding);
28+
}
29+
30+
.ds-menu-item {
31+
display: inline-block;
32+
}
33+
34+
.ds-menu-item, .ds-menu-toggler-wrapper {
35+
color: var(--ds-expandable-navbar-link-color) !important;
36+
37+
&:hover, &:focus {
38+
color: var(--ds-expandable-navbar-link-background-hover) !important;
39+
}
40+
}
41+
42+
}
1143
}
44+
1245
}

src/styles/_custom_variables.scss

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -36,13 +36,14 @@
3636
--ds-header-navbar-border-bottom-color: #{$ds-header-navbar-border-bottom-color};
3737

3838
--ds-expandable-navbar-bg: #{$ds-expandable-navbar-bg};
39-
--ds-expandable-navbar-link-color: #{$ds-navbar-link-color};
40-
--ds-expandable-navbar-link-color-hover: #{$ds-navbar-link-color-hover};
41-
--ds-expandable-navbar-dropdown-item-vertical-padding: 0.25rem;
42-
--ds-expandable-navbar-dropdown-item-horizontal-padding: 0;
39+
--ds-expandable-navbar-link-color: #{$body-color};
40+
--ds-expandable-navbar-link-color-hover: #{$body-color};
41+
--ds-expandable-navbar-link-background-hover: #{$ds-navbar-link-color-hover};
4342

4443
--ds-user-menu-item-vertical-padding: 0.25rem;
45-
--ds-user-menu-item-horizontal-padding: 0;
44+
--ds-user-menu-dropdown-padding: 1rem;
45+
--ds-user-menu-dropdown-link-color: #{$dark};
46+
--ds-user-menu-dropdown-link-background-hover: #{$gray-200};
4647

4748
@include media-breakpoint-up(md) {
4849
--ds-header-logo-height: 50px;

src/themes/dspace/app/header-nav-wrapper/header-navbar-wrapper.component.scss

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -69,30 +69,6 @@
6969
border-top: var(--ds-expandable-navbar-border-top-style);
7070
padding-top: var(--ds-expandable-navbar-padding-top);
7171

72-
::ng-deep {
73-
74-
/* mobile menu */
75-
76-
.ds-menu-item {
77-
padding: var(--ds-expandable-navbar-dropdown-item-vertical-padding) var(--ds-expandable-navbar-dropdown-item-horizontal-padding);
78-
}
79-
80-
.ds-menu-item, .ds-menu-toggler-wrapper {
81-
color: var(--ds-expandable-navbar-link-color) !important;
82-
83-
&:hover, &:focus {
84-
color: var(--ds-expandable-navbar-link-color-hover) !important;
85-
}
86-
}
87-
88-
/* mobile submenu */
89-
90-
//.dropdown-menu {
91-
// .ds-menu-item {
92-
// }
93-
//}
94-
95-
}
9672
}
9773
}
9874
}

0 commit comments

Comments
 (0)