From dfb8985e2fa2a32ddf3d88f7ba846420f8252ea5 Mon Sep 17 00:00:00 2001 From: HardiReady Date: Sun, 17 Feb 2019 20:25:57 +0100 Subject: [PATCH 1/7] Improve chart labels for flag chart (CC-72) --- .../war/fraction-stats/fraction-stats.component.html | 1 + .../war/fraction-stats/fraction-stats.component.ts | 8 +++++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/static/src/app/statistic/war/fraction-stats/fraction-stats.component.html b/static/src/app/statistic/war/fraction-stats/fraction-stats.component.html index c171625..498b206 100644 --- a/static/src/app/statistic/war/fraction-stats/fraction-stats.component.html +++ b/static/src/app/statistic/war/fraction-stats/fraction-stats.component.html @@ -37,6 +37,7 @@ [legendTitle]="legendTitle" [showXAxisLabel]="showXAxisLabel" [showYAxisLabel]="showYAxisLabel" + [yAxisLabel]="chartYAxisLabel" [animations]="barAnimations" [barPadding]="barPadding" [xAxisTickFormatting]="axisFormatX" diff --git a/static/src/app/statistic/war/fraction-stats/fraction-stats.component.ts b/static/src/app/statistic/war/fraction-stats/fraction-stats.component.ts index a2fc238..bbe213e 100644 --- a/static/src/app/statistic/war/fraction-stats/fraction-stats.component.ts +++ b/static/src/app/statistic/war/fraction-stats/fraction-stats.component.ts @@ -134,9 +134,9 @@ export class FractionStatsComponent implements OnInit, OnChanges { selectChart(newSelection) { this.activeChartSelect = newSelection; + this.setChartYAxisLabel(this.activeChartSelect); if (this.activeChartSelect !== this.labels.flag) { this.showLineChart = true; - this.setChartYAxisLabel(this.activeChartSelect); switch (this.activeChartSelect) { case this.labels.points: this.lineChartData = this.tmpPointData; @@ -506,6 +506,12 @@ export class FractionStatsComponent implements OnInit, OnChanges { } axisFormatY(val) { + if (val === 1) { + return Fraction.BLUFOR; + } + if (val === -1) { + return Fraction.OPFOR; + } return ''; } } -- 2.25.1 From 66e5b2db9e4ab1912911db34659944634c32b836 Mon Sep 17 00:00:00 2001 From: HardiReady Date: Tue, 19 Feb 2019 20:29:37 +0100 Subject: [PATCH 2/7] Use sass to drop duplicated background image definition --- package.json | 2 +- ...mponent.css => army-member.component.scss} | 15 +----------- .../army/army-member/army-member.component.ts | 6 ++--- static/src/app/army/army.component.scss | 24 +++++++++++++++++++ static/src/app/army/army.component.ts | 2 +- ...css => decoration-overview.component.scss} | 14 +---------- .../decoration-overview.component.ts | 2 +- ...onent.css => rank-overview.component.scss} | 15 +----------- .../rank-overview/rank-overview.component.ts | 2 +- .../background-image.scss} | 23 ------------------ 10 files changed, 33 insertions(+), 72 deletions(-) rename static/src/app/army/army-member/{army-member.component.css => army-member.component.scss} (64%) create mode 100644 static/src/app/army/army.component.scss rename static/src/app/pub/decoration-overview/{decoration-overview.component.css => decoration-overview.component.scss} (83%) rename static/src/app/pub/rank-overview/{rank-overview.component.css => rank-overview.component.scss} (57%) rename static/src/app/{army/army.component.css => style/background-image.scss} (52%) diff --git a/package.json b/package.json index c77239e..0fa12db 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "opt-cc", - "version": "1.9.2", + "version": "1.9.3", "author": "Florian Hartwich ", "private": true, "scripts": { diff --git a/static/src/app/army/army-member/army-member.component.css b/static/src/app/army/army-member/army-member.component.scss similarity index 64% rename from static/src/app/army/army-member/army-member.component.css rename to static/src/app/army/army-member/army-member.component.scss index abb3b2a..994c654 100644 --- a/static/src/app/army/army-member/army-member.component.css +++ b/static/src/app/army/army-member/army-member.component.scss @@ -1,17 +1,4 @@ -:host { - display: flow-root; - height: 100%; - min-height: 100vh; - width: 100%; - margin-top: -23px; - padding-top: 23px; - padding-bottom: 23px; - background-image: url('../../../assets/bg.jpg'); - background-size: cover; - background-attachment: fixed; - background-position: top; - background-repeat: no-repeat; -} +@import url('../../style/background-image.scss'); .army-member-view { width: 90%; diff --git a/static/src/app/army/army-member/army-member.component.ts b/static/src/app/army/army-member/army-member.component.ts index 6365712..4874bb3 100644 --- a/static/src/app/army/army-member/army-member.component.ts +++ b/static/src/app/army/army-member/army-member.component.ts @@ -1,9 +1,8 @@ -import {Component, Inject, OnDestroy, OnInit} from '@angular/core'; +import {Component, OnInit} from '@angular/core'; import {Award, User} from '../../models/model-interfaces'; import {ActivatedRoute, Router} from '@angular/router'; import {UserService} from '../../services/army-management/user.service'; import {Subscription} from 'rxjs/Subscription'; -import {RouteConfig} from '../../app.config'; import {AwardingService} from '../../services/army-management/awarding.service'; import {Fraction} from '../../utils/fraction.enum'; import {Location} from '@angular/common'; @@ -11,7 +10,7 @@ import {Location} from '@angular/common'; @Component({ selector: 'army-member', templateUrl: './army-member.component.html', - styleUrls: ['./army-member.component.css'] + styleUrls: ['./army-member.component.scss'] }) export class ArmyMemberComponent implements OnInit { @@ -35,7 +34,6 @@ export class ArmyMemberComponent implements OnInit { } ngOnInit() { - this.subscription = this.route.params .map(params => params['id']) .filter(id => id !== undefined) diff --git a/static/src/app/army/army.component.scss b/static/src/app/army/army.component.scss new file mode 100644 index 0000000..a140bb4 --- /dev/null +++ b/static/src/app/army/army.component.scss @@ -0,0 +1,24 @@ +@import url('../style/background-image.scss'); + +.army-column { + width: 45%; +} + +h1 { + text-align: center; +} + +.army-head { + font-weight: bolder; + text-align: center +} + +.member-count { + margin-top: 15px; + padding: 8px; + text-align: center; + font-weight: bold; + color: whitesmoke; + background: #222222; + border-radius: 12px; +} diff --git a/static/src/app/army/army.component.ts b/static/src/app/army/army.component.ts index 8d63753..31e2c9e 100644 --- a/static/src/app/army/army.component.ts +++ b/static/src/app/army/army.component.ts @@ -8,7 +8,7 @@ import {Fraction} from '../utils/fraction.enum'; @Component({ selector: 'cc-army', templateUrl: './army.component.html', - styleUrls: ['./army.component.css'] + styleUrls: ['./army.component.scss'] }) export class ArmyComponent implements OnInit { diff --git a/static/src/app/pub/decoration-overview/decoration-overview.component.css b/static/src/app/pub/decoration-overview/decoration-overview.component.scss similarity index 83% rename from static/src/app/pub/decoration-overview/decoration-overview.component.css rename to static/src/app/pub/decoration-overview/decoration-overview.component.scss index 212fce8..eca320f 100644 --- a/static/src/app/pub/decoration-overview/decoration-overview.component.css +++ b/static/src/app/pub/decoration-overview/decoration-overview.component.scss @@ -1,16 +1,4 @@ -:host { - display: flow-root; - height: 100%; - width: 100%; - margin-top: -23px; - padding-top: 23px; - padding-bottom: 23px; - background-image: url('../../../assets/bg.jpg'); - background-size: cover; - background-attachment: fixed; - background-position: top; - background-repeat: no-repeat; -} +@import url('../../style/background-image.scss'); h1 { margin-bottom: 30px; diff --git a/static/src/app/pub/decoration-overview/decoration-overview.component.ts b/static/src/app/pub/decoration-overview/decoration-overview.component.ts index b2de28d..1d5e5b4 100644 --- a/static/src/app/pub/decoration-overview/decoration-overview.component.ts +++ b/static/src/app/pub/decoration-overview/decoration-overview.component.ts @@ -12,7 +12,7 @@ import {Location} from '@angular/common'; @Component({ selector: 'cc-decoration-overview', templateUrl: './decoration-overview.component.html', - styleUrls: ['./decoration-overview.component.css'] + styleUrls: ['./decoration-overview.component.scss'] }) export class DecorationOverviewComponent implements OnInit, OnDestroy { diff --git a/static/src/app/pub/rank-overview/rank-overview.component.css b/static/src/app/pub/rank-overview/rank-overview.component.scss similarity index 57% rename from static/src/app/pub/rank-overview/rank-overview.component.css rename to static/src/app/pub/rank-overview/rank-overview.component.scss index 3c29700..6d06b56 100644 --- a/static/src/app/pub/rank-overview/rank-overview.component.css +++ b/static/src/app/pub/rank-overview/rank-overview.component.scss @@ -1,17 +1,4 @@ -:host { - display: flow-root; - height: 100%; - min-height: 100vh; - width: 100%; - margin-top: -23px; - padding-top: 23px; - padding-bottom: 23px; - background-image: url('../../../assets/bg.jpg'); - background-size: cover; - background-attachment: fixed; - background-position: top; - background-repeat: no-repeat; -} +@import url('../../style/background-image.scss'); table { width: 100%; diff --git a/static/src/app/pub/rank-overview/rank-overview.component.ts b/static/src/app/pub/rank-overview/rank-overview.component.ts index f4931b3..841a463 100644 --- a/static/src/app/pub/rank-overview/rank-overview.component.ts +++ b/static/src/app/pub/rank-overview/rank-overview.component.ts @@ -10,7 +10,7 @@ import {UserListSheetComponent} from '../user-list-sheet/user-list-sheet.compone @Component({ selector: 'cc-rank-overview', templateUrl: './rank-overview.component.html', - styleUrls: ['./rank-overview.component.css'] + styleUrls: ['./rank-overview.component.scss'] }) export class RankOverviewComponent implements OnInit, OnDestroy { diff --git a/static/src/app/army/army.component.css b/static/src/app/style/background-image.scss similarity index 52% rename from static/src/app/army/army.component.css rename to static/src/app/style/background-image.scss index dcb92f5..e661470 100644 --- a/static/src/app/army/army.component.css +++ b/static/src/app/style/background-image.scss @@ -12,26 +12,3 @@ background-position: top; background-repeat: no-repeat; } - -.army-column { - width: 45%; -} - -h1 { - text-align: center; -} - -.army-head { - font-weight: bolder; - text-align: center -} - -.member-count { - margin-top: 15px; - padding: 8px; - text-align: center; - font-weight: bold; - color: whitesmoke; - background: #222222; - border-radius: 12px; -} -- 2.25.1 From 143fb734f312e1cd6865f68207706a0fefa5c94c Mon Sep 17 00:00:00 2001 From: HardiReady Date: Fri, 22 Feb 2019 08:14:46 +0100 Subject: [PATCH 3/7] Go 100% SASS (CC-28) --- static/angular.json | 7 ++++--- static/src/app/admin/admin.component.scss | 1 + static/src/app/admin/admin.component.ts | 2 +- .../edit-app-user/edit-app-user.component.scss | 2 ++ .../admin/edit-app-user/edit-app-user.component.ts | 2 +- .../user-list/app-user-item.component.scss} | 2 ++ .../app/admin/user-list/app-user-item.component.ts | 2 +- .../app/admin/user-list/app-user-list.component.css | 0 .../admin/user-list/app-user-list.component.scss | 1 + .../app/admin/user-list/app-user-list.component.ts | 2 +- ...quad.component.css => army-squad.component.scss} | 0 .../src/app/army/army-squad/army-squad.component.ts | 2 +- .../app/common/not-found/not-found.component.css | 0 .../not-found/not-found.component.scss} | 0 .../src/app/common/not-found/not-found.component.ts | 2 +- ...ter.component.css => list-filter.component.scss} | 0 .../list-filter/list-filter.component.ts | 2 +- ...ld.component.css => search-field.component.scss} | 0 .../search-field/search-field.component.ts | 2 +- .../{login.component.css => login.component.scss} | 0 static/src/app/login/login.component.ts | 2 +- static/src/app/login/signup.component.ts | 2 +- .../decoration-list/decoration-item.component.css | 0 .../decoration-list/decoration-item.component.scss | 1 + .../decoration-list/decoration-item.component.ts | 2 +- .../decoration-list/decoration-list.component.css | 0 .../decoration-list/decoration-list.component.scss | 1 + .../decoration-list/decoration-list.component.ts | 2 +- .../edit-decoration/edit-decoration.component.css | 0 .../edit-decoration/edit-decoration.component.scss | 2 ++ .../edit-decoration/edit-decoration.component.ts | 2 +- .../manage/ranks/edit-rank/edit-rank.component.css | 1 - .../manage/ranks/edit-rank/edit-rank.component.scss | 2 ++ .../manage/ranks/edit-rank/edit-rank.component.ts | 2 +- ...-item.component.css => rank-item.component.scss} | 2 ++ .../manage/ranks/rank-list/rank-item.component.ts | 2 +- .../manage/ranks/rank-list/rank-list.component.css | 0 .../manage/ranks/rank-list/rank-list.component.scss | 1 + .../manage/ranks/rank-list/rank-list.component.ts | 2 +- .../squads/edit-squad/edit-squad.component.css | 0 .../squads/edit-squad/edit-squad.component.scss | 2 ++ .../squads/edit-squad/edit-squad.component.ts | 2 +- .../squads/squad-list/squad-item.component.css | 0 .../squads/squad-list/squad-item.component.scss | 1 + .../squads/squad-list/squad-item.component.ts | 2 +- .../squads/squad-list/squad-list.component.css | 3 --- .../squads/squad-list/squad-list.component.scss | 5 +++++ .../squads/squad-list/squad-list.component.ts | 2 +- ...user.component.css => award-user.component.scss} | 3 +++ .../manage/users/award-user/award-user.component.ts | 2 +- .../manage/users/edit-user/edit-user.component.css | 0 .../manage/users/edit-user/edit-user.component.scss | 2 ++ .../manage/users/edit-user/edit-user.component.ts | 2 +- .../users/user-list/user-item.component.scss} | 2 ++ .../manage/users/user-list/user-item.component.ts | 2 +- .../manage/users/user-list/user-list.component.css | 0 .../manage/users/user-list/user-list.component.scss | 1 + .../manage/users/user-list/user-list.component.ts | 2 +- ...omponent.css => decoration-panel.component.scss} | 0 .../decoration-panel/decoration-panel.component.ts | 2 +- ...anel.component.css => rank-panel.component.scss} | 0 .../rank-panel/rank-panel.component.ts | 2 +- ...award.component.css => req-award.component.scss} | 2 ++ static/src/app/request/award/req-award.component.ts | 2 +- ...d.component.css => confirm-award.component.scss} | 2 ++ .../confirm-award/confirm-award.component.ts | 2 +- ...mponent.css => confirm-promotion.component.scss} | 2 ++ .../confirm-promotion.component.ts | 2 +- ...n.component.css => req-promotion.component.scss} | 2 ++ .../request/promotion/req-promotion.component.ts | 2 +- static/src/app/request/request.component.css | 0 .../request.component.scss} | 0 static/src/app/request/request.component.ts | 2 +- ...d.component.css => sql-dashboard.component.scss} | 2 ++ .../sql-dashboard/sql-dashboard.component.ts | 2 +- ...onent.css => campaign-navigation.component.scss} | 0 .../campaign-navigation.component.ts | 2 +- .../campaign-player-detail.component.scss | 4 ++++ .../campaign-player-detail.component.ts | 3 +-- .../campaign-submit/campaign-submit.component.css | 3 --- .../campaign-submit/campaign-submit.component.scss | 6 ++++++ .../campaign-submit/campaign-submit.component.ts | 2 +- ...score.component.css => highscore.component.scss} | 13 ++++++++++--- .../campaign/highscore/highscore.component.ts | 2 +- ...mponent.css => campaign-overview.component.scss} | 0 .../overview/campaign-overview.component.ts | 2 +- .../{stats.component.css => stats.component.scss} | 0 static/src/app/statistic/stats.component.ts | 2 +- .../fraction-stats/fraction-stats.component.scss | 3 +++ .../war/fraction-stats/fraction-stats.component.ts | 2 +- ...oard.component.css => scoreboard.component.scss} | 3 +++ .../war/scoreboard/scoreboard.component.ts | 2 +- .../war/server-stats/server-stats.component.scss | 3 +++ .../war/server-stats/server-stats.component.ts | 2 +- .../war/war-header/war-header.component.scss | 3 +++ .../war/war-header/war-header.component.ts | 2 +- ...r-item.component.css => war-item.component.scss} | 0 .../statistic/war/war-list/war-item.component.ts | 2 +- ...r-list.component.css => war-list.component.scss} | 0 .../statistic/war/war-list/war-list.component.ts | 2 +- .../war/war-submit/war-submit.component.css | 3 --- .../war/war-submit/war-submit.component.scss | 6 ++++++ .../war/war-submit/war-submit.component.ts | 2 +- static/src/app/style/background-image.scss | 1 + .../app/style/{entry-form.css => entry-form.scss} | 0 .../{hide-scrollbar.css => hide-scrollbar.scss} | 0 .../app/style/{list-entry.css => list-entry.scss} | 0 .../src/app/style/{overview.css => overview.scss} | 0 .../app/style/{select-list.css => select-list.scss} | 1 + static/src/assets/icon/general/opt-logo-core.svg | 2 +- static/src/{styles.css => styles.scss} | 2 -- 111 files changed, 130 insertions(+), 64 deletions(-) create mode 100644 static/src/app/admin/admin.component.scss create mode 100644 static/src/app/admin/edit-app-user/edit-app-user.component.scss rename static/src/app/{manage/users/user-list/user-item.component.css => admin/user-list/app-user-item.component.scss} (65%) delete mode 100644 static/src/app/admin/user-list/app-user-list.component.css create mode 100644 static/src/app/admin/user-list/app-user-list.component.scss rename static/src/app/army/army-squad/{army-squad.component.css => army-squad.component.scss} (100%) delete mode 100644 static/src/app/common/not-found/not-found.component.css rename static/src/app/{admin/admin.component.css => common/not-found/not-found.component.scss} (100%) rename static/src/app/common/user-interface/list-filter/{list-filter.component.css => list-filter.component.scss} (100%) rename static/src/app/common/user-interface/search-field/{search-field.component.css => search-field.component.scss} (100%) rename static/src/app/login/{login.component.css => login.component.scss} (100%) delete mode 100644 static/src/app/manage/decorations/decoration-list/decoration-item.component.css create mode 100644 static/src/app/manage/decorations/decoration-list/decoration-item.component.scss delete mode 100644 static/src/app/manage/decorations/decoration-list/decoration-list.component.css create mode 100644 static/src/app/manage/decorations/decoration-list/decoration-list.component.scss delete mode 100644 static/src/app/manage/decorations/edit-decoration/edit-decoration.component.css create mode 100644 static/src/app/manage/decorations/edit-decoration/edit-decoration.component.scss delete mode 100644 static/src/app/manage/ranks/edit-rank/edit-rank.component.css create mode 100644 static/src/app/manage/ranks/edit-rank/edit-rank.component.scss rename static/src/app/manage/ranks/rank-list/{rank-item.component.css => rank-item.component.scss} (61%) delete mode 100644 static/src/app/manage/ranks/rank-list/rank-list.component.css create mode 100644 static/src/app/manage/ranks/rank-list/rank-list.component.scss delete mode 100644 static/src/app/manage/squads/edit-squad/edit-squad.component.css create mode 100644 static/src/app/manage/squads/edit-squad/edit-squad.component.scss delete mode 100644 static/src/app/manage/squads/squad-list/squad-item.component.css create mode 100644 static/src/app/manage/squads/squad-list/squad-item.component.scss delete mode 100644 static/src/app/manage/squads/squad-list/squad-list.component.css create mode 100644 static/src/app/manage/squads/squad-list/squad-list.component.scss rename static/src/app/manage/users/award-user/{award-user.component.css => award-user.component.scss} (79%) delete mode 100644 static/src/app/manage/users/edit-user/edit-user.component.css create mode 100644 static/src/app/manage/users/edit-user/edit-user.component.scss rename static/src/app/{admin/user-list/app-user-item.component.css => manage/users/user-list/user-item.component.scss} (64%) delete mode 100644 static/src/app/manage/users/user-list/user-list.component.css create mode 100644 static/src/app/manage/users/user-list/user-list.component.scss rename static/src/app/pub/decoration-overview/decoration-panel/{decoration-panel.component.css => decoration-panel.component.scss} (100%) rename static/src/app/pub/rank-overview/rank-panel/{rank-panel.component.css => rank-panel.component.scss} (100%) rename static/src/app/request/award/{req-award.component.css => req-award.component.scss} (90%) rename static/src/app/request/confirm-award/{confirm-award.component.css => confirm-award.component.scss} (88%) rename static/src/app/request/confirm-promotion/{confirm-promotion.component.css => confirm-promotion.component.scss} (88%) rename static/src/app/request/promotion/{req-promotion.component.css => req-promotion.component.scss} (89%) delete mode 100644 static/src/app/request/request.component.css rename static/src/app/{admin/edit-app-user/edit-app-user.component.css => request/request.component.scss} (100%) rename static/src/app/request/sql-dashboard/{sql-dashboard.component.css => sql-dashboard.component.scss} (87%) rename static/src/app/statistic/campaign/campaign-navigation/{campaign-navigation.component.css => campaign-navigation.component.scss} (100%) delete mode 100644 static/src/app/statistic/campaign/campaign-submit/campaign-submit.component.css create mode 100644 static/src/app/statistic/campaign/campaign-submit/campaign-submit.component.scss rename static/src/app/statistic/campaign/highscore/{highscore.component.css => highscore.component.scss} (83%) rename static/src/app/statistic/campaign/overview/{campaign-overview.component.css => campaign-overview.component.scss} (100%) rename static/src/app/statistic/{stats.component.css => stats.component.scss} (100%) rename static/src/app/statistic/war/scoreboard/{scoreboard.component.css => scoreboard.component.scss} (89%) rename static/src/app/statistic/war/war-list/{war-item.component.css => war-item.component.scss} (100%) rename static/src/app/statistic/war/war-list/{war-list.component.css => war-list.component.scss} (100%) delete mode 100644 static/src/app/statistic/war/war-submit/war-submit.component.css create mode 100644 static/src/app/statistic/war/war-submit/war-submit.component.scss rename static/src/app/style/{entry-form.css => entry-form.scss} (100%) rename static/src/app/style/{hide-scrollbar.css => hide-scrollbar.scss} (100%) rename static/src/app/style/{list-entry.css => list-entry.scss} (100%) rename static/src/app/style/{overview.css => overview.scss} (100%) rename static/src/app/style/{select-list.css => select-list.scss} (56%) rename static/src/{styles.css => styles.scss} (92%) diff --git a/static/angular.json b/static/angular.json index e50d100..aaf9de9 100644 --- a/static/angular.json +++ b/static/angular.json @@ -21,9 +21,10 @@ "src/favicon.ico" ], "styles": [ - "src/styles.css", + "src/styles.scss", "node_modules/jquery-ui-bundle/jquery-ui.css", - "node_modules/bootstrap/dist/css/bootstrap.min.css" + "node_modules/bootstrap/dist/css/bootstrap.min.css", + "node_modules/@angular/material/prebuilt-themes/deeppurple-amber.css", ], "scripts": [ "node_modules/jquery/dist/jquery.js", @@ -146,4 +147,4 @@ "prefix": "app" } } -} \ No newline at end of file +} diff --git a/static/src/app/admin/admin.component.scss b/static/src/app/admin/admin.component.scss new file mode 100644 index 0000000..88c0ab7 --- /dev/null +++ b/static/src/app/admin/admin.component.scss @@ -0,0 +1 @@ +@import url('../style/overview.scss'); diff --git a/static/src/app/admin/admin.component.ts b/static/src/app/admin/admin.component.ts index ddc9b5f..477d8a6 100644 --- a/static/src/app/admin/admin.component.ts +++ b/static/src/app/admin/admin.component.ts @@ -3,7 +3,7 @@ import {Component} from '@angular/core'; @Component({ selector: 'cc-admin-component', templateUrl: './admin.component.html', - styleUrls: ['./admin.component.css', '../style/overview.css'] + styleUrls: ['./admin.component.scss'] }) export class AdminComponent { constructor() { diff --git a/static/src/app/admin/edit-app-user/edit-app-user.component.scss b/static/src/app/admin/edit-app-user/edit-app-user.component.scss new file mode 100644 index 0000000..5602a13 --- /dev/null +++ b/static/src/app/admin/edit-app-user/edit-app-user.component.scss @@ -0,0 +1,2 @@ +@import url('../../style/entry-form.scss'); +@import url('../../style/overview.scss'); diff --git a/static/src/app/admin/edit-app-user/edit-app-user.component.ts b/static/src/app/admin/edit-app-user/edit-app-user.component.ts index 6831aa4..15c4aad 100644 --- a/static/src/app/admin/edit-app-user/edit-app-user.component.ts +++ b/static/src/app/admin/edit-app-user/edit-app-user.component.ts @@ -11,7 +11,7 @@ import {AppUserService} from '../../services/app-user-service/app-user.service'; @Component({ templateUrl: './edit-app-user.component.html', - styleUrls: ['./edit-app-user.component.css', '../../style/entry-form.css', '../../style/overview.css'], + styleUrls: ['./edit-app-user.component.scss'], }) export class EditAppUserComponent implements OnInit { diff --git a/static/src/app/manage/users/user-list/user-item.component.css b/static/src/app/admin/user-list/app-user-item.component.scss similarity index 65% rename from static/src/app/manage/users/user-list/user-item.component.css rename to static/src/app/admin/user-list/app-user-item.component.scss index 458e2b3..3e4e327 100644 --- a/static/src/app/manage/users/user-list/user-item.component.css +++ b/static/src/app/admin/user-list/app-user-item.component.scss @@ -1,3 +1,5 @@ +@import url('../../style/list-entry.scss'); + .icon-award { width: 27px; height: 42px; diff --git a/static/src/app/admin/user-list/app-user-item.component.ts b/static/src/app/admin/user-list/app-user-item.component.ts index 8e0a708..17e3dd9 100644 --- a/static/src/app/admin/user-list/app-user-item.component.ts +++ b/static/src/app/admin/user-list/app-user-item.component.ts @@ -5,7 +5,7 @@ import {Fraction} from '../../utils/fraction.enum'; @Component({ selector: 'cc-app-user-item', templateUrl: './app-user-item.component.html', - styleUrls: ['./app-user-item.component.css', '../../style/list-entry.css'], + styleUrls: ['./app-user-item.component.scss'], changeDetection: ChangeDetectionStrategy.OnPush }) export class AppUserItemComponent { diff --git a/static/src/app/admin/user-list/app-user-list.component.css b/static/src/app/admin/user-list/app-user-list.component.css deleted file mode 100644 index e69de29..0000000 diff --git a/static/src/app/admin/user-list/app-user-list.component.scss b/static/src/app/admin/user-list/app-user-list.component.scss new file mode 100644 index 0000000..959f5b3 --- /dev/null +++ b/static/src/app/admin/user-list/app-user-list.component.scss @@ -0,0 +1 @@ +@import url('../../style/select-list.scss'); diff --git a/static/src/app/admin/user-list/app-user-list.component.ts b/static/src/app/admin/user-list/app-user-list.component.ts index 9c440d5..7092e64 100644 --- a/static/src/app/admin/user-list/app-user-list.component.ts +++ b/static/src/app/admin/user-list/app-user-list.component.ts @@ -14,7 +14,7 @@ import {SquadService} from '../../services/army-management/squad.service'; @Component({ selector: 'cc-app-user-list', templateUrl: './app-user-list.component.html', - styleUrls: ['./app-user-list.component.css', '../../style/select-list.css'] + styleUrls: ['./app-user-list.component.scss'] }) export class AppUserListComponent { diff --git a/static/src/app/army/army-squad/army-squad.component.css b/static/src/app/army/army-squad/army-squad.component.scss similarity index 100% rename from static/src/app/army/army-squad/army-squad.component.css rename to static/src/app/army/army-squad/army-squad.component.scss diff --git a/static/src/app/army/army-squad/army-squad.component.ts b/static/src/app/army/army-squad/army-squad.component.ts index 291b22c..ceeda96 100644 --- a/static/src/app/army/army-squad/army-squad.component.ts +++ b/static/src/app/army/army-squad/army-squad.component.ts @@ -5,7 +5,7 @@ import {Fraction} from '../../utils/fraction.enum'; @Component({ selector: 'cc-army-squad', templateUrl: './army-squad.component.html', - styleUrls: ['./army-squad.component.css'] + styleUrls: ['./army-squad.component.scss'] }) export class ArmySquadComponent { diff --git a/static/src/app/common/not-found/not-found.component.css b/static/src/app/common/not-found/not-found.component.css deleted file mode 100644 index e69de29..0000000 diff --git a/static/src/app/admin/admin.component.css b/static/src/app/common/not-found/not-found.component.scss similarity index 100% rename from static/src/app/admin/admin.component.css rename to static/src/app/common/not-found/not-found.component.scss diff --git a/static/src/app/common/not-found/not-found.component.ts b/static/src/app/common/not-found/not-found.component.ts index da584de..c65903a 100644 --- a/static/src/app/common/not-found/not-found.component.ts +++ b/static/src/app/common/not-found/not-found.component.ts @@ -3,7 +3,7 @@ import {Component, OnInit} from '@angular/core'; @Component({ selector: 'app-not-found', templateUrl: 'not-found.component.html', - styleUrls: ['not-found.component.css'] + styleUrls: ['not-found.component.scss'] }) export class NotFoundComponent implements OnInit { diff --git a/static/src/app/common/user-interface/list-filter/list-filter.component.css b/static/src/app/common/user-interface/list-filter/list-filter.component.scss similarity index 100% rename from static/src/app/common/user-interface/list-filter/list-filter.component.css rename to static/src/app/common/user-interface/list-filter/list-filter.component.scss diff --git a/static/src/app/common/user-interface/list-filter/list-filter.component.ts b/static/src/app/common/user-interface/list-filter/list-filter.component.ts index b3c7dd2..06eae8d 100644 --- a/static/src/app/common/user-interface/list-filter/list-filter.component.ts +++ b/static/src/app/common/user-interface/list-filter/list-filter.component.ts @@ -4,7 +4,7 @@ import {Fraction} from '../../../utils/fraction.enum'; @Component({ selector: 'cc-list-filter', templateUrl: './list-filter.component.html', - styleUrls: ['./list-filter.component.css'] + styleUrls: ['./list-filter.component.scss'] }) export class ListFilterComponent { diff --git a/static/src/app/common/user-interface/search-field/search-field.component.css b/static/src/app/common/user-interface/search-field/search-field.component.scss similarity index 100% rename from static/src/app/common/user-interface/search-field/search-field.component.css rename to static/src/app/common/user-interface/search-field/search-field.component.scss diff --git a/static/src/app/common/user-interface/search-field/search-field.component.ts b/static/src/app/common/user-interface/search-field/search-field.component.ts index 28477d1..31372da 100644 --- a/static/src/app/common/user-interface/search-field/search-field.component.ts +++ b/static/src/app/common/user-interface/search-field/search-field.component.ts @@ -5,7 +5,7 @@ import {ActivatedRoute} from '@angular/router'; @Component({ selector: 'cc-list-search', templateUrl: './search-field.component.html', - styleUrls: ['./search-field.component.css'] + styleUrls: ['./search-field.component.scss'] }) export class SearchFieldComponent implements OnInit { diff --git a/static/src/app/login/login.component.css b/static/src/app/login/login.component.scss similarity index 100% rename from static/src/app/login/login.component.css rename to static/src/app/login/login.component.scss diff --git a/static/src/app/login/login.component.ts b/static/src/app/login/login.component.ts index 35c93a9..e4e22e2 100644 --- a/static/src/app/login/login.component.ts +++ b/static/src/app/login/login.component.ts @@ -8,7 +8,7 @@ import {SnackBarService} from '../services/user-interface/snack-bar/snack-bar.se @Component({ moduleId: module.id, templateUrl: 'login.component.html', - styleUrls: ['login.component.css'] + styleUrls: ['login.component.scss'] }) export class LoginComponent implements OnInit { diff --git a/static/src/app/login/signup.component.ts b/static/src/app/login/signup.component.ts index 6d1db48..95b8599 100644 --- a/static/src/app/login/signup.component.ts +++ b/static/src/app/login/signup.component.ts @@ -8,7 +8,7 @@ import {SnackBarService} from '../services/user-interface/snack-bar/snack-bar.se @Component({ moduleId: module.id, templateUrl: './signup.component.html', - styleUrls: ['./login.component.css'] + styleUrls: ['./login.component.scss'] }) export class SignupComponent implements OnInit { diff --git a/static/src/app/manage/decorations/decoration-list/decoration-item.component.css b/static/src/app/manage/decorations/decoration-list/decoration-item.component.css deleted file mode 100644 index e69de29..0000000 diff --git a/static/src/app/manage/decorations/decoration-list/decoration-item.component.scss b/static/src/app/manage/decorations/decoration-list/decoration-item.component.scss new file mode 100644 index 0000000..709770c --- /dev/null +++ b/static/src/app/manage/decorations/decoration-list/decoration-item.component.scss @@ -0,0 +1 @@ +@import url('../../../style/list-entry.scss'); diff --git a/static/src/app/manage/decorations/decoration-list/decoration-item.component.ts b/static/src/app/manage/decorations/decoration-list/decoration-item.component.ts index 7254b1a..92d7ad7 100644 --- a/static/src/app/manage/decorations/decoration-list/decoration-item.component.ts +++ b/static/src/app/manage/decorations/decoration-list/decoration-item.component.ts @@ -5,7 +5,7 @@ import {Fraction} from '../../../utils/fraction.enum'; @Component({ selector: 'decoration-item', templateUrl: './decoration-item.component.html', - styleUrls: ['./decoration-item.component.css', '../../../style/list-entry.css'], + styleUrls: ['./decoration-item.component.scss'], changeDetection: ChangeDetectionStrategy.OnPush }) export class DecorationItemComponent implements OnInit { diff --git a/static/src/app/manage/decorations/decoration-list/decoration-list.component.css b/static/src/app/manage/decorations/decoration-list/decoration-list.component.css deleted file mode 100644 index e69de29..0000000 diff --git a/static/src/app/manage/decorations/decoration-list/decoration-list.component.scss b/static/src/app/manage/decorations/decoration-list/decoration-list.component.scss new file mode 100644 index 0000000..5eb809a --- /dev/null +++ b/static/src/app/manage/decorations/decoration-list/decoration-list.component.scss @@ -0,0 +1 @@ +@import url('../../../style/select-list.scss'); diff --git a/static/src/app/manage/decorations/decoration-list/decoration-list.component.ts b/static/src/app/manage/decorations/decoration-list/decoration-list.component.ts index 9455526..5160022 100644 --- a/static/src/app/manage/decorations/decoration-list/decoration-list.component.ts +++ b/static/src/app/manage/decorations/decoration-list/decoration-list.component.ts @@ -13,7 +13,7 @@ import {TranslateService} from '@ngx-translate/core'; @Component({ selector: 'cc-decoration-list', templateUrl: './decoration-list.component.html', - styleUrls: ['./decoration-list.component.css', '../../../style/select-list.css'] + styleUrls: ['./decoration-list.component.scss'] }) export class DecorationListComponent implements OnInit { diff --git a/static/src/app/manage/decorations/edit-decoration/edit-decoration.component.css b/static/src/app/manage/decorations/edit-decoration/edit-decoration.component.css deleted file mode 100644 index e69de29..0000000 diff --git a/static/src/app/manage/decorations/edit-decoration/edit-decoration.component.scss b/static/src/app/manage/decorations/edit-decoration/edit-decoration.component.scss new file mode 100644 index 0000000..c51d90c --- /dev/null +++ b/static/src/app/manage/decorations/edit-decoration/edit-decoration.component.scss @@ -0,0 +1,2 @@ +@import url('../../../style/entry-form.scss'); +@import url('../../../style/overview.scss'); diff --git a/static/src/app/manage/decorations/edit-decoration/edit-decoration.component.ts b/static/src/app/manage/decorations/edit-decoration/edit-decoration.component.ts index e248905..6b0a31c 100644 --- a/static/src/app/manage/decorations/edit-decoration/edit-decoration.component.ts +++ b/static/src/app/manage/decorations/edit-decoration/edit-decoration.component.ts @@ -10,7 +10,7 @@ import {TranslateService} from '@ngx-translate/core'; @Component({ templateUrl: './edit-decoration.component.html', - styleUrls: ['./edit-decoration.component.css', '../../../style/entry-form.css', '../../../style/overview.css'] + styleUrls: ['./edit-decoration.component.scss'] }) export class EditDecorationComponent implements OnInit, OnDestroy { diff --git a/static/src/app/manage/ranks/edit-rank/edit-rank.component.css b/static/src/app/manage/ranks/edit-rank/edit-rank.component.css deleted file mode 100644 index 8b13789..0000000 --- a/static/src/app/manage/ranks/edit-rank/edit-rank.component.css +++ /dev/null @@ -1 +0,0 @@ - diff --git a/static/src/app/manage/ranks/edit-rank/edit-rank.component.scss b/static/src/app/manage/ranks/edit-rank/edit-rank.component.scss new file mode 100644 index 0000000..c51d90c --- /dev/null +++ b/static/src/app/manage/ranks/edit-rank/edit-rank.component.scss @@ -0,0 +1,2 @@ +@import url('../../../style/entry-form.scss'); +@import url('../../../style/overview.scss'); diff --git a/static/src/app/manage/ranks/edit-rank/edit-rank.component.ts b/static/src/app/manage/ranks/edit-rank/edit-rank.component.ts index 52659ea..21e3ed9 100644 --- a/static/src/app/manage/ranks/edit-rank/edit-rank.component.ts +++ b/static/src/app/manage/ranks/edit-rank/edit-rank.component.ts @@ -11,7 +11,7 @@ import {TranslateService} from '@ngx-translate/core'; @Component({ templateUrl: './edit-rank.component.html', - styleUrls: ['./edit-rank.component.css', '../../../style/entry-form.css', '../../../style/overview.css'] + styleUrls: ['./edit-rank.component.scss'] }) export class EditRankComponent implements OnInit, OnDestroy { diff --git a/static/src/app/manage/ranks/rank-list/rank-item.component.css b/static/src/app/manage/ranks/rank-list/rank-item.component.scss similarity index 61% rename from static/src/app/manage/ranks/rank-list/rank-item.component.css rename to static/src/app/manage/ranks/rank-list/rank-item.component.scss index a107541..f347814 100644 --- a/static/src/app/manage/ranks/rank-list/rank-item.component.css +++ b/static/src/app/manage/ranks/rank-list/rank-item.component.scss @@ -1,3 +1,5 @@ +@import url('../../../style/list-entry.scss'); + .rank-list-preview { height: 54px; float: left; diff --git a/static/src/app/manage/ranks/rank-list/rank-item.component.ts b/static/src/app/manage/ranks/rank-list/rank-item.component.ts index f94a29d..6dfbfec 100644 --- a/static/src/app/manage/ranks/rank-list/rank-item.component.ts +++ b/static/src/app/manage/ranks/rank-list/rank-item.component.ts @@ -5,7 +5,7 @@ import {Fraction} from '../../../utils/fraction.enum'; @Component({ selector: 'cc-rank-item', templateUrl: './rank-item.component.html', - styleUrls: ['./rank-item.component.css', '../../../style/list-entry.css'], + styleUrls: ['./rank-item.component.scss'], changeDetection: ChangeDetectionStrategy.OnPush }) export class RankItemComponent implements OnInit { diff --git a/static/src/app/manage/ranks/rank-list/rank-list.component.css b/static/src/app/manage/ranks/rank-list/rank-list.component.css deleted file mode 100644 index e69de29..0000000 diff --git a/static/src/app/manage/ranks/rank-list/rank-list.component.scss b/static/src/app/manage/ranks/rank-list/rank-list.component.scss new file mode 100644 index 0000000..5eb809a --- /dev/null +++ b/static/src/app/manage/ranks/rank-list/rank-list.component.scss @@ -0,0 +1 @@ +@import url('../../../style/select-list.scss'); diff --git a/static/src/app/manage/ranks/rank-list/rank-list.component.ts b/static/src/app/manage/ranks/rank-list/rank-list.component.ts index 6577504..0d31691 100644 --- a/static/src/app/manage/ranks/rank-list/rank-list.component.ts +++ b/static/src/app/manage/ranks/rank-list/rank-list.component.ts @@ -13,7 +13,7 @@ import {TranslateService} from '@ngx-translate/core'; @Component({ selector: 'cc-rank-list', templateUrl: './rank-list.component.html', - styleUrls: ['./rank-list.component.css', '../../../style/select-list.css'] + styleUrls: ['./rank-list.component.scss'] }) export class RankListComponent implements OnInit { diff --git a/static/src/app/manage/squads/edit-squad/edit-squad.component.css b/static/src/app/manage/squads/edit-squad/edit-squad.component.css deleted file mode 100644 index e69de29..0000000 diff --git a/static/src/app/manage/squads/edit-squad/edit-squad.component.scss b/static/src/app/manage/squads/edit-squad/edit-squad.component.scss new file mode 100644 index 0000000..c51d90c --- /dev/null +++ b/static/src/app/manage/squads/edit-squad/edit-squad.component.scss @@ -0,0 +1,2 @@ +@import url('../../../style/entry-form.scss'); +@import url('../../../style/overview.scss'); diff --git a/static/src/app/manage/squads/edit-squad/edit-squad.component.ts b/static/src/app/manage/squads/edit-squad/edit-squad.component.ts index 4eeb022..85252cf 100644 --- a/static/src/app/manage/squads/edit-squad/edit-squad.component.ts +++ b/static/src/app/manage/squads/edit-squad/edit-squad.component.ts @@ -11,7 +11,7 @@ import {TranslateService} from '@ngx-translate/core'; @Component({ templateUrl: './edit-squad.component.html', - styleUrls: ['./edit-squad.component.css', '../../../style/entry-form.css', '../../../style/overview.css'] + styleUrls: ['./edit-squad.component.scss'] }) export class EditSquadComponent implements OnInit, OnDestroy { diff --git a/static/src/app/manage/squads/squad-list/squad-item.component.css b/static/src/app/manage/squads/squad-list/squad-item.component.css deleted file mode 100644 index e69de29..0000000 diff --git a/static/src/app/manage/squads/squad-list/squad-item.component.scss b/static/src/app/manage/squads/squad-list/squad-item.component.scss new file mode 100644 index 0000000..709770c --- /dev/null +++ b/static/src/app/manage/squads/squad-list/squad-item.component.scss @@ -0,0 +1 @@ +@import url('../../../style/list-entry.scss'); diff --git a/static/src/app/manage/squads/squad-list/squad-item.component.ts b/static/src/app/manage/squads/squad-list/squad-item.component.ts index 646e5a0..8a17f3f 100644 --- a/static/src/app/manage/squads/squad-list/squad-item.component.ts +++ b/static/src/app/manage/squads/squad-list/squad-item.component.ts @@ -5,7 +5,7 @@ import {Fraction} from '../../../utils/fraction.enum'; @Component({ selector: 'cc-squad-item', templateUrl: './squad-item.component.html', - styleUrls: ['./squad-item.component.css', '../../../style/list-entry.css'], + styleUrls: ['./squad-item.component.scss'], changeDetection: ChangeDetectionStrategy.OnPush }) export class SquadItemComponent implements OnInit { diff --git a/static/src/app/manage/squads/squad-list/squad-list.component.css b/static/src/app/manage/squads/squad-list/squad-list.component.css deleted file mode 100644 index 2a43205..0000000 --- a/static/src/app/manage/squads/squad-list/squad-list.component.css +++ /dev/null @@ -1,3 +0,0 @@ -.search-bar { - padding-bottom: 20px; -} diff --git a/static/src/app/manage/squads/squad-list/squad-list.component.scss b/static/src/app/manage/squads/squad-list/squad-list.component.scss new file mode 100644 index 0000000..70ecc86 --- /dev/null +++ b/static/src/app/manage/squads/squad-list/squad-list.component.scss @@ -0,0 +1,5 @@ +@import url('../../../style/select-list.scss'); + +.search-bar { + padding-bottom: 20px; +} diff --git a/static/src/app/manage/squads/squad-list/squad-list.component.ts b/static/src/app/manage/squads/squad-list/squad-list.component.ts index c4b876f..aa2ca6b 100644 --- a/static/src/app/manage/squads/squad-list/squad-list.component.ts +++ b/static/src/app/manage/squads/squad-list/squad-list.component.ts @@ -13,7 +13,7 @@ import {TranslateService} from '@ngx-translate/core'; @Component({ selector: 'cc-squad-list', templateUrl: './squad-list.component.html', - styleUrls: ['./squad-list.component.css', '../../../style/select-list.css'] + styleUrls: ['./squad-list.component.scss'] }) export class SquadListComponent implements OnInit { diff --git a/static/src/app/manage/users/award-user/award-user.component.css b/static/src/app/manage/users/award-user/award-user.component.scss similarity index 79% rename from static/src/app/manage/users/award-user/award-user.component.css rename to static/src/app/manage/users/award-user/award-user.component.scss index afd1159..a9de331 100644 --- a/static/src/app/manage/users/award-user/award-user.component.css +++ b/static/src/app/manage/users/award-user/award-user.component.scss @@ -1,3 +1,6 @@ +@import url('../../../style/overview.scss'); +@import url('../../../style/hide-scrollbar.scss'); + .decoration-preview { background-color: white; padding: 5px; diff --git a/static/src/app/manage/users/award-user/award-user.component.ts b/static/src/app/manage/users/award-user/award-user.component.ts index 9af1420..04953a7 100644 --- a/static/src/app/manage/users/award-user/award-user.component.ts +++ b/static/src/app/manage/users/award-user/award-user.component.ts @@ -11,7 +11,7 @@ import {TranslateService} from '@ngx-translate/core'; @Component({ templateUrl: './award-user.component.html', - styleUrls: ['./award-user.component.css', '../../../style/overview.css', '../../../style/hide-scrollbar.css'], + styleUrls: ['./award-user.component.scss'], }) export class AwardUserComponent implements OnInit { diff --git a/static/src/app/manage/users/edit-user/edit-user.component.css b/static/src/app/manage/users/edit-user/edit-user.component.css deleted file mode 100644 index e69de29..0000000 diff --git a/static/src/app/manage/users/edit-user/edit-user.component.scss b/static/src/app/manage/users/edit-user/edit-user.component.scss new file mode 100644 index 0000000..c51d90c --- /dev/null +++ b/static/src/app/manage/users/edit-user/edit-user.component.scss @@ -0,0 +1,2 @@ +@import url('../../../style/entry-form.scss'); +@import url('../../../style/overview.scss'); diff --git a/static/src/app/manage/users/edit-user/edit-user.component.ts b/static/src/app/manage/users/edit-user/edit-user.component.ts index 61ec598..9dd56aa 100644 --- a/static/src/app/manage/users/edit-user/edit-user.component.ts +++ b/static/src/app/manage/users/edit-user/edit-user.component.ts @@ -12,7 +12,7 @@ import {SnackBarService} from '../../../services/user-interface/snack-bar/snack- @Component({ templateUrl: './edit-user.component.html', - styleUrls: ['./edit-user.component.css', '../../../style/entry-form.css', '../../../style/overview.css'], + styleUrls: ['./edit-user.component.scss'], }) export class EditUserComponent implements OnInit { diff --git a/static/src/app/admin/user-list/app-user-item.component.css b/static/src/app/manage/users/user-list/user-item.component.scss similarity index 64% rename from static/src/app/admin/user-list/app-user-item.component.css rename to static/src/app/manage/users/user-list/user-item.component.scss index 458e2b3..7a8d6c2 100644 --- a/static/src/app/admin/user-list/app-user-item.component.css +++ b/static/src/app/manage/users/user-list/user-item.component.scss @@ -1,3 +1,5 @@ +@import url('../../../style/list-entry.scss'); + .icon-award { width: 27px; height: 42px; diff --git a/static/src/app/manage/users/user-list/user-item.component.ts b/static/src/app/manage/users/user-list/user-item.component.ts index 0e474cc..a3bb07e 100644 --- a/static/src/app/manage/users/user-list/user-item.component.ts +++ b/static/src/app/manage/users/user-list/user-item.component.ts @@ -6,7 +6,7 @@ import {LoginService} from '../../../services/app-user-service/login-service'; @Component({ selector: 'cc-user-item', templateUrl: './user-item.component.html', - styleUrls: ['./user-item.component.css', '../../../style/list-entry.css'], + styleUrls: ['./user-item.component.scss'], changeDetection: ChangeDetectionStrategy.OnPush }) export class UserItemComponent { diff --git a/static/src/app/manage/users/user-list/user-list.component.css b/static/src/app/manage/users/user-list/user-list.component.css deleted file mode 100644 index e69de29..0000000 diff --git a/static/src/app/manage/users/user-list/user-list.component.scss b/static/src/app/manage/users/user-list/user-list.component.scss new file mode 100644 index 0000000..5eb809a --- /dev/null +++ b/static/src/app/manage/users/user-list/user-list.component.scss @@ -0,0 +1 @@ +@import url('../../../style/select-list.scss'); diff --git a/static/src/app/manage/users/user-list/user-list.component.ts b/static/src/app/manage/users/user-list/user-list.component.ts index 7d5aa35..516ec67 100644 --- a/static/src/app/manage/users/user-list/user-list.component.ts +++ b/static/src/app/manage/users/user-list/user-list.component.ts @@ -14,7 +14,7 @@ import {TranslateService} from '@ngx-translate/core'; @Component({ selector: 'cc-user-list', templateUrl: './user-list.component.html', - styleUrls: ['./user-list.component.css', '../../../style/select-list.css'] + styleUrls: ['./user-list.component.scss'] }) export class UserListComponent { diff --git a/static/src/app/pub/decoration-overview/decoration-panel/decoration-panel.component.css b/static/src/app/pub/decoration-overview/decoration-panel/decoration-panel.component.scss similarity index 100% rename from static/src/app/pub/decoration-overview/decoration-panel/decoration-panel.component.css rename to static/src/app/pub/decoration-overview/decoration-panel/decoration-panel.component.scss diff --git a/static/src/app/pub/decoration-overview/decoration-panel/decoration-panel.component.ts b/static/src/app/pub/decoration-overview/decoration-panel/decoration-panel.component.ts index c702f30..8d5d0eb 100644 --- a/static/src/app/pub/decoration-overview/decoration-panel/decoration-panel.component.ts +++ b/static/src/app/pub/decoration-overview/decoration-panel/decoration-panel.component.ts @@ -7,7 +7,7 @@ import {Fraction} from '../../../utils/fraction.enum'; @Component({ selector: 'cc-decoration-panel', templateUrl: './decoration-panel.component.html', - styleUrls: ['./decoration-panel.component.css'] + styleUrls: ['./decoration-panel.component.scss'] }) export class DecorationPanelComponent { diff --git a/static/src/app/pub/rank-overview/rank-panel/rank-panel.component.css b/static/src/app/pub/rank-overview/rank-panel/rank-panel.component.scss similarity index 100% rename from static/src/app/pub/rank-overview/rank-panel/rank-panel.component.css rename to static/src/app/pub/rank-overview/rank-panel/rank-panel.component.scss diff --git a/static/src/app/pub/rank-overview/rank-panel/rank-panel.component.ts b/static/src/app/pub/rank-overview/rank-panel/rank-panel.component.ts index 03b93f1..2f4ed2e 100644 --- a/static/src/app/pub/rank-overview/rank-panel/rank-panel.component.ts +++ b/static/src/app/pub/rank-overview/rank-panel/rank-panel.component.ts @@ -5,7 +5,7 @@ import {Fraction} from '../../../utils/fraction.enum'; @Component({ selector: 'cc-rank-panel', templateUrl: './rank-panel.component.html', - styleUrls: ['./rank-panel.component.css'] + styleUrls: ['./rank-panel.component.scss'] }) export class RankPanelComponent { diff --git a/static/src/app/request/award/req-award.component.css b/static/src/app/request/award/req-award.component.scss similarity index 90% rename from static/src/app/request/award/req-award.component.css rename to static/src/app/request/award/req-award.component.scss index dd5deea..cf92a6d 100644 --- a/static/src/app/request/award/req-award.component.css +++ b/static/src/app/request/award/req-award.component.scss @@ -1,3 +1,5 @@ +@import url('../../style/overview.scss'); + .overview { width: 100% !important; margin-left: 25px !important; diff --git a/static/src/app/request/award/req-award.component.ts b/static/src/app/request/award/req-award.component.ts index 6ef08f6..21407be 100644 --- a/static/src/app/request/award/req-award.component.ts +++ b/static/src/app/request/award/req-award.component.ts @@ -11,7 +11,7 @@ import {SnackBarService} from '../../services/user-interface/snack-bar/snack-bar @Component({ templateUrl: './req-award.component.html', - styleUrls: ['./req-award.component.css', '../../style/overview.css'], + styleUrls: ['./req-award.component.scss'], }) export class RequestAwardComponent implements OnInit { diff --git a/static/src/app/request/confirm-award/confirm-award.component.css b/static/src/app/request/confirm-award/confirm-award.component.scss similarity index 88% rename from static/src/app/request/confirm-award/confirm-award.component.css rename to static/src/app/request/confirm-award/confirm-award.component.scss index 2d7ee71..07c2b42 100644 --- a/static/src/app/request/confirm-award/confirm-award.component.css +++ b/static/src/app/request/confirm-award/confirm-award.component.scss @@ -1,3 +1,5 @@ +@import url('../../style/overview.scss'); + .overview { margin-left: 25px !important; } diff --git a/static/src/app/request/confirm-award/confirm-award.component.ts b/static/src/app/request/confirm-award/confirm-award.component.ts index cfc7101..a047134 100644 --- a/static/src/app/request/confirm-award/confirm-award.component.ts +++ b/static/src/app/request/confirm-award/confirm-award.component.ts @@ -7,7 +7,7 @@ import {SnackBarService} from '../../services/user-interface/snack-bar/snack-bar @Component({ templateUrl: './confirm-award.component.html', - styleUrls: ['./confirm-award.component.css', '../../style/overview.css'], + styleUrls: ['./confirm-award.component.scss'], }) export class ConfirmAwardComponent implements OnInit { diff --git a/static/src/app/request/confirm-promotion/confirm-promotion.component.css b/static/src/app/request/confirm-promotion/confirm-promotion.component.scss similarity index 88% rename from static/src/app/request/confirm-promotion/confirm-promotion.component.css rename to static/src/app/request/confirm-promotion/confirm-promotion.component.scss index 2d7ee71..07c2b42 100644 --- a/static/src/app/request/confirm-promotion/confirm-promotion.component.css +++ b/static/src/app/request/confirm-promotion/confirm-promotion.component.scss @@ -1,3 +1,5 @@ +@import url('../../style/overview.scss'); + .overview { margin-left: 25px !important; } diff --git a/static/src/app/request/confirm-promotion/confirm-promotion.component.ts b/static/src/app/request/confirm-promotion/confirm-promotion.component.ts index efb9af8..6bd2e21 100644 --- a/static/src/app/request/confirm-promotion/confirm-promotion.component.ts +++ b/static/src/app/request/confirm-promotion/confirm-promotion.component.ts @@ -8,7 +8,7 @@ import {SnackBarService} from '../../services/user-interface/snack-bar/snack-bar @Component({ templateUrl: './confirm-promotion.component.html', - styleUrls: ['./confirm-promotion.component.css', '../../style/overview.css'], + styleUrls: ['./confirm-promotion.component.scss'], }) export class ConfirmPromotionComponent implements OnInit { diff --git a/static/src/app/request/promotion/req-promotion.component.css b/static/src/app/request/promotion/req-promotion.component.scss similarity index 89% rename from static/src/app/request/promotion/req-promotion.component.css rename to static/src/app/request/promotion/req-promotion.component.scss index e799ab8..5e40c75 100644 --- a/static/src/app/request/promotion/req-promotion.component.css +++ b/static/src/app/request/promotion/req-promotion.component.scss @@ -1,3 +1,5 @@ +@import url('../../style/overview.scss'); + .overview { margin-left: 25px !important; } diff --git a/static/src/app/request/promotion/req-promotion.component.ts b/static/src/app/request/promotion/req-promotion.component.ts index d50f5e4..1c72b98 100644 --- a/static/src/app/request/promotion/req-promotion.component.ts +++ b/static/src/app/request/promotion/req-promotion.component.ts @@ -11,7 +11,7 @@ import {SnackBarService} from '../../services/user-interface/snack-bar/snack-bar @Component({ templateUrl: './req-promotion.component.html', - styleUrls: ['./req-promotion.component.css', '../../style/overview.css'], + styleUrls: ['./req-promotion.component.scss'], }) export class RequestPromotionComponent implements OnInit { diff --git a/static/src/app/request/request.component.css b/static/src/app/request/request.component.css deleted file mode 100644 index e69de29..0000000 diff --git a/static/src/app/admin/edit-app-user/edit-app-user.component.css b/static/src/app/request/request.component.scss similarity index 100% rename from static/src/app/admin/edit-app-user/edit-app-user.component.css rename to static/src/app/request/request.component.scss diff --git a/static/src/app/request/request.component.ts b/static/src/app/request/request.component.ts index 4eee227..3a7e414 100644 --- a/static/src/app/request/request.component.ts +++ b/static/src/app/request/request.component.ts @@ -5,7 +5,7 @@ import {SettingsService} from '../services/settings.service'; @Component({ selector: 'cc-request-root', templateUrl: 'request.component.html', - styleUrls: ['request.component.css'] + styleUrls: ['request.component.scss'] }) export class RequestComponent { constructor(private translate: TranslateService, diff --git a/static/src/app/request/sql-dashboard/sql-dashboard.component.css b/static/src/app/request/sql-dashboard/sql-dashboard.component.scss similarity index 87% rename from static/src/app/request/sql-dashboard/sql-dashboard.component.css rename to static/src/app/request/sql-dashboard/sql-dashboard.component.scss index 45d7a13..9a8d311 100644 --- a/static/src/app/request/sql-dashboard/sql-dashboard.component.css +++ b/static/src/app/request/sql-dashboard/sql-dashboard.component.scss @@ -1,3 +1,5 @@ +@import url('../../style/overview.scss'); + .overview { margin-left: 25px !important; } diff --git a/static/src/app/request/sql-dashboard/sql-dashboard.component.ts b/static/src/app/request/sql-dashboard/sql-dashboard.component.ts index 39d21e4..17ba27b 100644 --- a/static/src/app/request/sql-dashboard/sql-dashboard.component.ts +++ b/static/src/app/request/sql-dashboard/sql-dashboard.component.ts @@ -9,7 +9,7 @@ import {AwardingService} from '../../services/army-management/awarding.service'; @Component({ templateUrl: './sql-dashboard.component.html', - styleUrls: ['./sql-dashboard.component.css', '../../style/overview.css'], + styleUrls: ['./sql-dashboard.component.scss'], }) export class SqlDashboardComponent implements OnInit { diff --git a/static/src/app/statistic/campaign/campaign-navigation/campaign-navigation.component.css b/static/src/app/statistic/campaign/campaign-navigation/campaign-navigation.component.scss similarity index 100% rename from static/src/app/statistic/campaign/campaign-navigation/campaign-navigation.component.css rename to static/src/app/statistic/campaign/campaign-navigation/campaign-navigation.component.scss diff --git a/static/src/app/statistic/campaign/campaign-navigation/campaign-navigation.component.ts b/static/src/app/statistic/campaign/campaign-navigation/campaign-navigation.component.ts index 292896a..1884c34 100644 --- a/static/src/app/statistic/campaign/campaign-navigation/campaign-navigation.component.ts +++ b/static/src/app/statistic/campaign/campaign-navigation/campaign-navigation.component.ts @@ -15,7 +15,7 @@ import {CampaignService} from '../../../services/logs/campaign.service'; @Component({ selector: 'campaign-navigation', templateUrl: './campaign-navigation.component.html', - styleUrls: ['./campaign-navigation.component.css'] + styleUrls: ['./campaign-navigation.component.scss'] }) export class CampaignNavigationComponent implements OnInit { diff --git a/static/src/app/statistic/campaign/campaign-player-detail/campaign-player-detail.component.scss b/static/src/app/statistic/campaign/campaign-player-detail/campaign-player-detail.component.scss index 58a0d9c..43084a7 100644 --- a/static/src/app/statistic/campaign/campaign-player-detail/campaign-player-detail.component.scss +++ b/static/src/app/statistic/campaign/campaign-player-detail/campaign-player-detail.component.scss @@ -1,3 +1,7 @@ +@import url('../../../style/overview.scss'); +@import url('../../../style/list-entry.scss'); +@import url('../../../style/hide-scrollbar.scss'); + .player-campaign-detail-container { padding: 0 1% 0 1%; border-top: thin solid lightgrey; diff --git a/static/src/app/statistic/campaign/campaign-player-detail/campaign-player-detail.component.ts b/static/src/app/statistic/campaign/campaign-player-detail/campaign-player-detail.component.ts index 0680e40..76591e2 100644 --- a/static/src/app/statistic/campaign/campaign-player-detail/campaign-player-detail.component.ts +++ b/static/src/app/statistic/campaign/campaign-player-detail/campaign-player-detail.component.ts @@ -9,8 +9,7 @@ import {TranslateService} from '@ngx-translate/core'; @Component({ selector: 'campaign-player-detail', templateUrl: './campaign-player-detail.component.html', - styleUrls: ['./campaign-player-detail.component.scss', '../../../style/list-entry.css', - '../../../style/hide-scrollbar.css', '../../../style/overview.css'] + styleUrls: ['./campaign-player-detail.component.scss'] }) export class CampaignPlayerDetailComponent implements OnInit { diff --git a/static/src/app/statistic/campaign/campaign-submit/campaign-submit.component.css b/static/src/app/statistic/campaign/campaign-submit/campaign-submit.component.css deleted file mode 100644 index 050f0f5..0000000 --- a/static/src/app/statistic/campaign/campaign-submit/campaign-submit.component.css +++ /dev/null @@ -1,3 +0,0 @@ -form { - margin-top: 45px; -} diff --git a/static/src/app/statistic/campaign/campaign-submit/campaign-submit.component.scss b/static/src/app/statistic/campaign/campaign-submit/campaign-submit.component.scss new file mode 100644 index 0000000..135581c --- /dev/null +++ b/static/src/app/statistic/campaign/campaign-submit/campaign-submit.component.scss @@ -0,0 +1,6 @@ +@import url('../../../style/entry-form.scss'); +@import url('../../../style/overview.scss'); + +form { + margin-top: 45px; +} diff --git a/static/src/app/statistic/campaign/campaign-submit/campaign-submit.component.ts b/static/src/app/statistic/campaign/campaign-submit/campaign-submit.component.ts index d4e586b..dc78028 100644 --- a/static/src/app/statistic/campaign/campaign-submit/campaign-submit.component.ts +++ b/static/src/app/statistic/campaign/campaign-submit/campaign-submit.component.ts @@ -10,7 +10,7 @@ import {SnackBarService} from '../../../services/user-interface/snack-bar/snack- @Component({ selector: 'campaign-submit', templateUrl: './campaign-submit.component.html', - styleUrls: ['./campaign-submit.component.css', '../../../style/entry-form.css', '../../../style/overview.css'] + styleUrls: ['./campaign-submit.component.scss'] }) export class CampaignSubmitComponent { diff --git a/static/src/app/statistic/campaign/highscore/highscore.component.css b/static/src/app/statistic/campaign/highscore/highscore.component.scss similarity index 83% rename from static/src/app/statistic/campaign/highscore/highscore.component.css rename to static/src/app/statistic/campaign/highscore/highscore.component.scss index 99cf434..4948a27 100644 --- a/static/src/app/statistic/campaign/highscore/highscore.component.css +++ b/static/src/app/statistic/campaign/highscore/highscore.component.scss @@ -1,3 +1,9 @@ +@import url('../../../style/overview.scss'); +@import url('../../../style/list-entry.scss'); + +$highscore-table-width: 320px; +$highscore-table-height: 394px; + h2 { margin-left: 10%; } @@ -12,8 +18,9 @@ h2 { } .highscore-table-container { - width: 320px; - max-height: 394px; + width: $highscore-table-width; + min-height: $highscore-table-height; + max-height: $highscore-table-height; margin: 50px 0 50px 8%; float: left; overflow-x: hidden; @@ -28,7 +35,7 @@ h2 { :host /deep/ table.mat-table > thead { position: absolute; - width: 320px; + width: $highscore-table-width; display: inherit; margin-left: -1px; margin-top: -57px; diff --git a/static/src/app/statistic/campaign/highscore/highscore.component.ts b/static/src/app/statistic/campaign/highscore/highscore.component.ts index 9dfaf26..26d5509 100644 --- a/static/src/app/statistic/campaign/highscore/highscore.component.ts +++ b/static/src/app/statistic/campaign/highscore/highscore.component.ts @@ -11,7 +11,7 @@ import {PlayerUtils} from '../../../utils/player-utils'; @Component({ selector: 'cc-stats-highscore', templateUrl: './highscore.component.html', - styleUrls: ['./highscore.component.css', '../../../style/list-entry.css', '../../../style/overview.css'] + styleUrls: ['./highscore.component.scss'] }) export class StatisticHighScoreComponent implements OnInit { diff --git a/static/src/app/statistic/campaign/overview/campaign-overview.component.css b/static/src/app/statistic/campaign/overview/campaign-overview.component.scss similarity index 100% rename from static/src/app/statistic/campaign/overview/campaign-overview.component.css rename to static/src/app/statistic/campaign/overview/campaign-overview.component.scss diff --git a/static/src/app/statistic/campaign/overview/campaign-overview.component.ts b/static/src/app/statistic/campaign/overview/campaign-overview.component.ts index 78e17e6..0a9a338 100644 --- a/static/src/app/statistic/campaign/overview/campaign-overview.component.ts +++ b/static/src/app/statistic/campaign/overview/campaign-overview.component.ts @@ -9,7 +9,7 @@ import {WarService} from '../../../services/logs/war.service'; @Component({ selector: 'cc-campaign-overview', templateUrl: './campaign-overview.component.html', - styleUrls: ['./campaign-overview.component.css'] + styleUrls: ['./campaign-overview.component.scss'] }) export class StatisticOverviewComponent implements OnInit { diff --git a/static/src/app/statistic/stats.component.css b/static/src/app/statistic/stats.component.scss similarity index 100% rename from static/src/app/statistic/stats.component.css rename to static/src/app/statistic/stats.component.scss diff --git a/static/src/app/statistic/stats.component.ts b/static/src/app/statistic/stats.component.ts index 3653ee9..d1a10ce 100644 --- a/static/src/app/statistic/stats.component.ts +++ b/static/src/app/statistic/stats.component.ts @@ -9,7 +9,7 @@ import {WarService} from '../services/logs/war.service'; @Component({ selector: 'cc-stats', templateUrl: './stats.component.html', - styleUrls: ['./stats.component.css'] + styleUrls: ['./stats.component.scss'] }) export class StatisticComponent implements OnInit { diff --git a/static/src/app/statistic/war/fraction-stats/fraction-stats.component.scss b/static/src/app/statistic/war/fraction-stats/fraction-stats.component.scss index 268fc92..58acdff 100644 --- a/static/src/app/statistic/war/fraction-stats/fraction-stats.component.scss +++ b/static/src/app/statistic/war/fraction-stats/fraction-stats.component.scss @@ -1,3 +1,6 @@ +@import url('../../../style/list-entry.scss'); +@import url('../../../style/hide-scrollbar.scss'); + .chart-select-group { display: flex; width: fit-content; diff --git a/static/src/app/statistic/war/fraction-stats/fraction-stats.component.ts b/static/src/app/statistic/war/fraction-stats/fraction-stats.component.ts index bbe213e..df3ab06 100644 --- a/static/src/app/statistic/war/fraction-stats/fraction-stats.component.ts +++ b/static/src/app/statistic/war/fraction-stats/fraction-stats.component.ts @@ -8,7 +8,7 @@ import {TranslateService} from '@ngx-translate/core'; @Component({ selector: 'war-detail-fraction', templateUrl: './fraction-stats.component.html', - styleUrls: ['./fraction-stats.component.scss', '../../../style/list-entry.css', '../../../style/hide-scrollbar.css'] + styleUrls: ['./fraction-stats.component.scss'] }) export class FractionStatsComponent implements OnInit, OnChanges { diff --git a/static/src/app/statistic/war/scoreboard/scoreboard.component.css b/static/src/app/statistic/war/scoreboard/scoreboard.component.scss similarity index 89% rename from static/src/app/statistic/war/scoreboard/scoreboard.component.css rename to static/src/app/statistic/war/scoreboard/scoreboard.component.scss index 4e85888..f6c3886 100644 --- a/static/src/app/statistic/war/scoreboard/scoreboard.component.css +++ b/static/src/app/statistic/war/scoreboard/scoreboard.component.scss @@ -1,3 +1,6 @@ +@import url('../../../style/list-entry.scss'); +@import url('../../../style/hide-scrollbar.scss'); + .scoreboard-table { width: 1058px; margin: auto; diff --git a/static/src/app/statistic/war/scoreboard/scoreboard.component.ts b/static/src/app/statistic/war/scoreboard/scoreboard.component.ts index 19b1e28..924868b 100644 --- a/static/src/app/statistic/war/scoreboard/scoreboard.component.ts +++ b/static/src/app/statistic/war/scoreboard/scoreboard.component.ts @@ -10,7 +10,7 @@ import {TranslateService} from '@ngx-translate/core'; @Component({ selector: 'cc-scoreboard', templateUrl: './scoreboard.component.html', - styleUrls: ['./scoreboard.component.css', '../../../style/list-entry.css', '../../../style/hide-scrollbar.css'] + styleUrls: ['./scoreboard.component.scss'] }) export class ScoreboardComponent implements OnChanges { diff --git a/static/src/app/statistic/war/server-stats/server-stats.component.scss b/static/src/app/statistic/war/server-stats/server-stats.component.scss index 11092fb..8eebc53 100644 --- a/static/src/app/statistic/war/server-stats/server-stats.component.scss +++ b/static/src/app/statistic/war/server-stats/server-stats.component.scss @@ -1,3 +1,6 @@ +@import url('../../../style/list-entry.scss'); +@import url('../../../style/hide-scrollbar.scss'); + .chart-select-group { display: flex; width: fit-content; diff --git a/static/src/app/statistic/war/server-stats/server-stats.component.ts b/static/src/app/statistic/war/server-stats/server-stats.component.ts index 3c1a15b..c24885d 100644 --- a/static/src/app/statistic/war/server-stats/server-stats.component.ts +++ b/static/src/app/statistic/war/server-stats/server-stats.component.ts @@ -7,7 +7,7 @@ import {ChartUtils} from '../../../utils/chart-utils'; @Component({ selector: 'cc-server-statistics', templateUrl: './server-stats.component.html', - styleUrls: ['./server-stats.component.scss', '../../../style/list-entry.css', '../../../style/hide-scrollbar.css'] + styleUrls: ['./server-stats.component.scss'] }) export class ServerStatsComponent implements OnInit, OnChanges { diff --git a/static/src/app/statistic/war/war-header/war-header.component.scss b/static/src/app/statistic/war/war-header/war-header.component.scss index 2edb9b1..eaafa29 100644 --- a/static/src/app/statistic/war/war-header/war-header.component.scss +++ b/static/src/app/statistic/war/war-header/war-header.component.scss @@ -1,3 +1,6 @@ +@import url('../../../style/list-entry.scss'); +@import url('../../../style/hide-scrollbar.scss'); + .war-header-container { width: 920px; min-height: 165px; diff --git a/static/src/app/statistic/war/war-header/war-header.component.ts b/static/src/app/statistic/war/war-header/war-header.component.ts index 145da27..9bcacc3 100644 --- a/static/src/app/statistic/war/war-header/war-header.component.ts +++ b/static/src/app/statistic/war/war-header/war-header.component.ts @@ -11,7 +11,7 @@ import {ScoreboardComponent} from '../scoreboard/scoreboard.component'; @Component({ selector: 'war-detail', templateUrl: './war-header.component.html', - styleUrls: ['./war-header.component.scss', '../../../style/list-entry.css', '../../../style/hide-scrollbar.css'] + styleUrls: ['./war-header.component.scss'] }) export class WarHeaderComponent implements OnInit { diff --git a/static/src/app/statistic/war/war-list/war-item.component.css b/static/src/app/statistic/war/war-list/war-item.component.scss similarity index 100% rename from static/src/app/statistic/war/war-list/war-item.component.css rename to static/src/app/statistic/war/war-list/war-item.component.scss diff --git a/static/src/app/statistic/war/war-list/war-item.component.ts b/static/src/app/statistic/war/war-list/war-item.component.ts index f3b0815..c321cca 100644 --- a/static/src/app/statistic/war/war-list/war-item.component.ts +++ b/static/src/app/statistic/war/war-list/war-item.component.ts @@ -5,7 +5,7 @@ import {LoginService} from '../../../services/app-user-service/login-service'; @Component({ selector: 'cc-war-item', templateUrl: './war-item.component.html', - styleUrls: ['./war-item.component.css'], + styleUrls: ['./war-item.component.scss'], changeDetection: ChangeDetectionStrategy.OnPush }) export class WarItemComponent implements OnInit { diff --git a/static/src/app/statistic/war/war-list/war-list.component.css b/static/src/app/statistic/war/war-list/war-list.component.scss similarity index 100% rename from static/src/app/statistic/war/war-list/war-list.component.css rename to static/src/app/statistic/war/war-list/war-list.component.scss diff --git a/static/src/app/statistic/war/war-list/war-list.component.ts b/static/src/app/statistic/war/war-list/war-list.component.ts index a5362ca..a97ccd7 100644 --- a/static/src/app/statistic/war/war-list/war-list.component.ts +++ b/static/src/app/statistic/war/war-list/war-list.component.ts @@ -10,7 +10,7 @@ import {TranslateService} from '@ngx-translate/core'; @Component({ selector: 'war-list', templateUrl: './war-list.component.html', - styleUrls: ['./war-list.component.css'] + styleUrls: ['./war-list.component.scss'] }) export class WarListComponent implements OnChanges { diff --git a/static/src/app/statistic/war/war-submit/war-submit.component.css b/static/src/app/statistic/war/war-submit/war-submit.component.css deleted file mode 100644 index 050f0f5..0000000 --- a/static/src/app/statistic/war/war-submit/war-submit.component.css +++ /dev/null @@ -1,3 +0,0 @@ -form { - margin-top: 45px; -} diff --git a/static/src/app/statistic/war/war-submit/war-submit.component.scss b/static/src/app/statistic/war/war-submit/war-submit.component.scss new file mode 100644 index 0000000..135581c --- /dev/null +++ b/static/src/app/statistic/war/war-submit/war-submit.component.scss @@ -0,0 +1,6 @@ +@import url('../../../style/entry-form.scss'); +@import url('../../../style/overview.scss'); + +form { + margin-top: 45px; +} diff --git a/static/src/app/statistic/war/war-submit/war-submit.component.ts b/static/src/app/statistic/war/war-submit/war-submit.component.ts index c1530dc..ac6d54d 100644 --- a/static/src/app/statistic/war/war-submit/war-submit.component.ts +++ b/static/src/app/statistic/war/war-submit/war-submit.component.ts @@ -14,7 +14,7 @@ import {TranslateService} from '@ngx-translate/core'; @Component({ selector: 'war-submit', templateUrl: './war-submit.component.html', - styleUrls: ['./war-submit.component.css', '../../../style/entry-form.css', '../../../style/overview.css'] + styleUrls: ['./war-submit.component.scss'] }) export class WarSubmitComponent { diff --git a/static/src/app/style/background-image.scss b/static/src/app/style/background-image.scss index e661470..be906f7 100644 --- a/static/src/app/style/background-image.scss +++ b/static/src/app/style/background-image.scss @@ -3,6 +3,7 @@ height: 100%; min-height: 100vh; width: 100%; + min-width: fit-content; margin-top: -23px; padding-top: 23px; padding-bottom: 23px; diff --git a/static/src/app/style/entry-form.css b/static/src/app/style/entry-form.scss similarity index 100% rename from static/src/app/style/entry-form.css rename to static/src/app/style/entry-form.scss diff --git a/static/src/app/style/hide-scrollbar.css b/static/src/app/style/hide-scrollbar.scss similarity index 100% rename from static/src/app/style/hide-scrollbar.css rename to static/src/app/style/hide-scrollbar.scss diff --git a/static/src/app/style/list-entry.css b/static/src/app/style/list-entry.scss similarity index 100% rename from static/src/app/style/list-entry.css rename to static/src/app/style/list-entry.scss diff --git a/static/src/app/style/overview.css b/static/src/app/style/overview.scss similarity index 100% rename from static/src/app/style/overview.css rename to static/src/app/style/overview.scss diff --git a/static/src/app/style/select-list.css b/static/src/app/style/select-list.scss similarity index 56% rename from static/src/app/style/select-list.css rename to static/src/app/style/select-list.scss index 5a8c86c..9e8a906 100644 --- a/static/src/app/style/select-list.css +++ b/static/src/app/style/select-list.scss @@ -1,3 +1,4 @@ .select-list { + min-height: calc(100vh - 50px); padding: 20px 3% 12px 5%; } diff --git a/static/src/assets/icon/general/opt-logo-core.svg b/static/src/assets/icon/general/opt-logo-core.svg index 9832983..e8b9bf5 100644 --- a/static/src/assets/icon/general/opt-logo-core.svg +++ b/static/src/assets/icon/general/opt-logo-core.svg @@ -1 +1 @@ - + diff --git a/static/src/styles.css b/static/src/styles.scss similarity index 92% rename from static/src/styles.css rename to static/src/styles.scss index c7e162f..308a4c2 100644 --- a/static/src/styles.css +++ b/static/src/styles.scss @@ -1,5 +1,3 @@ -@import "../node_modules/@angular/material/prebuilt-themes/deeppurple-amber.css"; - body { padding-top: 50px; } -- 2.25.1 From dfdfee44da140dab634aa15ddb4057191bbd92d5 Mon Sep 17 00:00:00 2001 From: HardiReady Date: Fri, 22 Feb 2019 10:20:53 +0100 Subject: [PATCH 4/7] make stats mobile readable --- static/src/app/app.component.html | 2 +- static/src/app/statistic/stats.component.ts | 2 ++ static/src/app/utils/global.helpers.ts | 26 +++++++++++++++++++++ static/src/styles.scss | 4 ++-- 4 files changed, 31 insertions(+), 3 deletions(-) diff --git a/static/src/app/app.component.html b/static/src/app/app.component.html index 8e11193..f059a83 100644 --- a/static/src/app/app.component.html +++ b/static/src/app/app.component.html @@ -8,7 +8,7 @@ {{version}} -