Commit c2aa9d56 authored by Dennis Willers's avatar Dennis Willers
Browse files

Style Bug fixes

parent 046a4c10

src/app/footer/footer.component.html

+2 −1
Original line number Original line Diff line number Diff line 
<mat-toolbar color="primary" style="display: flex">

<mat-toolbar color="primary" style="display: flex">

  <span class="impressum" (click)="toImpressum()">Impressum</span>

  <span class="impressum" (click)="toImpressum()">Impressum</span>

  <span class="copyrightSize">Mit Liebe designed von Dennis Willers und Isabell Heider</span>

  <span *ngIf="view !== 'mobileView'" class="copyrightSize">Mit Liebe designed von Dennis Willers und Isabell Heider</span>

  <span *ngIf="view === 'mobileView'" class="copyrightSizeMobile">Mit Liebe designed von Dennis Willers und Isabell Heider</span>

</mat-toolbar>
 
</mat-toolbar>

src/app/footer/footer.component.scss

+4 −0
Original line number Original line Diff line number Diff line
@@ -2,6 +2,10 @@ 
  font-size: 12px;

  font-size: 12px;

}

}





.copyrightSizeMobile {

  font-size: 9px;

}



.impressum {

.impressum {

  font-size: 12px;

  font-size: 12px;

  cursor: pointer;

  cursor: pointer;

src/app/footer/footer.component.ts

+10 −1
Original line number Original line Diff line number Diff line 
import { Component, OnInit } from '@angular/core';

import { Component, OnInit } from '@angular/core';

import {Router} from '@angular/router';

import {Router} from '@angular/router';

import {ViewModus} from '../dao/viewModus';





@Component({

@Component({

  selector: 'app-footer',

  selector: 'app-footer',
@@ -7,10 +8,18 @@ import {Router} from '@angular/router'; 
  styleUrls: ['./footer.component.scss']

  styleUrls: ['./footer.component.scss']

})

})

export class FooterComponent implements OnInit {

export class FooterComponent implements OnInit {

  view = 'desktopView';





  constructor(private router: Router) { }

  constructor(private router: Router,

              private screen: ViewModus) {

    screen.$view.subscribe(

        view => {

          this.view = view;

        });

  }





  ngOnInit(): void {

  ngOnInit(): void {

    this.view = this.screen.actuallView;

  }

  }





  toImpressum(): void {

  toImpressum(): void {

src/app/overview/overview.component.html

+2 −0
Original line number Original line Diff line number Diff line
@@ -22,6 +22,8 @@ 
        <mat-icon color = "white" aria-hidden="false">autorenew</mat-icon>

        <mat-icon color = "white" aria-hidden="false">autorenew</mat-icon>

      </button>

      </button>

    </div>

    </div>

    <br *ngIf="view === 'mobileView'">

    <br *ngIf="view === 'mobileView'">

    <div *ngIf="view !== 'mobileView'" class="newStartButtonLeft">

    <div *ngIf="view !== 'mobileView'" class="newStartButtonLeft">

      <button matTooltip="Neues Spiel starten" [disabled]="buttonNewGameDisabled || gameStatus.activeExplainer == 1" mat-raised-button color="primary" (click)="startGame()">

      <button matTooltip="Neues Spiel starten" [disabled]="buttonNewGameDisabled || gameStatus.activeExplainer == 1" mat-raised-button color="primary" (click)="startGame()">

        <mat-icon color = "white" aria-hidden="false">autorenew</mat-icon>

        <mat-icon color = "white" aria-hidden="false">autorenew</mat-icon>

src/app/overview/overview.component.ts

+10 −1
Original line number Original line Diff line number Diff line
@@ -56,11 +56,13 @@ export class OverviewComponent implements OnInit, OnDestroy { 
    screen.$view.subscribe(

    screen.$view.subscribe(

      view => {

      view => {

        this.view = view;

        this.view = view;

        this.setScrollLimit();

      });

      });

  }

  }





  ngOnInit(): void {

  ngOnInit(): void {

    this.view = this.screen.actuallView;

    this.view = this.screen.actuallView;

    this.setScrollLimit();

    this.activatedRoute.paramMap.subscribe(params => {

    this.activatedRoute.paramMap.subscribe(params => {

      this.sessionName = String(params.get('sessionName')).toLowerCase();

      this.sessionName = String(params.get('sessionName')).toLowerCase();

      this.team = String(params.get('team'));

      this.team = String(params.get('team'));
@@ -199,7 +201,6 @@ export class OverviewComponent implements OnInit, OnDestroy { 
  }

  }





  updateChangeHistory(value: boolean): void {

  updateChangeHistory(value: boolean): void {

    console.log('UPDATE: ', value);

    this.canUpdateHistory = value;

    this.canUpdateHistory = value;

  }

  }
@@ -216,6 +217,14 @@ export class OverviewComponent implements OnInit, OnDestroy { 
    });

    });

  }

  }





  setScrollLimit(): void {

    if (this.view === 'mobileView') {

      this.scrollLimit = 325;

    } else {

      this.scrollLimit = 290;

    }

  }



  @HostListener('window:scroll', ['$event'])

  @HostListener('window:scroll', ['$event'])

  onWindowScroll($event: any): void {

  onWindowScroll($event: any): void {

    const numb = window.scrollY;

    const numb = window.scrollY;