From 7bcbf182bc412fa4904ad178308a65531a5c8f84 Mon Sep 17 00:00:00 2001 From: HardiReady Date: Wed, 1 Aug 2018 21:39:39 +0200 Subject: [PATCH] Set background image for public pages and fix user bottom sheet redirect --- static/src/app/app.component.css | 7 +++++++ .../app/army/army-member/army-member.component.css | 14 ++++++++++++++ static/src/app/army/army.component.css | 14 ++++++++++++++ .../decoration-overview.component.css | 14 ++++++++++++++ .../pub/rank-overview/rank-overview.component.css | 14 ++++++++++++++ .../user-list-sheet/user-list-sheet.component.ts | 2 +- 6 files changed, 64 insertions(+), 1 deletion(-) diff --git a/static/src/app/app.component.css b/static/src/app/app.component.css index f18245c..cb9e8f2 100644 --- a/static/src/app/app.component.css +++ b/static/src/app/app.component.css @@ -1,3 +1,10 @@ +html { + height: 100%; +} +body { + min-height: 100%; +} + ul { list-style-type: none; margin: 0; diff --git a/static/src/app/army/army-member/army-member.component.css b/static/src/app/army/army-member/army-member.component.css index fb74002..1c61059 100644 --- a/static/src/app/army/army-member/army-member.component.css +++ b/static/src/app/army/army-member/army-member.component.css @@ -1,3 +1,17 @@ +: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: center; + background-repeat: no-repeat; +} + .army-member-view { width: 90%; height: 100vh; diff --git a/static/src/app/army/army.component.css b/static/src/app/army/army.component.css index aea5c16..f1ae200 100644 --- a/static/src/app/army/army.component.css +++ b/static/src/app/army/army.component.css @@ -1,3 +1,17 @@ +: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: center; + background-repeat: no-repeat; +} + .army-column { width: 45%; } diff --git a/static/src/app/pub/decoration-overview/decoration-overview.component.css b/static/src/app/pub/decoration-overview/decoration-overview.component.css index 6d3d223..a9d6aeb 100644 --- a/static/src/app/pub/decoration-overview/decoration-overview.component.css +++ b/static/src/app/pub/decoration-overview/decoration-overview.component.css @@ -1,3 +1,17 @@ +: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: center; + background-repeat: no-repeat; +} + h1 { margin-bottom: 30px; } diff --git a/static/src/app/pub/rank-overview/rank-overview.component.css b/static/src/app/pub/rank-overview/rank-overview.component.css index 64dbb07..93ac49d 100644 --- a/static/src/app/pub/rank-overview/rank-overview.component.css +++ b/static/src/app/pub/rank-overview/rank-overview.component.css @@ -1,3 +1,17 @@ +: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: center; + background-repeat: no-repeat; +} + table { width: 100%; } diff --git a/static/src/app/pub/user-list-sheet/user-list-sheet.component.ts b/static/src/app/pub/user-list-sheet/user-list-sheet.component.ts index b3c1c42..165ff74 100644 --- a/static/src/app/pub/user-list-sheet/user-list-sheet.component.ts +++ b/static/src/app/pub/user-list-sheet/user-list-sheet.component.ts @@ -48,6 +48,6 @@ export class UserListSheetComponent implements OnInit { selectUser(user) { this.bottomSheetRef.dismiss(); - this.router.navigate(['overview', {outlets: {'right': ['member', user._id]}}]); + this.router.navigate(['overview', 'member', user._id]); } }