diff --git a/.gitignore b/.gitignore index a20cbc4fec..ada922f429 100644 --- a/.gitignore +++ b/.gitignore @@ -98,7 +98,6 @@ src/frontend/packages/core/sass/custom.scss src/frontend/packages/core/assets/eula.html src/frontend/packages/core/assets/logo.png src/frontend/packages/core/assets/nav-logo.png -src/frontend/packages/core/assets/nav-logo-icon.png src/frontend/packages/core/assets/login-bg.jpg src/frontend/packages/core/src/custom-import.module.ts src/frontend/packages/core/src/custom diff --git a/custom-src/frontend/sass/custom/suse.scss b/custom-src/frontend/sass/custom/suse.scss index fc6d4ed923..4fdaa4adc8 100644 --- a/custom-src/frontend/sass/custom/suse.scss +++ b/custom-src/frontend/sass/custom/suse.scss @@ -61,18 +61,20 @@ $suse-side-nav-active: #003358; // Use SUSE Blue Side Navigation .stratos { - + // This is themeable, we really don't need this. .side-nav__inner, .side-nav__top, .side-nav__item--active:hover { background-color: $suse-side-nav; } - + .side-nav__item--active, .side-nav__item:hover { background-color: $suse-side-nav-active; } - + .side-nav__top { + border-color: $suse-side-nav-active; + } .side-nav__bottom { color: $suse-text-gray; } diff --git a/src/frontend/packages/core/misc/custom/custom.yaml b/src/frontend/packages/core/misc/custom/custom.yaml index 383a1d47e0..db58c36ad7 100644 --- a/src/frontend/packages/core/misc/custom/custom.yaml +++ b/src/frontend/packages/core/misc/custom/custom.yaml @@ -6,7 +6,6 @@ files: login-bg.jpg: "assets/login-bg.jpg" logo.png: "assets/logo.png" nav-logo.png: "assets/nav-logo.png" - nav-logo-icon.png: "assets/nav-logo-icon.png" eula.html: "assets/eula.html" folders: diff --git a/src/frontend/packages/core/src/features/dashboard/dashboard-base/dashboard-base.component.html b/src/frontend/packages/core/src/features/dashboard/dashboard-base/dashboard-base.component.html index e319a028a7..025c388589 100644 --- a/src/frontend/packages/core/src/features/dashboard/dashboard-base/dashboard-base.component.html +++ b/src/frontend/packages/core/src/features/dashboard/dashboard-base/dashboard-base.component.html @@ -1,5 +1,5 @@
- + diff --git a/src/frontend/packages/core/src/features/dashboard/dashboard-base/dashboard-base.component.ts b/src/frontend/packages/core/src/features/dashboard/dashboard-base/dashboard-base.component.ts index 2e1f2cc742..1c6787a7a1 100644 --- a/src/frontend/packages/core/src/features/dashboard/dashboard-base/dashboard-base.component.ts +++ b/src/frontend/packages/core/src/features/dashboard/dashboard-base/dashboard-base.component.ts @@ -23,6 +23,7 @@ import { TabNavService } from '../../../../tab-nav.service'; import { EndpointsService } from '../../../core/endpoints.service'; import { PageHeaderService } from './../../../core/page-header-service/page-header.service'; import { SideNavItem } from './../side-nav/side-nav.component'; +import { selectDashboardState } from '../../../../../store/src/selectors/dashboard.selectors'; @Component({ @@ -57,12 +58,12 @@ export class DashboardBaseComponent implements OnInit, OnDestroy { map(() => this.isNoMarginView(this.activatedRoute.snapshot)), startWith(this.isNoMarginView(this.activatedRoute.snapshot)) ); - this.isMobile$ = this.breakpointObserver.observe(Breakpoints.Handset).pipe( + this.isMobile$ = this.breakpointObserver.observe([Breakpoints.Small, Breakpoints.XSmall]).pipe( map(breakpoint => breakpoint.matches), startWith(false), distinctUntilChanged() ); - this.dashboardState$ = this.store.select('dashboard'); + this.dashboardState$ = this.store.select(selectDashboardState); this.mainNavState$ = this.dashboardState$.pipe( map(state => { if (state.isMobile) { @@ -74,8 +75,8 @@ export class DashboardBaseComponent implements OnInit, OnDestroy { } else { return { mode: state.sideNavPinned ? 'side' : 'over', - opened: state.sidenavOpen || false, - iconMode: state.sideNavPinned + opened: true, + iconMode: !state.sidenavOpen }; } }) diff --git a/src/frontend/packages/core/src/features/dashboard/page-side-nav/page-side-nav.component.html b/src/frontend/packages/core/src/features/dashboard/page-side-nav/page-side-nav.component.html index 53e4272a17..b16004c4e1 100644 --- a/src/frontend/packages/core/src/features/dashboard/page-side-nav/page-side-nav.component.html +++ b/src/frontend/packages/core/src/features/dashboard/page-side-nav/page-side-nav.component.html @@ -1,8 +1,8 @@ -