From 4c068e4cd0e378b562bec09a45df1b5f3c3a5101 Mon Sep 17 00:00:00 2001 From: Florian Hartwich Date: Fri, 6 Oct 2017 20:11:18 +0200 Subject: [PATCH] Rework left outlet css --- api/package.json | 14 ++--- package.json | 2 +- static/package.json | 36 +++++------ static/src/app/app.component.html | 2 +- static/src/app/app.routing.ts | 2 +- .../decoration-list.component.css | 8 --- .../decoration-list.component.html | 62 +++++++++---------- .../decoration-list.component.ts | 2 +- static/src/app/login/login.guard.ts | 11 ++-- .../ranks/rank-list/rank-list.component.css | 8 --- .../ranks/rank-list/rank-list.component.html | 11 ++-- .../ranks/rank-list/rank-list.component.ts | 2 +- static/src/app/ranks/ranks.component.css | 9 --- static/src/app/request/request.module.ts | 2 - .../squad-list/squad-list.component.html | 45 +++++++------- .../squads/squad-list/squad-list.component.ts | 2 +- static/src/app/squads/squads.component.css | 9 --- .../statistic/war-list/war-list.component.css | 4 -- .../war-list/war-list.component.html | 4 +- .../statistic/war-list/war-list.component.ts | 2 +- static/src/app/style/load-indicator.css | 11 ++-- static/src/app/style/select-list.css | 8 +++ .../users/user-list/user-list.component.css | 18 ------ .../users/user-list/user-list.component.html | 61 +++++++++--------- .../users/user-list/user-list.component.ts | 2 +- static/src/app/users/users.module.ts | 2 - static/src/app/utils/chart-utils.ts | 2 +- static/src/styles.css | 5 -- 28 files changed, 139 insertions(+), 207 deletions(-) create mode 100644 static/src/app/style/select-list.css diff --git a/api/package.json b/api/package.json index b1c4c3f..b0a7cd2 100644 --- a/api/package.json +++ b/api/package.json @@ -11,20 +11,20 @@ "e2e": "NODE_ENV=test node server.js" }, "dependencies": { - "async": "^2.4.0", + "async": "^2.5.0", "bcryptjs": "^2.4.3", "body-parser": "~1.13.2", - "cors": "^2.8.3", - "cron": "^1.2.1", + "cors": "^2.8.4", + "cron": "^1.3.0", "debug": "~2.2.0", "express": "^4.16.1", "imagemin": "^5.2.2", "imagemin-pngquant": "^5.0.0", "jimp": "^0.2.27", - "jsonwebtoken": "^7.4.0", + "jsonwebtoken": "^7.4.3", "lodash": "^4.17.4", "mkdirp": "^0.5.1", - "mongoose": "^4.11.4", + "mongoose": "^4.12.0", "morgan": "~1.6.1", "multer": "^1.3.0", "node-sha1": "^1.0.1", @@ -34,7 +34,7 @@ "devDependencies": { "chai": "^3.5.0", "chai-http": "^3.0.0", - "mocha": "^3.3.0", - "nodemon": "^1.11.0" + "mocha": "^3.5.3", + "nodemon": "^1.12.1" } } diff --git a/package.json b/package.json index fe735aa..1152287 100644 --- a/package.json +++ b/package.json @@ -16,7 +16,7 @@ "test-e2e": "npm run e2e --prefix ./static" }, "dependencies": { - "uglify-js": "^3.0.26" + "uglify-js": "^3.1.3" }, "devDependencies": { "concurrently": "^3.4.0", diff --git a/static/package.json b/static/package.json index d26329b..af4a09d 100644 --- a/static/package.json +++ b/static/package.json @@ -11,37 +11,37 @@ "e2e": "ng e2e --serve=false" }, "dependencies": { - "@angular/animations": "^4.3.2", - "@angular/cli": "^1.4.0-rc.2", - "@angular/common": "^4.3.2", - "@angular/compiler": "^4.3.2", - "@angular/compiler-cli": "^4.3.2", - "@angular/core": "^4.3.2", - "@angular/forms": "^4.3.2", - "@angular/http": "^4.3.2", - "@angular/platform-browser": "^4.3.2", - "@angular/platform-browser-dynamic": "^4.3.2", - "@angular/router": "^4.3.2", + "@angular/animations": "^4.4.4", + "@angular/cli": "^1.4.5", + "@angular/common": "^4.4.4", + "@angular/compiler": "^4.4.4", + "@angular/compiler-cli": "^4.4.4", + "@angular/core": "^4.4.4", + "@angular/forms": "^4.4.4", + "@angular/http": "^4.4.4", + "@angular/platform-browser": "^4.4.4", + "@angular/platform-browser-dynamic": "^4.4.4", + "@angular/router": "^4.4.4", "@swimlane/ngx-charts": "^6.0.2", "@swimlane/ngx-datatable": "^10.2.3", "bootstrap": "^3.3.7", "core-js": "^2.4.1", - "d3": "^4.10.0", + "d3": "^4.11.0", "jquery": "^3.1.0", "jquery-ui": "^1.12.0", "jquery-ui-bundle": "^1.11.4", - "ngx-bootstrap": "^1.8.1", - "ngx-clipboard": "^8.0.2", + "ngx-bootstrap": "^1.9.3", + "ngx-clipboard": "^8.1.0", "ngx-cookie-service": "^1.0.9", "rxjs": "^5.2.0", "ts-helpers": "^1.1.1", - "typescript": "^2.3.2", - "webpack": "^3.5.5", - "zone.js": "^0.8.5" + "typescript": "^2.5.3", + "webpack": "^3.6.0", + "zone.js": "^0.8.18" }, "devDependencies": { "@types/jasmine": "2.5.38", - "@types/node": "~6.0.60", + "@types/node": "^6.0.89", "codelyzer": "~2.0.0-beta.1", "jasmine-core": "^2.5.2", "jasmine-spec-reporter": "^3.2.0", diff --git a/static/src/app/app.component.html b/static/src/app/app.component.html index e4e67bf..bb60e51 100644 --- a/static/src/app/app.component.html +++ b/static/src/app/app.component.html @@ -86,7 +86,7 @@ -
+
diff --git a/static/src/app/app.routing.ts b/static/src/app/app.routing.ts index 47e9acd..c9ed43c 100644 --- a/static/src/app/app.routing.ts +++ b/static/src/app/app.routing.ts @@ -1,7 +1,7 @@ import {RouterModule, Routes} from "@angular/router"; import {LoginComponent} from "./login/index"; import {NotFoundComponent} from "./common/not-found/not-found.component"; -import {LoginGuardAdmin, LoginGuardHL, LoginGuardMT, LoginGuardSQL} from "./login/login.guard"; +import {LoginGuardAdmin, LoginGuardHL} from "./login/login.guard"; import {armyRoutes, armyRoutingComponents} from "./army/army.routing"; import {SignupComponent} from "./login/signup.component"; import {RouteConfig} from "./app.config"; diff --git a/static/src/app/decorations/decoration-list/decoration-list.component.css b/static/src/app/decorations/decoration-list/decoration-list.component.css index b7a28c3..e69de29 100644 --- a/static/src/app/decorations/decoration-list/decoration-list.component.css +++ b/static/src/app/decorations/decoration-list/decoration-list.component.css @@ -1,8 +0,0 @@ -.search-bar { - padding-top: 20px; - padding-bottom: 20px; -} - -.decoration-list { - width: 100%; -} diff --git a/static/src/app/decorations/decoration-list/decoration-list.component.html b/static/src/app/decorations/decoration-list/decoration-list.component.html index e54319c..7fe14fe 100644 --- a/static/src/app/decorations/decoration-list/decoration-list.component.html +++ b/static/src/app/decorations/decoration-list/decoration-list.component.html @@ -1,40 +1,36 @@ -
-

Übersicht

-
-
- - - -
- - -
+
+
+ + + +
+ - Neue Auszeichnung hinzufügen + Auszeichnung hinzufügen
-
+
-

Übersicht

-
-
+
+
+
-
+
-

Übersicht

-
-
- - - -
+
+
+ + + - Neues Squad hinzufügen + Squad hinzufügen
diff --git a/static/src/app/squads/squad-list/squad-list.component.ts b/static/src/app/squads/squad-list/squad-list.component.ts index 1c7f435..7128575 100644 --- a/static/src/app/squads/squad-list/squad-list.component.ts +++ b/static/src/app/squads/squad-list/squad-list.component.ts @@ -10,7 +10,7 @@ import {SquadService} from "../../services/squad-service/squad.service"; @Component({ selector: 'squad-list', templateUrl: './squad-list.component.html', - styleUrls: ['./squad-list.component.css'] + styleUrls: ['./squad-list.component.css', '../../style/select-list.css'] }) export class SquadListComponent implements OnInit { diff --git a/static/src/app/squads/squads.component.css b/static/src/app/squads/squads.component.css index d9e6a0b..e69de29 100644 --- a/static/src/app/squads/squads.component.css +++ b/static/src/app/squads/squads.component.css @@ -1,9 +0,0 @@ -#left { - width: 320px; - float: left; - padding-right: 10px; -} - -#right { - overflow: hidden -} diff --git a/static/src/app/statistic/war-list/war-list.component.css b/static/src/app/statistic/war-list/war-list.component.css index 2f7bdfe..a4a0c63 100644 --- a/static/src/app/statistic/war-list/war-list.component.css +++ b/static/src/app/statistic/war-list/war-list.component.css @@ -1,7 +1,3 @@ -.war-list { - padding-top: 30px; -} - :host /deep/ .card-header { background-color: rgba(34, 34, 34, 0.80); cursor: pointer; diff --git a/static/src/app/statistic/war-list/war-list.component.html b/static/src/app/statistic/war-list/war-list.component.html index 5e1d82c..1373b04 100644 --- a/static/src/app/statistic/war-list/war-list.component.html +++ b/static/src/app/statistic/war-list/war-list.component.html @@ -1,5 +1,5 @@ -
-
+
+
Schlacht hinzufügen diff --git a/static/src/app/statistic/war-list/war-list.component.ts b/static/src/app/statistic/war-list/war-list.component.ts index c602849..9fdcfca 100644 --- a/static/src/app/statistic/war-list/war-list.component.ts +++ b/static/src/app/statistic/war-list/war-list.component.ts @@ -8,7 +8,7 @@ import {CampaignService} from "../../services/campaign-service/campaign.service" @Component({ selector: 'war-list', templateUrl: './war-list.component.html', - styleUrls: ['./war-list.component.css', '../../style/list-entry.css'] + styleUrls: ['./war-list.component.css', '../../style/list-entry.css', '../../style/select-list.css'] }) export class WarListComponent implements OnInit { diff --git a/static/src/app/style/load-indicator.css b/static/src/app/style/load-indicator.css index c35686d..f224632 100644 --- a/static/src/app/style/load-indicator.css +++ b/static/src/app/style/load-indicator.css @@ -1,9 +1,10 @@ .load-indicator { - position:absolute; - top:50%; - left:50%; - transform:translate(-50%, -50%); - width:50%; + position: absolute; + top: 50%; + left: 50%; + transform: translate(-50%, -50%); + width: 50%; + z-index: 1; } .load-arrow { diff --git a/static/src/app/style/select-list.css b/static/src/app/style/select-list.css new file mode 100644 index 0000000..5f6de97 --- /dev/null +++ b/static/src/app/style/select-list.css @@ -0,0 +1,8 @@ +.select-list { + padding: 20px 2% 0 5%; +} + +.list-header { + width: 100%; + padding-bottom: 20px; +} diff --git a/static/src/app/users/user-list/user-list.component.css b/static/src/app/users/user-list/user-list.component.css index 5f46bf0..e69de29 100644 --- a/static/src/app/users/user-list/user-list.component.css +++ b/static/src/app/users/user-list/user-list.component.css @@ -1,18 +0,0 @@ -.search-bar { - padding-top: 20px; - padding-bottom: 20px; -} - -.user-list { - width: 100%; -} - -.fraction-blufor { - color: mediumblue; - font-weight: bold; -} - -.fraction-opfor { - color: red; - font-weight: bold; -} diff --git a/static/src/app/users/user-list/user-list.component.html b/static/src/app/users/user-list/user-list.component.html index b160437..94e311e 100644 --- a/static/src/app/users/user-list/user-list.component.html +++ b/static/src/app/users/user-list/user-list.component.html @@ -1,39 +1,36 @@ -
-

Übersicht

-
-
- - - -
- -
+
+
+ + + +
+ - Neuen Teilnehmer hinzufügen + Teilnehmer hinzufügen
-
+