Compare commits

..

2 Commits

7 changed files with 58 additions and 35 deletions

View File

@ -2,7 +2,7 @@
.army-member-view { .army-member-view {
width: 90%; width: 90%;
height: 100vh; min-height: 100vh;
padding: 5px; padding: 5px;
margin: auto; margin: auto;
} }
@ -18,11 +18,6 @@
padding-left: 5px; padding-left: 5px;
} }
.table {
overflow-wrap: break-word;
table-layout: fixed;
}
div.table-container { div.table-container {
margin-top:20px; margin-top:20px;
padding: 5px; padding: 5px;
@ -37,16 +32,24 @@ div.table-container {
mat-table.mat-table { mat-table.mat-table {
background: rgba(255, 255, 255, 0.70); background: rgba(255, 255, 255, 0.70);
.mat-column-award-graphics {
flex: 0 0 15%;
}
.mat-column-title {
flex: 0 0 25%;
}
.mat-column-reason {
flex: 0 0 52%;
}
.mat-column-date {
flex: 0 0 8%;
}
} }
mat-row.mat-row { mat-row.mat-row {
@extend mat-table.mat-table; @extend mat-table.mat-table;
} }
.cell-outline {
outline: 1px solid #D4D4D4;
}
tr.cell-outline:hover {
background-color: #ffffff;
}

View File

@ -10,6 +10,7 @@
.slide-chart-container { .slide-chart-container {
width: 100%; width: 100%;
min-width: unset; min-width: unset;
height: 65vh;
margin-top: 105px; margin-top: 105px;
margin-bottom: 35px; margin-bottom: 35px;
} }

View File

@ -1,5 +1,4 @@
<div class="fade-in" style="border-top: 1px solid #dadada; padding-top:25px;" xmlns="http://www.w3.org/1999/html"> <div class="fade-in fraction-stats-container">
<mat-button-toggle-group class="chart-select-group" <mat-button-toggle-group class="chart-select-group"
#group="matButtonToggleGroup" #group="matButtonToggleGroup"
[(ngModel)]="activeChartSelect" [(ngModel)]="activeChartSelect"

View File

@ -1,6 +1,11 @@
@import url('../../../style/list-entry.scss'); @import url('../../../style/list-entry.scss');
@import url('../../../style/hide-scrollbar.scss'); @import url('../../../style/hide-scrollbar.scss');
.fraction-stats-container {
border-top: 1px solid #dadada;
padding-top: 25px;
}
.chart-select-group { .chart-select-group {
display: flex; display: flex;
width: fit-content; width: fit-content;
@ -40,16 +45,29 @@
} }
@media all and (max-width: 959px) { @media all and (max-width: 959px) {
.fraction-stats-container {
width: 93%;
margin: auto;
}
.chart-container { .chart-container {
width: 150%; width: 100%;
min-width: 0; min-width: 0;
height: 70vh padding: 0;
margin: 10px 0 0;
} }
.chart-select-group { .chart-select-group {
background: #dadada;
max-width: fit-content;
width: 200%;
flex-wrap: wrap; flex-wrap: wrap;
} }
mat-button-toggle.mat-button-toggle {
width: 50%;
border: 1px solid #dadada;
text-align: center;
& /deep/ button.mat-button-toggle-button, & /deep/ div.mat-button-toggle-label-content {
width: 100%;
}
}
} }

View File

@ -43,13 +43,10 @@ mat-table.mat-table {
} }
} }
@media all and (max-width: 599px) { @media all and (max-width: 599px) {
.mat-column-name { .mat-column-name {
flex: 0 0 130px; flex: 0 0 130px;
padding-left: 1vw; padding-left: 1vw;
word-wrap: break-word;
white-space: pre-wrap;
} }
.mat-header-row { .mat-header-row {
@ -58,6 +55,7 @@ mat-table.mat-table {
mat-table.mat-table { mat-table.mat-table {
width: 100%; width: 100%;
height: 50vh;
overflow-x: auto; overflow-x: auto;
display: grid; display: grid;
} }

View File

@ -9,7 +9,16 @@
style="font-weight: bold; margin-left: 10px;">{{war.ptOpfor}} {{fraction.OPFOR}}</span> style="font-weight: bold; margin-left: 10px;">{{war.ptOpfor}} {{fraction.OPFOR}}</span>
</div> </div>
<div class="pull-left head-field-pie-chart"> <div class="pull-left head-field" style="margin-top:0" *ngIf="isSmallLayout">
<h4>{{'stats.scoreboard.participants' | translate}}</h4>
<span [style.color]="fraction.COLOR_BLUFOR"
style="font-weight: bold; margin-right: 10px">{{fraction.BLUFOR}} {{war.playersBlufor}}</span>
<span style="font-size: 13px;font-weight: bold;">vs</span>
<span [style.color]="fraction.COLOR_OPFOR"
style="font-weight: bold; margin-left: 10px;">{{war.playersOpfor}} {{fraction.OPFOR}}</span>
</div>
<div class="pull-left head-field-pie-chart" *ngIf="!isSmallLayout">
<h4 class="pull-left" style="margin-bottom: 0;">{{'stats.scoreboard.participants' | translate}}</h4> <h4 class="pull-left" style="margin-bottom: 0;">{{'stats.scoreboard.participants' | translate}}</h4>
<ngx-charts-pie-chart <ngx-charts-pie-chart
class="pull-left" class="pull-left"

View File

@ -145,11 +145,12 @@ span.tab-control {
} }
div.btn-clean-log { div.btn-clean-log {
padding-left: 0; padding: 2vw 4vw 38px;
padding-top: 38px; width: 100%;
& > a { & > a {
margin: 0 !important; margin: 0 !important;
width:100%;
} }
} }
} }
@ -165,12 +166,6 @@ span.tab-control {
} }
} }
.head-field-pie-chart {
width: calc(54% - 1.5vw);
padding-left: 10%;
margin-bottom: -8px;
}
.nav-tabs > li { .nav-tabs > li {
width: 25%; width: 25%;
font-size: 12px; font-size: 12px;
@ -184,7 +179,7 @@ span.tab-control {
.nav-tabs > li:last-child { .nav-tabs > li:last-child {
width: fit-content; width: fit-content;
position: absolute; position: absolute;
margin-top: -48px; margin-top: -38px;
margin-left: 46%; margin-left: 27%;
} }
} }