Skip to content
This repository was archived by the owner on Oct 1, 2018. It is now read-only.

Commit 2b9614f

Browse files
committed
merge master
2 parents a8311b7 + f5bf6a8 commit 2b9614f

File tree

3 files changed

+28
-20
lines changed

3 files changed

+28
-20
lines changed

.travis.yml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,3 +27,14 @@ script:
2727
- ng test --single-run
2828
- ng build -prod
2929
- ng e2e
30+
31+
before_deploy:
32+
- rm -rf ./dist
33+
- ng build
34+
- yes | rm *.* && rm -rf ./e2e ./node_modules ./src
35+
- cp -r ./dist/* ./
36+
37+
deploy:
38+
provider: azure_web_apps
39+
verbose: true
40+
skip_cleanup: true

src/app/app.component.html

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,26 @@
11
<div class="app-fullpage">
2-
<mat-toolbar color="accent" class="mat-elevation-z6 primary-toolbar">
3-
<button mat-icon-button (click)="sidenav.toggle()">
4-
<mat-icon>
5-
menu
6-
</mat-icon>
7-
</button>
8-
<span class="toolbar-title"> RxJS Docs </span>
9-
</mat-toolbar>
2+
<header>
3+
<mat-toolbar color="accent" class="mat-elevation-z6">
4+
<button mat-icon-button (click)="sidenav.toggle()" aria-label="menu">
5+
<mat-icon>
6+
menu
7+
</mat-icon>
8+
</button>
9+
<span class="title"> RxJS Docs </span>
10+
</mat-toolbar>
11+
</header>
1012
<mat-sidenav-container>
11-
<mat-sidenav #sidenav>
13+
<mat-sidenav #sidenav role="navigation">
1214
<mat-nav-list (click)="sidenav.toggle()">
1315
<a *ngFor="let menu of menus" mat-list-item routerLinkActive="active"
1416
[routerLinkActiveOptions]="menu.options"
1517
[routerLink]="menu.link">
16-
{{menu.title}}
18+
{{menu.title}}
1719
</a>
1820
</mat-nav-list>
1921
</mat-sidenav>
20-
<div class="app-content">
22+
<main class="body-margin">
2123
<router-outlet></router-outlet>
22-
</div>
24+
</main>
2325
</mat-sidenav-container>
2426
</div>

src/app/app.component.scss

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,6 @@
1-
.app-fullpage {
2-
position: absolute;
3-
top: 0;
4-
bottom: 0;
5-
left: 0;
6-
right: 0;
7-
display: flex;
8-
flex-direction: column;
1+
.title {
2+
padding: 0 16px;
3+
font-weight: 600;
94
}
105

116
mat-sidenav-container {

0 commit comments

Comments
 (0)