static/src/app/statistic/campaign-player-detail/campaign-player-detail.component.css

@@ -4,7 +4,10 @@
   overflow-x: hidden;
   border-left: thin solid lightgrey;
   bottom: 20px;
-  padding: 70px 1% 0 1%;
+  width: 80%;
+  padding-left: 20px;
+  padding-right: 5%;
+  padding-top: 70px;
   height: 100vh;
 }
 

static/src/app/statistic/campaign-player-detail/campaign-player-detail.component.html

@@ -1,4 +1,5 @@
 <div class="overview fade-in" xmlns="http://www.w3.org/1999/html">
+
   <h2 class="pull-left">Spielerstatistik - {{campaignPlayer.name}}</h2>
   <h2 class="pull-right">{{campaignPlayer.campaign.title}} Kampagne</h2>
 
@@ -162,4 +163,5 @@
       </ngx-charts-line-chart>
     </div>
   </div>
+
 </div>

static/src/app/statistic/campaign-player-detail/campaign-player-detail.component.ts

@@ -9,7 +9,7 @@ import {Location} from '@angular/common';
 @Component({
   selector: 'campaign-player-detail',
   templateUrl: './campaign-player-detail.component.html',
-  styleUrls: ['./campaign-player-detail.component.css', '../../style/list-entry.css', '../../style/hide-scrollbar.css']
+  styleUrls: ['./campaign-player-detail.component.css', '../../style/list-entry.css']
 })
 export class CampaignPlayerDetailComponent {
 

static/src/app/statistic/overview/stats-overview.component.html

@@ -1,13 +1,13 @@
 <div class="slide-chart-container" style="height: 150px;">
   <h2 style="margin-bottom: 20px">{{title}}</h2>
 
-    <div class="btn btn-default" [style.background]="isActiveSlide(0)"
+    <div class="btn btn-default" [style.background]="activeSlideIndex === 0 ? '#d9edf7':'white'"
          (click)="goToSlide(0)" *ngIf="id != 'all'">Gesamtpunktzahl
     </div>
-    <div class="btn btn-default" [style.background]="isActiveSlide(1)"
+    <div class="btn btn-default" [style.background]="activeSlideIndex === 1 ? '#d9edf7':'white'"
          (click)="goToSlide(1)">Punkte je Schlacht
     </div>
-    <div class="btn btn-default" [style.background]="isActiveSlide(2)"
+    <div class="btn btn-default" [style.background]="activeSlideIndex === 2 ? '#d9edf7':'white'"
          (click)="goToSlide(2)">Spielerzahlen
     </div>
 </div>

static/src/app/statistic/overview/stats-overview.component.ts

@@ -153,8 +153,4 @@ export class StatisticOverviewComponent {
     Object.assign(this, this.currentData);
   }
 
-  isActiveSlide(index) {
-    return this.activeSlideIndex === index ? '#d9edf7':'white'
-  }
-
 }

static/src/app/statistic/war-detail/war-detail.component.css

@@ -1,26 +1,13 @@
-.vertical-spacer {
-  height: 100vh;
-  float: left;
-  width: 4%;
-}
-
-@media screen and (min-width: 1500px) {
-  .vertical-spacer {
-    width: 15%;
-  }
-}
-
-@media screen and (min-width: 2000px) {
-  .vertical-spacer {
-    width: 20%;
-  }
-}
-
 .overview {
+  position: fixed;
   overflow-y: scroll;
   overflow-x: hidden;
   border-left: thin solid lightgrey;
   bottom: 20px;
+  width: 100%;
+  padding-left: 50px;
+  padding-top: 70px;
+  margin-left: 10px;
   height: 100vh;
 }
 

static/src/app/statistic/war-detail/war-detail.component.html

