Skip to content

Commit

Permalink
Design of button to disting multiple to only one
Browse files Browse the repository at this point in the history
  • Loading branch information
Xhelliom committed Aug 23, 2020
1 parent e06836e commit b183540
Show file tree
Hide file tree
Showing 4 changed files with 18 additions and 7 deletions.
4 changes: 4 additions & 0 deletions src/app/header/header-desktop/header-desktop.component.css
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,10 @@ button#sing-in mat-icon {
z-index: 100;
}

#refresh{
margin-left: 25px;
}

#upload-picture {
margin-right: 20px;
}
Expand Down
14 changes: 10 additions & 4 deletions src/app/header/header-desktop/header-desktop.component.html
Original file line number Diff line number Diff line change
@@ -1,19 +1,25 @@
<div class="fixed-wrapper">
<!-- Logo and refresh-->
<mat-toolbar>
<div id="brand">
<a routerLink="" (click)="homePressed.emit()">
<span>Amazing Pictures</span>
</a>
<a mat-icon-button routerLink="" id="refresh" (click)="homePressed.emit()">
<mat-icon>refresh</mat-icon>
</a>
</div>
<!-- Search bar-->
<div id="search">
<app-search-box [homePressed]="homePressed"></app-search-box>
</div>
<!-- button profile and add pictures-->
<div class="align-right">
<button *ngIf="accountService.user" mat-icon-button id="upload-picture" (click)="selectPicture()">
<mat-icon>add_photo_alternate</mat-icon>
<button *ngIf="accountService.user" mat-raised-button color="primary" id="upload-picture" (click)="selectPicture()">
<mat-icon>add_photo_alternate</mat-icon> Une image
</button>
<a *ngIf="accountService.user" class="button" mat-icon-button id="upload-mutiple-picture" routerLink="multiple-upload">
<mat-icon>playlist_add</mat-icon>
<a *ngIf="accountService.user" class="button" mat-raised-button color="primary" id="upload-mutiple-picture" routerLink="multiple-upload">
<mat-icon>playlist_add</mat-icon> Plusieurs images
</a>
<input #pictureInput id="picture-input" type="file" aria-label="Upload a profile picture"
accept="image/png, image/jpeg" (change)="uploadPicture($event)">
Expand Down
1 change: 0 additions & 1 deletion src/app/header/header-mobile/header-mobile.component.css
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,6 @@ mat-progress-bar {
z-index: 100;
}


#picture-input {
display: none;
}
6 changes: 4 additions & 2 deletions src/app/header/header-mobile/header-mobile.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,13 @@
</mat-menu>
<div *ngIf="accountService.user === undefined" id="profile-picture-placeholder"></div>
</mat-card>
<button *ngIf="accountService.user" mat-fab id="upload-picture" (click)="selectPicture()">
<button *ngIf="accountService.user" mat-fab id="upload-picture" (click)="selectPicture()">
<mat-icon>add_photo_alternate</mat-icon>
</button>

<a *ngIf="accountService.user" mat-fab id="upload-mutiple-picture" class="button" routerLink="multiple-upload">
<mat-icon>playlist_add</mat-icon>
multiple
</a>

<input #pictureInput id="picture-input" type="file" aria-label="Upload a profile picture"
accept="image/png, image/jpeg" (change)="uploadPicture($event)">

0 comments on commit b183540

Please sign in to comment.