From 66e5b2db9e4ab1912911db34659944634c32b836 Mon Sep 17 00:00:00 2001 From: HardiReady Date: Tue, 19 Feb 2019 20:29:37 +0100 Subject: [PATCH] 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; -}