@@ -1,87 +1,84 @@
-  <div class="overview fade-in" xmlns="http://www.w3.org/1999/html">
+<div class="overview fade-in" xmlns="http://www.w3.org/1999/html">
-    <div class=vertical-spacer>
+
+  <div style="min-height: 263px;">
+    <h2>{{war.title}} - vom {{war.date | date: 'dd.MM.yyyy'}}</h2>
+    <h3 class="pull-left" style="width: 250px">
+      <h4>Endpunktestand:</h4>
+      <span class="text-blufor" style="font-weight: bold; margin-right: 10px">NATO {{war.ptBlufor}}</span>
+      <span style="font-size: x-large">|</span>
+      <span class="text-opfor" style="font-weight: bold; margin-left: 10px;">{{war.ptOpfor}} CSAT</span>
+    </h3>
+
+    <h3 class="pull-left" style="padding-left: 150px;">
+      <h4>Teilnehmer:</h4>
+      <ngx-charts-pie-chart
+        [view]="[150, 150]"
+        [scheme]="{domain: ['#B22222', '#0000FF']}"
+        [results]="playerChart"
+        [legend]="false"
+        [explodeSlices]="false"
+        [labels]="false"
+        [doughnut]="false"
+        [gradient]="false">
+      </ngx-charts-pie-chart>
+    </h3>
+
+    <div class="pull-left" style="padding-left: 150px; padding-top:15px">
+      <a class="btn btn-default" style="margin: 20px" target="_blank" href="resource/logs/{{war._id}}/clean.log">Logfile
+        anzeigen</a>
+      <form class="form-group">
+        <label class="radio-inline">
+          <input type="radio" name="fractSelect"
+                 [checked]="(fractionRadioSelect == undefined) ? 'true' : 'false'"
+                 [(ngModel)]="fractionRadioSelect"
+                 (change)="filterPlayersByFraction()">Alle
+        </label>
+        <label class="radio-inline">
+          <input type="radio" name="fractSelect" value="BLUFOR"
+                 [(ngModel)]="fractionRadioSelect"
+                 #fractRadioBufor
+                 (change)="filterPlayersByFraction(fractRadioBufor.value)">NATO
+        </label>
+        <label class="radio-inline">
+          <input type="radio" name="fractSelect" value="OPFOR"
+                 [(ngModel)]="fractionRadioSelect"
+                 #fractRadioOpfor
+                 (change)="filterPlayersByFraction(fractRadioOpfor.value)">CSAT
+        </label>
+        <br>
+      </form>
     </div>
-    <div style="overflow:hidden">
+  </div>
-    <div style="width: 920px;min-height: 263px;">
-      <h2>{{war.title}} - vom {{war.date | date: 'dd.MM.yyyy'}}</h2>
-      <h3 class="pull-left" style="width: 250px">
-        <h4>Endpunktestand:</h4>
-        <span class="text-blufor" style="font-weight: bold; margin-right: 10px">NATO {{war.ptBlufor}}</span>
-        <span style="font-size: x-large">|</span>
-        <span class="text-opfor" style="font-weight: bold; margin-left: 10px;">{{war.ptOpfor}} CSAT</span>
-      </h3>
 
-      <h3 class="pull-left" style="padding-left: 150px;">
+  <ngx-datatable
-        <h4>Teilnehmer:</h4>
+    [rows]="rows"
-        <ngx-charts-pie-chart
+    [reorderable]="reorderable"
-          [view]="[150, 150]"
+    [sorts]="[{prop: 'kill', dir: 'desc'}]"
-          [scheme]="{domain: ['#B22222', '#0000FF']}"
+    [messages]="{emptyMessage: 'Loading...'}"
-          [results]="playerChart"
+    [headerHeight]="cellHeight"
-          [legend]="false"
+    [rowHeight]="cellHeight"
-          [explodeSlices]="false"
+    [cssClasses]='customClasses'
-          [labels]="false"
+    [selectionType]="'single'"
-          [doughnut]="false"
+    (select)="selectPlayerDetail($event)">
-          [gradient]="false">
+    <ngx-datatable-column name="Spieler" prop="name" [width]="210" style="padding-left:10px">
-        </ngx-charts-pie-chart>
+      <ng-template ngx-datatable-cell-template let-row="row" let-value="value">
-      </h3>
-
-      <div class="pull-left" style="padding-left: 150px; padding-top:15px">
-        <a class="btn btn-default" style="margin: 20px" target="_blank" href="resource/logs/{{war._id}}/clean.log">Logfile
-          anzeigen</a>
-        <form class="form-group">
-          <label class="radio-inline">
-            <input type="radio" name="fractSelect"
-                   [checked]="(fractionRadioSelect == undefined) ? 'true' : 'false'"
-                   [(ngModel)]="fractionRadioSelect"
-                   (change)="filterPlayersByFraction()">Alle
-          </label>
-          <label class="radio-inline">
-            <input type="radio" name="fractSelect" value="BLUFOR"
-                   [(ngModel)]="fractionRadioSelect"
-                   #fractRadioBufor
-                   (change)="filterPlayersByFraction(fractRadioBufor.value)">NATO
-          </label>
-          <label class="radio-inline">
-            <input type="radio" name="fractSelect" value="OPFOR"
-                   [(ngModel)]="fractionRadioSelect"
-                   #fractRadioOpfor
-                   (change)="filterPlayersByFraction(fractRadioOpfor.value)">CSAT
-          </label>
-          <br>
-        </form>
-      </div>
-    </div>
-
-    <ngx-datatable
-      [rows]="rows"
-      [reorderable]="reorderable"
-      [sorts]="[{prop: 'kill', dir: 'desc'}]"
-      [messages]="{emptyMessage: 'Loading...'}"
-      [headerHeight]="cellHeight"
-      [rowHeight]="cellHeight"
-      [cssClasses]='customClasses'
-      [selectionType]="'single'"
-      (select)="selectPlayerDetail($event)">
-      <ngx-datatable-column name="Spieler" prop="name" [width]="210" style="padding-left:10px">
-        <ng-template ngx-datatable-cell-template let-row="row" let-value="value">
         <span class="player-name"
               [ngClass]="row['fraction'] === 'BLUFOR' ? 'text-blufor' : 'text-opfor'">
           {{value}}
         </span>
