-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #7 from CerealKiller97/dev
Fixing footer & header
- Loading branch information
Showing
8 changed files
with
55 additions
and
10 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
8 changes: 7 additions & 1 deletion
8
src/app/modules/shared-components/components/footer/footer.component.html
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,3 +1,9 @@ | ||
<mat-toolbar color="primary"> | ||
<small class="text-center light-text">Copyright 2019 © Stefan Bogdanovic</small> | ||
<small class="text-center light-text">© 2019 Stefan Bogdanović</small> | ||
<span class="example-fill-remaining-space"></span> | ||
|
||
<span> | ||
<small class="light-text">Made with </small> | ||
</span> | ||
<mat-icon color="warn" class="padding-left">favorite</mat-icon> | ||
</mat-toolbar> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -11,3 +11,7 @@ | |
.light-text { | ||
font-weight: 100 !important; | ||
} | ||
|
||
.spacy { | ||
margin-left: 10px !important; | ||
} |
19 changes: 17 additions & 2 deletions
19
src/app/modules/shared-components/components/header/header.component.html
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,14 +1,29 @@ | ||
<mat-toolbar color="primary"> | ||
<span class="light-text">VideoGamer</span> | ||
<button mat-button [routerLink]="''"> | ||
<span class="light-text">VideoGamer</span> | ||
</button> | ||
|
||
<span class="example-fill-remaining-space"></span> | ||
|
||
<span> | ||
<nav mat-tab-nav-bar> | ||
<button mat-button *ngFor="let link of links" [routerLink]="link.path" routerLinkActive #rla="routerLinkActive" | ||
class="nav-link light-text"> | ||
{{ link.name }} | ||
<mat-icon>{{ link.icon }}</mat-icon> | ||
<span class="spacy">{{ link.name }}</span> | ||
</button> | ||
|
||
<button class="light-text" mat-button [matMenuTriggerFor]="menu"> | ||
<mat-icon>apps</mat-icon> | ||
<span class="spacy">About project</span> | ||
</button> | ||
<mat-menu #menu="matMenu"> | ||
<button mat-menu-item>Follow me on Github</button> | ||
<button mat-icon-button> | ||
<mat-icon>star</mat-icon> | ||
<span>Star it on Github</span> | ||
</button> | ||
</mat-menu> | ||
</nav> | ||
</span> | ||
</mat-toolbar> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
d0b4397
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Successfully aliased the URL https://ng-videogamer-3a75ik5t6.now.sh to the following aliases: