From 840185d2e30233d152580a639957294a2c655d77 Mon Sep 17 00:00:00 2001 From: Florian Hartwich Date: Sat, 7 Oct 2017 19:32:16 +0200 Subject: [PATCH] Combine Overview css definition and fix layouts --- static/src/app/admin/admin.component.css | 18 ++++++------ static/src/app/admin/admin.component.html | 3 +- static/src/app/admin/admin.component.ts | 2 +- .../edit-decoration.component.ts | 2 +- .../ranks/edit-rank/edit-rank.component.ts | 2 +- .../app/request/award/req-award.component.css | 29 +++++++++---------- .../request/award/req-award.component.html | 4 +-- .../app/request/award/req-award.component.ts | 2 +- .../confirm-award/confirm-award.component.css | 24 +++++++-------- .../confirm-award.component.html | 3 +- .../confirm-award/confirm-award.component.ts | 2 +- .../confirm-promotion.component.css | 24 +++++++-------- .../confirm-promotion.component.html | 3 +- .../confirm-promotion.component.ts | 2 +- .../promotion/req-promotion.component.css | 26 ++++++++--------- .../promotion/req-promotion.component.html | 3 +- .../promotion/req-promotion.component.ts | 2 +- .../squads/edit-squad/edit-squad.component.ts | 2 +- .../campaign-player-detail.component.css | 10 ------- .../campaign-player-detail.component.html | 2 +- .../campaign-player-detail.component.ts | 3 +- .../campaign-submit.component.css | 8 ----- .../campaign-submit.component.ts | 2 +- .../overview/stats-overview.component.ts | 2 +- .../war-submit/war-submit.component.css | 8 ----- .../war-submit/war-submit.component.ts | 3 +- static/src/app/style/entry-form.css | 18 +++++------- static/src/app/style/overview.css | 9 ++++++ .../users/award-user/award-user.component.css | 13 --------- .../users/award-user/award-user.component.ts | 2 +- .../users/edit-user/edit-user.component.ts | 2 +- 31 files changed, 93 insertions(+), 142 deletions(-) create mode 100644 static/src/app/style/overview.css diff --git a/static/src/app/admin/admin.component.css b/static/src/app/admin/admin.component.css index 597fa90..2bd1a07 100644 --- a/static/src/app/admin/admin.component.css +++ b/static/src/app/admin/admin.component.css @@ -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%; +} diff --git a/static/src/app/admin/admin.component.html b/static/src/app/admin/admin.component.html index 1538cdd..f6cc8cc 100644 --- a/static/src/app/admin/admin.component.html +++ b/static/src/app/admin/admin.component.html @@ -3,8 +3,7 @@

Admin Panel

+ class="label label-success label-small"> Erfolgreich gespeichert diff --git a/static/src/app/admin/admin.component.ts b/static/src/app/admin/admin.component.ts index b8ce4b9..87674bf 100644 --- a/static/src/app/admin/admin.component.ts +++ b/static/src/app/admin/admin.component.ts @@ -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 { diff --git a/static/src/app/decorations/edit-decoration/edit-decoration.component.ts b/static/src/app/decorations/edit-decoration/edit-decoration.component.ts index ea4b617..a41c590 100644 --- a/static/src/app/decorations/edit-decoration/edit-decoration.component.ts +++ b/static/src/app/decorations/edit-decoration/edit-decoration.component.ts @@ -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 { diff --git a/static/src/app/ranks/edit-rank/edit-rank.component.ts b/static/src/app/ranks/edit-rank/edit-rank.component.ts index 729488f..2aebc98 100644 --- a/static/src/app/ranks/edit-rank/edit-rank.component.ts +++ b/static/src/app/ranks/edit-rank/edit-rank.component.ts @@ -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 { diff --git a/static/src/app/request/award/req-award.component.css b/static/src/app/request/award/req-award.component.css index d9356a4..a6da309 100644 --- a/static/src/app/request/award/req-award.component.css +++ b/static/src/app/request/award/req-award.component.css @@ -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%; } diff --git a/static/src/app/request/award/req-award.component.html b/static/src/app/request/award/req-award.component.html index 3b4143d..a697b8b 100644 --- a/static/src/app/request/award/req-award.component.html +++ b/static/src/app/request/award/req-award.component.html @@ -17,7 +17,6 @@ -