Skip to content

Commit a4c9578

Browse files
authored
VSB-TUO/UI customization next fixes (v7.6.5) (#951)
* Added UI first changes to v7.6.5 * Fixed compiler errors * Fixed double navbar * Fixed navbar visibility * mobile display header fix * fixed toggle nav menu item display * fixed missing logout && auth-nav-menu button * fixed login/logout expandable container style * fixed styles of header elements * Nav logo by language, backup font-family by design manual * Fixed colors of expandable nav menu * Added padding to navbar buttons
1 parent cf40dca commit a4c9578

9 files changed

Lines changed: 21 additions & 13 deletions

File tree

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
.ds-menu-item-wrapper {
99
a.ds-menu-item, &.username-email-wrapper {
1010
padding: var(--ds-user-menu-item-vertical-padding) var(--ds-user-menu-dropdown-padding);
11+
text-decoration: none;
1112
}
1213

1314
a.ds-menu-item {
@@ -17,6 +18,10 @@
1718
color: var(--ds-expandable-navbar-link-color-hover);
1819
background-color: var(--ds-user-menu-dropdown-link-background-hover);
1920
}
21+
&:active, &:focus {
22+
color: white;
23+
background-color: var(--ds-expandable-navbar-bg);
24+
}
2025
}
2126
}
2227
}
-168 Bytes
Binary file not shown.

src/themes/custom/app/navbar/expandable-navbar-section/expandable-navbar-section.component.scss

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,18 +6,20 @@
66
}
77

88
.dropdown-menu {
9-
background-color: var(--ds-expandable-navbar-bg);
9+
background-color: #fff;
1010
overflow: hidden;
1111
min-width: 100%;
1212
border-top-left-radius: 0;
1313
border-top-right-radius: 0;
14-
::ng-deep a.nav-link {
14+
15+
::ng-deep a.ds-menu-item {
1516
color: var(--lt-vsb-tuo-cyan) !important;
1617
padding-right: var(--bs-spacer);
1718
padding-left: var(--bs-spacer);
1819
white-space: nowrap;
1920

20-
&:hover, &:focus {
21+
&:hover,
22+
&:focus {
2123
color: white !important;
2224
text-decoration: none;
2325
background-color: var(--lt-vsb-tuo-cyan);
@@ -40,8 +42,8 @@
4042
margin-top: calc(var(--bs-spacer) / 2);
4143
}
4244
}
45+
4346
.dropdown-menu {
4447
border: 0;
45-
4648
}
4749
}

src/themes/custom/app/navbar/navbar.component.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<!-- TODO remove navbar-container class when https://github.com/twbs/bootstrap/issues/24726 is fixed -->
66
<div class="navbar-inner-container w-100 h-100" [class.container]="!(isMobile$ | async)">
77
<a class="navbar-brand my-2" routerLink="/home">
8-
<img src="assets/images/vsb-cs-logo-w.svg" [attr.alt]="'menu.header.image.logo' | translate" />
8+
<img [src]="logoSrc" [attr.alt]="'menu.header.image.logo' | translate" />
99
</a>
1010

1111
<div class="w-100 h-100">
@@ -22,7 +22,7 @@
2222
</div>
2323
</div>
2424
</div>
25-
<div class="navbar-buttons d-flex align-items-center gapx-1">
25+
<div class="navbar-buttons d-flex align-items-center gapx-2">
2626
<ds-themed-search-navbar class="navbar-collapsed"></ds-themed-search-navbar>
2727
<ds-themed-lang-switch class="navbar-collapsed"></ds-themed-lang-switch>
2828
<ds-context-help-toggle class="navbar-collapsed"></ds-context-help-toggle>

src/themes/custom/app/navbar/navbar.component.scss

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@ a.navbar-brand img {
5858
width: 100%;
5959
padding: .5rem 1rem;
6060
color: white;
61+
text-decoration: none;
6162

6263
&:hover, &:focus {
6364
background-color: white;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
ngbDropdownToggle>
3737
<i class="fas fa-user-circle fa-lg fa-fw"></i></button>
3838
<div id="logoutDropdownMenu" ngbDropdownMenu>
39-
<ds-user-menu [inExpandableNavbar]="false"></ds-user-menu>
39+
<ds-themed-user-menu [inExpandableNavbar]="false"></ds-themed-user-menu>
4040
</div>
4141
</div>
4242
</div>

src/themes/custom/app/shared/auth-nav-menu/auth-nav-menu.component.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
.loginDropdownMenu, .logoutDropdownMenu {
1+
#loginDropdownMenu, #logoutDropdownMenu {
22
min-width: 330px;
33
z-index: 1002;
44
}

src/themes/custom/styles/_custom_variables.scss

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,13 +29,13 @@
2929
--ds-header-bg: var(--lt-vsb-tuo-cyan);
3030
--ds-header-logo-height: 50px;
3131
--ds-header-logo-height-xs: 50px;
32-
--ds-header-icon-color: #{$link-color};
33-
--ds-header-icon-color-hover: #{$link-hover-color};
32+
--ds-header-icon-color: var(--lt-vsb-tuo-cyan-hover);
33+
--ds-header-icon-color-hover: darken(var(--lt-vsb-tuo-cyan-hover), 15%);
3434
--ds-navbar-bg: var(--ds-header-bg);
3535
--ds-header-navbar-border-top-color: #{$white};
3636
--ds-header-navbar-border-bottom-color: #{$gray-400};
37-
--ds-navbar-link-color: #fff;
38-
--ds-navbar-link-color-hover: darken(#fff, 15%);
37+
--ds-navbar-link-color: var(--lt-vsb-tuo-cyan);
38+
--ds-navbar-link-color-hover: var(--lt-vsb-tuo-cyan-hover);
3939
--ds-expandable-navbar-bg: var(--ds-navbar-bg);
4040
--ds-expandable-navbar-link-color: var(--ds-navbar-link-color);
4141
--ds-expandable-navbar-link-color-hover: var(--ds-navbar-link-color-hover);

src/themes/custom/styles/_theme_sass_variable_overrides.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
@import '../assets/fonts/drive.scss';
77

8-
$font-family-sans-serif: "Drive", -apple-system, BlinkMacSystemFont, "Segoe UI", "Roboto", "Helvetica Neue", Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol" !default;
8+
$font-family-sans-serif: "Drive", Calibri, -apple-system, BlinkMacSystemFont, "Segoe UI", "Roboto", "Helvetica Neue", Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol" !default;
99

1010
$navbar-dark-color: #FFFFFF;
1111

0 commit comments

Comments
 (0)