hardi
/
opt-cc
1
0
Fork 0
Code Pull Requests Releases 47 Activity

Combine Overview css definition and fix layouts

pull/12/head
Florian Hartwich 2017-10-07 19:32:16 +02:00
parent 7a6146f187
commit 840185d2e3
31 changed files with 93 additions and 142 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
static/src/app/admin/admin.component.css
View File

@ -1,13 +1,5 @@
.overview {
position: fixed;
overflow-y: scroll;
overflow-x: hidden;
bottom: 20px;
width: 100%;
padding-left: 50px;
padding-top: 190px;
margin-left: 10px;
height: 100vh;
padding: 80px 0 0 10%!important;
}
.trash {
@ -32,3 +24,11 @@
.cell-outline {
outline: 1px solid #D4D4D4;
}
.label {
display: block;
position: absolute;
font-size: 12px;
padding: 5px;
margin-left: 25%;
}

3
static/src/app/admin/admin.component.html
View File

@ -3,8 +3,7 @@
<h2>Admin Panel</h2>
<span *ngIf="showSuccessLabel"
class="label label-success label-small"
style="margin-left: inherit">
class="label label-success label-small">
Erfolgreich gespeichert
</span>

2
static/src/app/admin/admin.component.ts
View File

@ -8,7 +8,7 @@ import {SquadService} from "../services/squad-service/squad.service";
@Component({
selector: 'admin-panel',
templateUrl: './admin.component.html',
styleUrls: ['./admin.component.css']
styleUrls: ['./admin.component.css', '../style/overview.css']
})
export class AdminComponent {

2
static/src/app/decorations/edit-decoration/edit-decoration.component.ts
View File

@ -7,7 +7,7 @@ import {Subscription} from "rxjs/Subscription";
@Component({
templateUrl: './edit-decoration.component.html',
styleUrls: ['./edit-decoration.component.css', '../../style/entry-form.css']
styleUrls: ['./edit-decoration.component.css', '../../style/entry-form.css', '../../style/overview.css']
})
export class EditDecorationComponent {

2
static/src/app/ranks/edit-rank/edit-rank.component.ts
View File

@ -8,7 +8,7 @@ import {Subscription} from "rxjs/Subscription";
@Component({
templateUrl: './edit-rank.component.html',
styleUrls: ['./edit-rank.component.css', '../../style/entry-form.css']
styleUrls: ['./edit-rank.component.css', '../../style/entry-form.css', '../../style/overview.css']
})
export class EditRankComponent {

29
static/src/app/request/award/req-award.component.css
View File

@ -1,3 +1,8 @@
.overview {
width: 100%!important;
margin-left: 25px!important;
}
.decoration-preview {
padding: 5px;
}
@ -14,30 +19,24 @@
.table-container {
margin-top: 40px;
overflow-x: auto;
width: 65%;
}
/* enable scrolling for long list of awardings */
.overview {
position: fixed;
overflow-y: scroll;
overflow-x: hidden;
width: 100%;
border-left: thin solid lightgrey;
padding: 20px 0 0 50px;
margin-left: 10px;
height: 100vh;
bottom: 10px;
width: 75%;
min-width: 800px;
padding: 5px;
}
.form-group {
width: 25%;
min-width: 300px;
}
h3 {
margin: 80px 0 20px -20px;
}
label {
.label {
display: block;
position: absolute;
font-size: 12px;
padding: 5px;
margin-left: 25%;
}

4
static/src/app/request/award/req-award.component.html
View File

@ -17,7 +17,6 @@
</select>
</div>
<div class="form-group">
<label for="decoration">Auszeichnung</label>
<select class="form-control"
@ -64,8 +63,7 @@
</button>
<span *ngIf="showSuccessLabel"
class="label label-success label-small"
style="margin-left: inherit">
class="label label-success label-small">
Erfolgreich gespeichert
</span>

2
static/src/app/request/award/req-award.component.ts
View File

@ -10,7 +10,7 @@ import {LoginService} from "../../services/login-service/login-service";
@Component({
templateUrl: './req-award.component.html',
styleUrls: ['./req-award.component.css'],
styleUrls: ['./req-award.component.css', '../../style/overview.css'],
})
export class RequestAwardComponent {

24
static/src/app/request/confirm-award/confirm-award.component.css
View File

@ -1,3 +1,7 @@
.overview {
margin-left: 25px!important;
}
.decoration-preview {
padding: 5px;
}
@ -15,19 +19,7 @@
margin-top: 40px;
overflow-x: auto;
width: 75%;
}
/* enable scrolling for long list of awardings */
.overview {
position: fixed;
overflow-y: scroll;
overflow-x: hidden;
width: 100%;
border-left: thin solid lightgrey;
padding: 20px 0 0 50px;
margin-left: 10px;
height: 100vh;
bottom: 10px;
padding: 5px;
}
.form-group {
@ -38,6 +30,10 @@ h3 {
margin: 80px 0 20px -20px;
}
label {
.label {
display: block;
position: absolute;
font-size: 12px;
padding: 5px;
margin-left: 25%;
}

3
static/src/app/request/confirm-award/confirm-award.component.html
View File

@ -2,8 +2,7 @@
<h3>Offene Anträge - Auszeichnungen</h3>
<span *ngIf="showSuccessLabel"
class="label label-success label-small"
style="margin-left: inherit">
class="label label-success label-small">
Erfolgreich gespeichert
</span>

2
static/src/app/request/confirm-award/confirm-award.component.ts
View File

@ -6,7 +6,7 @@ import {LoginService} from "../../services/login-service/login-service";
@Component({
templateUrl: './confirm-award.component.html',
styleUrls: ['./confirm-award.component.css'],
styleUrls: ['./confirm-award.component.css', '../../style/overview.css'],
})
export class ConfirmAwardComponent {

24
static/src/app/request/confirm-promotion/confirm-promotion.component.css
View File

@ -1,3 +1,7 @@
.overview {
margin-left: 25px!important;
}
.decoration-preview {
padding: 5px;
}
@ -15,19 +19,7 @@
margin-top: 40px;
overflow-x: auto;
width: 65%;
}
/* enable scrolling for long list of awardings */
.overview {
position: fixed;
overflow-y: scroll;
overflow-x: hidden;
width: 100%;
border-left: thin solid lightgrey;
padding: 20px 0 0 50px;
margin-left: 10px;
height: 100vh;
bottom: 10px;
padding: 5px;
}
.form-group {
@ -38,6 +30,10 @@ h3 {
margin: 80px 0 20px -20px;
}
label {
.label {
display: block;
position: absolute;
font-size: 12px;
padding: 5px;
margin-left: 25%;
}

3
static/src/app/request/confirm-promotion/confirm-promotion.component.html
View File

@ -2,8 +2,7 @@
<h3>Offene Anträge - Beförderung</h3>
<span *ngIf="showSuccessLabel"
class="label label-success label-small"
style="margin-left: inherit">
class="label label-success label-small">
Erfolgreich gespeichert
</span>

2
static/src/app/request/confirm-promotion/confirm-promotion.component.ts
View File

@ -7,7 +7,7 @@ import {LoginService} from "../../services/login-service/login-service";
@Component({
templateUrl: './confirm-promotion.component.html',
styleUrls: ['./confirm-promotion.component.css'],
styleUrls: ['./confirm-promotion.component.css', '../../style/overview.css'],
})
export class ConfirmPromotionComponent {

26
static/src/app/request/promotion/req-promotion.component.css
View File

@ -1,3 +1,7 @@
.overview {
margin-left: 25px!important;
}
.decoration-preview {
padding: 5px;
}
@ -15,29 +19,23 @@
margin-top: 40px;
overflow-x: auto;
width: 65%;
}
/* enable scrolling for long list of awardings */
.overview {
position: fixed;
overflow-y: scroll;
overflow-x: hidden;
width: 100%;
border-left: thin solid lightgrey;
padding: 20px 0 0 50px;
margin-left: 10px;
height: 100vh;
bottom: 10px;
min-width: 800px;
padding: 5px;
}
.form-group {
width: 25%;
min-width: 300px;
}
h3 {
margin: 80px 0 20px -20px;
}
label {
.label {
display: block;
position: absolute;
font-size: 12px;
padding: 5px;
margin-left: 25%;
}

3
static/src/app/request/promotion/req-promotion.component.html
View File

@ -58,8 +58,7 @@
</button>
<span *ngIf="showSuccessLabel"
class="label label-success label-small"
style="margin-left: inherit">
class="label label-success label-small">
Erfolgreich gespeichert
</span>

2
static/src/app/request/promotion/req-promotion.component.ts
View File

@ -10,7 +10,7 @@ import {LoginService} from "../../services/login-service/login-service";
@Component({
templateUrl: './req-promotion.component.html',
styleUrls: ['./req-promotion.component.css'],
styleUrls: ['./req-promotion.component.css', '../../style/overview.css'],
})
export class RequestPromotionComponent {

2
static/src/app/squads/edit-squad/edit-squad.component.ts
View File

@ -8,7 +8,7 @@ import {Subscription} from "rxjs/Subscription";
@Component({
templateUrl: './edit-squad.component.html',
styleUrls: ['./edit-squad.component.css', '../../style/entry-form.css']
styleUrls: ['./edit-squad.component.css', '../../style/entry-form.css', '../../style/overview.css']
})
export class EditSquadComponent {

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

@ -1,13 +1,3 @@
.overview {
position: fixed;
overflow-y: scroll;
overflow-x: hidden;
border-left: thin solid lightgrey;
bottom: 20px;
padding: 70px 1% 0 1%;
height: 100vh;
}
h2 {
padding: 10px;
}

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

@ -1,4 +1,4 @@
<div class="overview fade-in" xmlns="http://www.w3.org/1999/html">
<div class="overview fade-in" style="padding: 70px 1% 0 1%;" xmlns="http://www.w3.org/1999/html">
<h2 class="pull-left">Spielerstatistik - {{campaignPlayer.name}}</h2>
<h2 class="pull-right">{{campaignPlayer.campaign.title}} Kampagne</h2>

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

@ -9,7 +9,8 @@ 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',
'../../style/hide-scrollbar.css', '../../style/overview.css']
})
export class CampaignPlayerDetailComponent {

8
static/src/app/statistic/campaign-submit/campaign-submit.component.css
View File

@ -1,8 +0,0 @@
.overview {
position: fixed;
width: 25%;
min-width: 300px;
padding-left: 50px;
padding-top: 70px;
margin-left: 10px;
}

2
static/src/app/statistic/campaign-submit/campaign-submit.component.ts
View File

@ -8,7 +8,7 @@ import {CampaignService} from "../../services/campaign-service/campaign.service"
@Component({
selector: 'campaign-submit',
templateUrl: './campaign-submit.component.html',
styleUrls: ['./campaign-submit.component.css']
styleUrls: ['./campaign-submit.component.css', '../../style/entry-form.css', '../../style/overview.css']
})
export class CampaignSubmitComponent {

2
static/src/app/statistic/overview/stats-overview.component.ts
View File

@ -8,7 +8,7 @@ import {ChartUtils} from "../../utils/chart-utils";
@Component({
selector: 'stats-overview',
templateUrl: './stats-overview.component.html',
styleUrls: ['./stats-overview.component.css', '../../style/list-entry.css'],
styleUrls: ['./stats-overview.component.css', '../../style/list-entry.css', '../../style/overview.css'],
inputs: ['campaigns'],
providers: [{provide: CarouselConfig, useValue: {interval: false}}]
})

8
static/src/app/statistic/war-submit/war-submit.component.css
View File

@ -1,8 +0,0 @@
.overview {
position: fixed;
width: 25%;
min-width: 300px;
padding-left: 50px;
padding-top: 70px;
margin-left: 10px;
}

3
static/src/app/statistic/war-submit/war-submit.component.ts
View File

@ -9,7 +9,8 @@ import {CampaignService} from "../../services/campaign-service/campaign.service"
@Component({
selector: 'war-submit',
templateUrl: './war-submit.component.html',
styleUrls: ['./war-submit.component.css', '../../style/load-indicator.css']
styleUrls: ['./war-submit.component.css', '../../style/load-indicator.css',
'../../style/entry-form.css', '../../style/overview.css']
})
export class WarSubmitComponent {

18
static/src/app/style/entry-form.css
View File

@ -1,3 +1,10 @@
.overview {
overflow: hidden!important;
padding-top: 80px!important;
width: 20%;
min-width: 280px;
}
h3 {
margin-left: -20px;
}
@ -10,17 +17,6 @@ label {
border-color: red;
}
.overview {
position: fixed;
width: 25%;
min-width: 500px;
border-left: thin solid lightgrey;
padding-left: 50px;
padding-top: 20px;
margin-left: 10px;
height: 100vh;
}
.preview-image {
margin: 10px;
}

9
static/src/app/style/overview.css Normal file
View File

@ -0,0 +1,9 @@
.overview {
position: fixed;
overflow-y: scroll;
overflow-x: hidden;
border-left: thin solid lightgrey;
padding: 20px 0 0 50px;
height: 100vh;
bottom: 10px;
}

13
static/src/app/users/award-user/award-user.component.css
View File

@ -18,19 +18,6 @@
width: 50%;
}
/* enable scrolling for long list of awardings */
.overview {
position: fixed;
overflow-y: scroll;
overflow-x: hidden;
width: 100%;
border-left: thin solid lightgrey;
padding: 20px 0 0 50px;
margin-left: 10px;
height: 100vh;
bottom: 10px;
}
.form-group {
width: 25%;
}

2
static/src/app/users/award-user/award-user.component.ts
View File

@ -8,7 +8,7 @@ import {DecorationService} from "../../services/decoration-service/decoration.se
@Component({
templateUrl: './award-user.component.html',
styleUrls: ['./award-user.component.css'],
styleUrls: ['./award-user.component.css', '../../style/overview.css', '../../style/hide-scrollbar.css'],
})
export class AwardUserComponent {

2
static/src/app/users/edit-user/edit-user.component.ts
View File

@ -10,7 +10,7 @@ import {NgForm} from "@angular/forms";
@Component({
templateUrl: './edit-user.component.html',
styleUrls: ['./edit-user.component.css', '../../style/entry-form.css'],
styleUrls: ['./edit-user.component.css', '../../style/entry-form.css', '../../style/overview.css'],
})
export class EditUserComponent {