Skip to content

Commit

Permalink
minor updates
Browse files Browse the repository at this point in the history
  • Loading branch information
Legros Jérémy committed May 23, 2017
1 parent 314848c commit 3f951f6
Show file tree
Hide file tree
Showing 3 changed files with 49 additions and 4 deletions.
4 changes: 2 additions & 2 deletions src/app/app.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@

<md-nav-list>
<h3 md-subheader>Merlosy</h3>
<a md-list-item [routerLink]="['/home']">Home</a>
<a md-list-item [routerLink]="['/projects']">Projects</a>
<a md-list-item [routerLink]="['/home']" (click)="sidenav.toggle()">Home</a>
<a md-list-item [routerLink]="['/projects']" (click)="sidenav.toggle()">Projects</a>
</md-nav-list>
<md-divider></md-divider>
<md-nav-list>
Expand Down
44 changes: 44 additions & 0 deletions src/app/app.component.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
@import '../styles/merlosy-theme';
:host {
height: 100vh;
display: block;
}

$dark-bg: #383838;
$dark-fore: mat-color($merlosy-primary);
router-outlet {
display: block;
padding-top: 64px;
}

md-sidenav-container {
min-height: 100%;
}

.mat-sidenav-container {
background-color: transparent;
height: 100%;
width: 100%;
}

md-sidenav.md-sidenav-main {
min-width: 12vw;
background-color: $dark-bg;
}

md-sidenav.md-sidenav-main .mat-list .mat-subheader,
md-sidenav.md-sidenav-main .mat-nav-list .mat-subheader {
color: lighten( $dark-fore, 30%);
}

md-sidenav.md-sidenav-main .mat-list .mat-list-item,
md-sidenav.md-sidenav-main .mat-nav-list .mat-list-item {
color: #ffffff;
}

md-sidenav.md-sidenav-main .mat-list a:hover,
md-sidenav.md-sidenav-main .mat-list a:focus,
md-sidenav.md-sidenav-main .mat-nav-list a:hover,
md-sidenav.md-sidenav-main .mat-nav-list a:focus {
background-color: lighten($dark-bg, 12%);
}
5 changes: 3 additions & 2 deletions src/app/projects/card/card.component.ts
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
import { DialogComponent } from './../dialog/dialog.component';
import { Component, OnInit, Input, Output, EventEmitter, ViewContainerRef } from '@angular/core';
import { Component, OnInit, Input, Output, EventEmitter, ViewContainerRef, ChangeDetectionStrategy } from '@angular/core';
import { MdDialog, MdDialogConfig } from '@angular/material';

@Component({
selector: 'app-card',
templateUrl: './card.component.html',
styleUrls: ['./card.component.scss']
styleUrls: ['./card.component.scss'],
changeDetection: ChangeDetectionStrategy.OnPush
})
export class CardComponent implements OnInit {

Expand Down

0 comments on commit 3f951f6

Please sign in to comment.