Skip to content

Commit

Permalink
Merge pull request #61 from Service-Soft/dev
Browse files Browse the repository at this point in the history
Release 16.0.1
  • Loading branch information
tim-fabian authored Sep 4, 2023
2 parents 5a4a5d9 + b69b9c0 commit ac580b4
Show file tree
Hide file tree
Showing 6 changed files with 24 additions and 16 deletions.
6 changes: 5 additions & 1 deletion projects/ngx-material-navigation-showcase/src/app/routes.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
/* eslint-disable jsdoc/require-jsdoc */
import { inject } from '@angular/core';
import { Router } from '@angular/router';
import { NavbarRow, NavElementTypes, NavUtilities, NgxMatNavigationNotFoundComponent, NavRoute } from 'ngx-material-navigation';
import { NavElementTypes, NavRoute, NavUtilities, NavbarRow, NgxMatNavigationNotFoundComponent } from 'ngx-material-navigation';
import { CustomComponent } from './components/custom/custom.component';
import { footerRows } from './footer-rows';

Expand Down Expand Up @@ -55,6 +55,10 @@ export const navbarRows: NavbarRow<NavRoute>[] = [
{
name: 'Middle',
fragment: 'middle'
},
{
name: 'Test for responsiveness',
fragment: 'test'
}
]
}
Expand Down
2 changes: 1 addition & 1 deletion projects/ngx-material-navigation/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "ngx-material-navigation",
"version": "16.0.0",
"version": "16.0.1",
"license": "MIT",
"keywords": [
"angular",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,6 @@
gap: 10px;
flex-direction: row;
align-items: center;
justify-content: center;
flex-wrap: wrap;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ export class NgxMatNavigationNavbarComponent implements OnInit, OnDestroy, After

sanitizedMinHeight!: SafeStyle;

screenWidthName: 'lg' | 'md' | 'sm' = this.getCurrentScreenWidthName();
screenWidthName!: 'lg' | 'md' | 'sm';

internalSidenavElements: NavElement[] = [];

Expand All @@ -95,6 +95,7 @@ export class NgxMatNavigationNavbarComponent implements OnInit, OnDestroy, After
}

ngOnInit(): void {
this.screenWidthName = this.getCurrentScreenWidthName();
this.navService.navbarRowsSubject.pipe(takeUntil(this.onDestroy)).subscribe(navbarRows => {
this.internalSidenavElements = this.navService.getSidenavElements(navbarRows, this.screenWidthName);
if (!this.internalSidenavElements.length && this.sidenav && this.sidenav.opened) {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
<h1>404</h1>
<h2>{{title}}</h2>
<p>
{{message}}
</p>
<a mat-raised-button [routerLink]="homeRoute">{{buttonLabel}}</a>
<div>
<h1>404</h1>
<h2>{{title}}</h2>
<p>
{{message}}
</p>
<a mat-raised-button [routerLink]="homeRoute">{{buttonLabel}}</a>
</div>
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
div {
padding: 24px 6px 24px 6px;
text-align: center;
}

h1 {
margin-top: 24px;
text-align: center;
font-size: 130px;
line-height: 130px;
Expand All @@ -21,10 +25,7 @@ p {
margin-bottom: 24px;
}

button {
display: block;
margin-left: auto;
margin-right: auto;
a {
font-size: 25px;
margin-bottom: 24px;
line-height: 25px;
}

0 comments on commit ac580b4

Please sign in to comment.