+
{{fraction.OPFOR}}
-
-
+
+
-
-
Global
-
-
+
+
Global
+
+
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.css
index ac859f5..0e00af8 100644
--- 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.css
@@ -1,7 +1,7 @@
.decoration-card {
background: rgba(255, 255, 255, 0.87);
- width: 150px;
- height: 250px;
+ width: 200px;
+ height: 300px;
margin: 6px;
padding: 0;
overflow: hidden;
@@ -48,7 +48,7 @@ img.img-medal {
img.img-ribbon {
padding-top: 20%;
- width: 100%;
+ width: 70%;
}
.gradient {
diff --git a/static/src/app/pub/public.routing.ts b/static/src/app/pub/public.routing.ts
index 8e5837d..e8200f3 100644
--- a/static/src/app/pub/public.routing.ts
+++ b/static/src/app/pub/public.routing.ts
@@ -5,6 +5,7 @@ import {DecorationOverviewComponent} from './decoration-overview/decoration-over
import {DecorationPanelComponent} from './decoration-overview/decoration-panel/decoration-panel.component';
import {RankPanelComponent} from './rank-overview/rank-panel/rank-panel.component';
import {UserListSheetComponent} from './user-list-sheet/user-list-sheet.component';
+import {DecorationNavigationComponent} from './decoration-overview/decoration-navigation/decoration-navigation.component';
export const publicRoutes: Routes = [
{
@@ -25,5 +26,5 @@ export const publicRoutes: Routes = [
export const pubRouterModule: ModuleWithProviders = RouterModule.forChild(publicRoutes);
export const pubRoutingComponents = [RankOverviewComponent, DecorationOverviewComponent, DecorationPanelComponent,
- RankPanelComponent, UserListSheetComponent];
+ RankPanelComponent, UserListSheetComponent, DecorationNavigationComponent];
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 537ca52..293cd2d 100644
--- a/static/src/app/pub/rank-overview/rank-overview.component.ts
+++ b/static/src/app/pub/rank-overview/rank-overview.component.ts
@@ -1,9 +1,6 @@
-import {Component, Inject, OnDestroy, OnInit} from '@angular/core';
+import {Component, OnInit} from '@angular/core';
import {ActivatedRoute, Router} from '@angular/router';
-import {DOCUMENT} from '@angular/common';
import {Fraction} from '../../utils/fraction.enum';
-import {CSSHelpers} from '../../utils/global.helpers';
-import {RouteConfig} from '../../app.config';
import {Rank} from '../../models/model-interfaces';
import {RankService} from '../../services/army-management/rank.service';
import {MatBottomSheet} from '@angular/material';
@@ -41,6 +38,6 @@ export class RankOverviewComponent implements OnInit {
};
selectRow(rank: Rank) {
- this.bottomSheet.open(UserListSheetComponent, {data: { rank: rank }});
+ this.bottomSheet.open(UserListSheetComponent, {data: {rank: rank}});
}
}
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.css
index 3c5b7b5..d31d7ab 100644
--- a/static/src/app/statistic/war/war-list/war-item.component.css
+++ b/static/src/app/statistic/war/war-list/war-item.component.css
@@ -27,6 +27,7 @@
background: -moz-linear-gradient(45deg, white 50%, transparent 50%);
background: -webkit-linear-gradient(45deg, white 50%, transparent 50%);
background: linear-gradient(45deg, white 50%, transparent 50%);
+ box-shadow: inset 8px -6px 5px -7px #a5a5a5;
cursor: default;
border-left: 1px solid #dadada;
border-bottom: 1px solid #dadada;
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.css
index 3468833..29d0fae 100644
--- a/static/src/app/statistic/war/war-list/war-list.component.css
+++ b/static/src/app/statistic/war/war-list/war-list.component.css
@@ -1,6 +1,7 @@
.list-header {
border-bottom: 1px solid #dadada;
border-right: 1px solid #dadada;
+ border-left: 4px solid transparent;
padding: 25px;
font-size: 16px;
text-transform: uppercase;
@@ -28,6 +29,7 @@
background: -moz-linear-gradient(45deg, white 50%, transparent 50%);
background: -webkit-linear-gradient(45deg, white 50%, transparent 50%);
background: linear-gradient(45deg, white 50%, transparent 50%);
+ box-shadow: inset 8px -6px 5px -7px #a5a5a5;
cursor: default;
border-left: 1px solid #dadada;
border-bottom: 1px solid #dadada;
diff --git a/static/src/app/statistic/war/war-list/war-list.component.html b/static/src/app/statistic/war/war-list/war-list.component.html
index 2337ff3..5bb9f91 100644
--- a/static/src/app/statistic/war/war-list/war-list.component.html
+++ b/static/src/app/statistic/war/war-list/war-list.component.html
@@ -1,4 +1,4 @@
-