mathieu/CAU-ICT-Spring-2019-Project-1
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source 
# Conflicts:
#	src/app/header/header.component.html
This commit is contained in:
Mathieu Sanchez
2019-06-04 11:15:53 +09:00
parent 58f0ddedbb 3592ba57bc
commit 260f62d345
10 changed files with 164 additions and 158 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/app/header/header.component.html
View File

@ -1,12 +1,11 @@
<header>
<div id="header-container-desktop" fxLayout="row" fxLayoutAlign="space-between" fxShow
fxHide.lt-md="true">
<div id="header-container-desktop" fxLayout="row" fxLayoutAlign="space-between" fxShow fxHide.lt-md="true">
<div fxFlex="200px" class="title">
<a [routerLink]="">DiscoTrip</a>
</div>
<div fxFlex="calc(100% - 200px)" fxLayout="row" fxLayoutAlign="end">
<div fxFlex="200px" class="title">
<a [routerLink]="">DiscoTrip</a>
</div>
<div fxFlex="calc(100% - 200px)" fxLayout="row" fxLayoutAlign="end">
<div fxFlex="60px">
@ -38,25 +37,25 @@
<!-- Search input -->
</div>
</div>
</div>
</div>
</div>
<div fxHide fxLayout="row" fxLayoutAlign="space-between" fxShow.lt-md="true"
id="header-container-mobile">
<div id="header-container-mobile" fxLayout="row" fxLayoutAlign="space-between" fxShow
fxHide.gt-sm="true">
<button mat-flat-button style="position: absolute;top: 0;left: 0;height: 60px;">
<mat-icon style="transform: scale(1.3)">menu</mat-icon>
</button>
<div fxFlex="100%">
<div fxFlex="100%">
<div class="title" style="width: 200px;margin: 5px auto;">
<a [routerLink]="">DiscoTrip</a>
</div>
<div class="title" style="width: 200px;margin: 5px auto;">
<a [routerLink]="">DiscoTrip</a>
</div>
</div>
</div>
</div>
</div>
</header>