Compare commits

..

2 Commits

Author SHA1 Message Date
Florian Hartwich 148160dcb7 Fix war detail alignment 2017-10-07 09:38:02 +02:00
Florian Hartwich 1bb917add5 Fix campaign player detail scroll 2017-10-07 08:46:34 +02:00
9 changed files with 116 additions and 92 deletions

View File

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

View File

@ -1,5 +1,4 @@
<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>
@ -163,5 +162,4 @@
</ngx-charts-line-chart>
</div>
</div>
</div>

View File

@ -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']
styleUrls: ['./campaign-player-detail.component.css', '../../style/list-entry.css', '../../style/hide-scrollbar.css']
})
export class CampaignPlayerDetailComponent {

View File

@ -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]="activeSlideIndex === 0 ? '#d9edf7':'white'"
<div class="btn btn-default" [style.background]="isActiveSlide(0)"
(click)="goToSlide(0)" *ngIf="id != 'all'">Gesamtpunktzahl
</div>
<div class="btn btn-default" [style.background]="activeSlideIndex === 1 ? '#d9edf7':'white'"
<div class="btn btn-default" [style.background]="isActiveSlide(1)"
(click)="goToSlide(1)">Punkte je Schlacht
</div>
<div class="btn btn-default" [style.background]="activeSlideIndex === 2 ? '#d9edf7':'white'"
<div class="btn btn-default" [style.background]="isActiveSlide(2)"
(click)="goToSlide(2)">Spielerzahlen
</div>
</div>

View File

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

View File

@ -1,13 +1,26 @@
.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;
}

View File

@ -1,6 +1,8 @@
<div class="overview fade-in" xmlns="http://www.w3.org/1999/html">
<div style="min-height: 263px;">
<div class=vertical-spacer>
</div>
<div style="overflow:hidden">
<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>
@ -80,5 +82,6 @@
<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>
</div>
</div>

View File

@ -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']
styleUrls: ['./war-detail.component.css', '../../style/list-entry.css', '../../style/hide-scrollbar.css']
})
export class WarDetailComponent {

View File

@ -0,0 +1,9 @@
::-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);
}