-        </ng-template>
+      </ng-template>
-      </ngx-datatable-column>
+    </ngx-datatable-column>
-      <ngx-datatable-column name="Fraktion" prop="fraction" [width]="100">
+    <ngx-datatable-column name="Fraktion" prop="fraction" [width]="100">
-        <ng-template ngx-datatable-cell-template let-value="value">
+      <ng-template ngx-datatable-cell-template let-value="value">
-          {{value === 'BLUFOR' ? 'NATO' : 'CSAT'}}
+        {{value === 'BLUFOR' ? 'NATO' : 'CSAT'}}
-        </ng-template>
+      </ng-template>
-      </ngx-datatable-column>
+    </ngx-datatable-column>
-      <ngx-datatable-column [width]="90" name="Kills" prop="kill"></ngx-datatable-column>
+    <ngx-datatable-column [width]="90" name="Kills" prop="kill"></ngx-datatable-column>
-      <ngx-datatable-column [width]="110" name="FriendlyFire" prop="friendlyFire"></ngx-datatable-column>
+    <ngx-datatable-column [width]="110" name="FriendlyFire" prop="friendlyFire"></ngx-datatable-column>
-      <ngx-datatable-column [width]="100" name="Revive" prop="revive"></ngx-datatable-column>
+    <ngx-datatable-column [width]="100" name="Revive" prop="revive"></ngx-datatable-column>
-      <ngx-datatable-column [width]="100" name="Eroberung" prop="flagTouch"></ngx-datatable-column>
+    <ngx-datatable-column [width]="100" name="Eroberung" prop="flagTouch"></ngx-datatable-column>
-      <ngx-datatable-column [width]="100" name="Tod" prop="death"></ngx-datatable-column>
+    <ngx-datatable-column [width]="100" name="Tod" prop="death"></ngx-datatable-column>
-      <ngx-datatable-column [width]="100" name="Respawn" prop="respawn"></ngx-datatable-column>
+    <ngx-datatable-column [width]="100" name="Respawn" prop="respawn"></ngx-datatable-column>
-    </ngx-datatable>
+  </ngx-datatable>
-    </div>
 
 </div>

static/src/app/statistic/war-detail/war-detail.component.ts

@@ -7,7 +7,7 @@ import {War} from "../../models/model-interfaces";
 @Component({
   selector: 'war-detail',
   templateUrl: './war-detail.component.html',
-  styleUrls: ['./war-detail.component.css', '../../style/list-entry.css', '../../style/hide-scrollbar.css']
+  styleUrls: ['./war-detail.component.css', '../../style/list-entry.css']
 })
 export class WarDetailComponent {
 

static/src/app/style/hide-scrollbar.css

@@ -1,9 +0,0 @@
-::-webkit-scrollbar {
-  /*width: 0px;  !* remove scrollbar space *!*/
-  background: transparent; /* just make scrollbar invisible */
-}
-
-/* show position indicator in red */
-::-webkit-scrollbar-thumb {
-  background: rgb(234, 234, 234);
-}