Finish basic war-list redesign and list imrovement
parent
ce86593c0f
commit
d1ba6170ba
|
@ -3,7 +3,7 @@
|
|||
<div class="row">
|
||||
<div [ngClass]="[loginService.hasPermission(3) ? 'col-xs-9' : 'col-xs-11']">
|
||||
<span>
|
||||
<a style="font-size: 20px;">{{war.title}}</a>
|
||||
<a>{{war.title}}</a>
|
||||
</span>
|
||||
<br>
|
||||
<small>vom {{war.date | date: 'dd.MM.yyyy'}}</small>
|
||||
|
|
|
@ -3,7 +3,7 @@ import {War} from '../../../models/model-interfaces';
|
|||
import {LoginService} from '../../../services/app-user-service/login-service';
|
||||
|
||||
@Component({
|
||||
selector: 'pjm-war-item',
|
||||
selector: 'cc-war-item',
|
||||
templateUrl: './war-item.component.html',
|
||||
styleUrls: ['./war-item.component.css', '../../../style/list-entry.css'],
|
||||
changeDetection: ChangeDetectionStrategy.OnPush
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
span > a {
|
||||
font-size: 20px !important;
|
||||
font-weight: 600 !important;
|
||||
}
|
||||
|
||||
mat-expansion-panel {
|
||||
|
@ -8,7 +8,7 @@ mat-expansion-panel {
|
|||
|
||||
mat-panel-title {
|
||||
font-size: 18px;
|
||||
color: #FFFFFF;
|
||||
color: #ffffff;
|
||||
}
|
||||
|
||||
mat-expansion-panel-header {
|
||||
|
@ -44,7 +44,7 @@ mat-expansion-panel-header.mat-expansion-panel-header:focus {
|
|||
}
|
||||
|
||||
.war-interaction-panel > span {
|
||||
color: #4b4b4b;
|
||||
color: rgba(255, 255, 255, 0.64);
|
||||
padding: 0 3px;
|
||||
}
|
||||
|
||||
|
@ -53,9 +53,9 @@ mat-expansion-panel-header.mat-expansion-panel-header:focus {
|
|||
}
|
||||
|
||||
.select-list > mat-accordion:first-child .mat-expansion-panel {
|
||||
border-radius: 10px 10px 0 0;
|
||||
border-radius: 6px 6px 0 0;
|
||||
}
|
||||
|
||||
.select-list > mat-accordion:first-child .mat-expansion-panel-header {
|
||||
border-radius: 8px 8px 0 0;
|
||||
border-radius: 4px 4px 0 0;
|
||||
}
|
||||
|
|
|
@ -15,11 +15,12 @@
|
|||
{{campaign.title}}
|
||||
</mat-panel-title>
|
||||
<mat-panel-description class="war-interaction-panel" *ngIf="loginService.hasPermission(3)">
|
||||
<span (click)="editCampaign(campaign); $event.stopPropagation()" title="Bearbeiten"
|
||||
class="glyphicon glyphicon-edit trash">
|
||||
<span (click)="deleteCampaign(campaign); $event.stopPropagation()" title="Löschen"
|
||||
class="glyphicon glyphicon-trash trash">
|
||||
</span>
|
||||
<span (click)="deleteCampaign(campaign); $event.stopPropagation()" title="Löschen"
|
||||
class="glyphicon glyphicon-trash trash">
|
||||
<span (click)="editCampaign(campaign); $event.stopPropagation()" title="Bearbeiten"
|
||||
class="glyphicon glyphicon-edit trash"
|
||||
style="padding-right: 10px;">
|
||||
</span>
|
||||
</mat-panel-description>
|
||||
</mat-expansion-panel-header>
|
||||
|
@ -42,13 +43,13 @@
|
|||
</div>
|
||||
</div>
|
||||
<div *ngFor="let war of campaign.wars">
|
||||
<pjm-war-item
|
||||
<cc-war-item
|
||||
[war]="war"
|
||||
(warEdit)="editWar($event)"
|
||||
(warDelete)="deleteWar(war)"
|
||||
(warSelected)="selectWar($event)"
|
||||
[selected]="war._id == selectedWarId">
|
||||
</pjm-war-item>
|
||||
</cc-war-item>
|
||||
</div>
|
||||
</mat-expansion-panel>
|
||||
</mat-accordion>
|
||||
|
|
|
@ -1,20 +1,13 @@
|
|||
div.list-entry, a.list-entry,
|
||||
div.user-list-entry, a.user-list-entry {
|
||||
div.list-entry, a.list-entry {
|
||||
padding: 8px;
|
||||
border-radius: 2px;
|
||||
border: lightgrey solid 1px;
|
||||
cursor: cell;
|
||||
cursor: pointer;
|
||||
margin-bottom: -1px;
|
||||
}
|
||||
|
||||
.user-list-entry a {
|
||||
font-size: large;
|
||||
font-weight: 600;
|
||||
}
|
||||
|
||||
.user-list-entry small {
|
||||
color: grey;
|
||||
font-size: x-small;
|
||||
div.list-entry:hover, a.list-entry:hover {
|
||||
background-color: #f9f9f9;
|
||||
}
|
||||
|
||||
.decoration-list-preview, .squad-list-preview {
|
||||
|
@ -31,8 +24,8 @@ span > a, span.glyphicon, span.icon-award {
|
|||
}
|
||||
|
||||
.list-entry a {
|
||||
font-size: x-large;
|
||||
font-weight: 700;
|
||||
font-size: 20px;
|
||||
text-decoration: none;
|
||||
}
|
||||
|
||||
.list-entry small {
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
<div class="fade-in user-list-entry" [ngClass]="{selected : selected}" (click)="select()">
|
||||
<div class="fade-in list-entry" [ngClass]="{selected : selected}" (click)="select()">
|
||||
|
||||
<div class="row">
|
||||
<div class="col-sm-8">
|
||||
|
|
Loading…
Reference in New Issue