From e2b585215c6c9b2908d00d3d77a7704f85e0f46d Mon Sep 17 00:00:00 2001 From: Joachim Date: Sat, 1 Sep 2018 19:14:54 +0200 Subject: [PATCH] auto spinner enabled --- src/app/content/poule/poule.component.html | 2 +- src/app/content/tier/tier.component.html | 4 +++- src/app/content/tier/tier.component.scss | 7 ++++++- src/app/reclamespinner/reclamespinner.component.scss | 11 ----------- src/app/reclamespinner/reclamespinner.component.ts | 5 +++++ src/app/topmenu/topmenu.component.html | 1 - src/app/topmenu/topmenu.component.scss | 4 ++++ 7 files changed, 19 insertions(+), 15 deletions(-) diff --git a/src/app/content/poule/poule.component.html b/src/app/content/poule/poule.component.html index 9a421e1..9675993 100644 --- a/src/app/content/poule/poule.component.html +++ b/src/app/content/poule/poule.component.html @@ -21,7 +21,7 @@

{{getRaceTime(x, team.idteam)/1000 | number:'1.2-2'}}s

- {{getAvgOfBestTwo(team.idteam)/1000 | number:'1.2-2'}} + {{getAvgOfBestTwo(team.idteam)/1000 | number:'1.2-2'}}s diff --git a/src/app/content/tier/tier.component.html b/src/app/content/tier/tier.component.html index d2d0635..48a9147 100644 --- a/src/app/content/tier/tier.component.html +++ b/src/app/content/tier/tier.component.html @@ -1 +1,3 @@ - +
+ +
diff --git a/src/app/content/tier/tier.component.scss b/src/app/content/tier/tier.component.scss index 73eba0a..6b4afd6 100644 --- a/src/app/content/tier/tier.component.scss +++ b/src/app/content/tier/tier.component.scss @@ -1,4 +1,9 @@ app-poule { - background-color: yellowgreen; margin: 10px; + grid-row: 1; + min-width: 470px; +} + +#poulecontainer { + display: grid; } diff --git a/src/app/reclamespinner/reclamespinner.component.scss b/src/app/reclamespinner/reclamespinner.component.scss index aede768..ca6ef14 100644 --- a/src/app/reclamespinner/reclamespinner.component.scss +++ b/src/app/reclamespinner/reclamespinner.component.scss @@ -16,14 +16,3 @@ height: 100%; } -#goleftbutton, #gorightbutton { - //position: absolute; -} - -#goleftbutton { - left: 0px; -} - -#gorightbutton { - right: 0px; -} diff --git a/src/app/reclamespinner/reclamespinner.component.ts b/src/app/reclamespinner/reclamespinner.component.ts index f3b48f3..b56bde0 100644 --- a/src/app/reclamespinner/reclamespinner.component.ts +++ b/src/app/reclamespinner/reclamespinner.component.ts @@ -1,4 +1,5 @@ import {Component, OnInit} from '@angular/core'; +import {timer} from 'rxjs'; @Component({ selector: 'app-reclamespinner', @@ -19,6 +20,10 @@ export class ReclamespinnerComponent implements OnInit { } ngOnInit() { + // spin the commercials every 20s + timer(5000, 20000).subscribe(val => { + this.goRight(); + }); } goRight() { diff --git a/src/app/topmenu/topmenu.component.html b/src/app/topmenu/topmenu.component.html index de0ae3f..28855f2 100644 --- a/src/app/topmenu/topmenu.component.html +++ b/src/app/topmenu/topmenu.component.html @@ -2,5 +2,4 @@ - Link diff --git a/src/app/topmenu/topmenu.component.scss b/src/app/topmenu/topmenu.component.scss index e69de29..71fb4d5 100644 --- a/src/app/topmenu/topmenu.component.scss +++ b/src/app/topmenu/topmenu.component.scss @@ -0,0 +1,4 @@ +.button-row { + text-align: center; + margin-top: 10px; +}