Skip to content

Commit

Permalink
edit styling
Browse files Browse the repository at this point in the history
  • Loading branch information
Antoleb14 committed Mar 16, 2019
1 parent 091e1c2 commit fa2c4bd
Show file tree
Hide file tree
Showing 135 changed files with 97 additions and 2,681 deletions.
2 changes: 1 addition & 1 deletion website/src/@fuse/mat-colors/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -578,7 +578,7 @@ const matColors = {
600 : '#757575',
700 : '#616161',
800 : '#424242',
900 : '#212121',
900 : '#292929',
1000 : '#000000',
A100 : '#ffffff',
A200 : '#eeeeee',
Expand Down
2 changes: 1 addition & 1 deletion website/src/@fuse/scss/partials/_page-layouts.scss
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
> .center {

> .content {
background: map-get($background, card);
background: map-get($background, background);
}
}

Expand Down
6 changes: 6 additions & 0 deletions website/src/app/_services/time.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,12 @@ export class TimeService {
});
}

resetTime(): Promise<string> {
this.timeCached = null;
const httpOptions = this.httpConfig.getAdminHeaders();
return this.http.post<string>(`${environment.apiAdminUrl}/game/date/reset`, null, httpOptions).toPromise();
}

resetGame(): Promise<string> {
this.timeCached = null;
const httpOptions = this.httpConfig.getAdminHeaders();
Expand Down
6 changes: 3 additions & 3 deletions website/src/app/app.theme.scss
Original file line number Diff line number Diff line change
Expand Up @@ -162,8 +162,8 @@ body.theme-yellow-light {
// -----------------------------------------------------------------------------------------------------

// Define the primary, accent and warn palettes
$blue-gray-dark-theme-primary-palette: mat-palette($mat-blue);
$blue-gray-dark-theme-accent-palette: mat-palette($mat-blue);
$blue-gray-dark-theme-primary-palette: mat-palette($mat-pink);
$blue-gray-dark-theme-accent-palette: mat-palette($mat-pink, 800);
$blue-gray-dark-theme-warn-palette: mat-palette($mat-red);

// Create the Material theme object
Expand Down Expand Up @@ -198,7 +198,7 @@ body.theme-blue-gray-dark {

// Define the primary, accent and warn palettes
$pink-dark-theme-primary-palette: mat-palette($mat-pink);
$pink-dark-theme-accent-palette: mat-palette($mat-pink);
$pink-dark-theme-accent-palette: mat-palette($mat-pink, 700, 800);
$pink-dark-theme-warn-palette: mat-palette($mat-red);

// Create the Material theme object
Expand Down
14 changes: 6 additions & 8 deletions website/src/app/layout/components/toolbar/toolbar.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -11,16 +11,14 @@

<div class="toolbar-separator" *ngIf="!hiddenNavbar && !rightNavbar" fxHide.gt-md></div>

<div fxLayout="row" fxLayoutAlign="start center" *ngIf="horizontalNavbar">
<div class="logo ml-16">
<img class="logo-icon" src="assets/images/logos/fuse.svg">
</div>
<div fxLayout="row" fxLayoutAlign="start center">
<a href="/">
<div class="logo ml-16">
<img class="logo-icon" src="assets/images/logos/takima.svg">
</div>
</a>
</div>

<!--<div class="px-8 px-mat-16">-->
<!--<fuse-shortcuts [navigation]="navigation"></fuse-shortcuts>-->
<!--</div>-->

</div>

<div class="" fxFlex="0 1 auto" fxLayout="row" fxLayoutAlign="start center">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ toolbar {
align-items: center;

.logo-icon {
width: 38px;
width: 150px;
}
}

Expand Down
3 changes: 2 additions & 1 deletion website/src/app/main/pages/admin/admin.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,8 @@
<span class="start-date">{{ startDate | date:'HH:mm:ss' }}</span>
</mat-card-content>
<mat-card-actions>
<button mat-raised-button color="accent" (click)="startGame()">Start game</button>
<button mat-raised-button color="primary" (click)="startGame()">Start game</button>
<button mat-raised-button color="warn" (click)="resetDate()">Reset date</button>
<button mat-raised-button color="warn" (click)="resetGame()">Reset game</button>
</mat-card-actions>
</mat-card>
Expand Down
30 changes: 21 additions & 9 deletions website/src/app/main/pages/admin/admin.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -45,15 +45,27 @@ export class AdminComponent implements OnInit {
this.timeService.setTime().then(() => this.updateTime());
}

resetDate(): void {
this.timeService.resetGame().then(() => {
this.startDate = null;
this.snackBar.open('Date reset successfully done!', null, {
duration: 3000,
});
},
(err) => {
console.log(err);
});
}

resetGame(): void {
this.timeService.resetGame().then(() => {
this.startDate = null;
this.snackBar.open('Game reset successfully done!', null, {
duration: 3000,
});
},
(err) => {
console.log(err);
});
this.timeService.resetGame().then(() => {
this.startDate = null;
this.snackBar.open('Game reset successfully done!', null, {
duration: 3000,
});
},
(err) => {
console.log(err);
});
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<div id="login-form" [@animate]="{value:'*',params:{duration:'300ms',y:'100px'}}">

<div class="logo">
<img src="assets/images/logos/fuse.svg">
<img src="assets/images/logos/logo_takima.svg">
</div>

<div class="title">ADMIN LOGIN</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<div id="register-form" [@animate]="{value:'*',params:{duration:'300ms',y:'100px'}}" class="w-80-p">

<div class="logo">
<img src="assets/images/logos/fuse.svg">
<img src="assets/images/logos/logo_takima.svg">
</div>

<div class="title">{{ 'auth.register.create' | translate | uppercase }}</div>
Expand Down
7 changes: 0 additions & 7 deletions website/src/assets/icons/meteocons/Read Me.txt

This file was deleted.

190 changes: 0 additions & 190 deletions website/src/assets/icons/meteocons/demo-files/demo.css

This file was deleted.

38 changes: 0 additions & 38 deletions website/src/assets/icons/meteocons/demo-files/demo.js

This file was deleted.

Loading

0 comments on commit fa2c4bd

Please sign in to comment.