Compare commits
No commits in common. "7bcbf182bc412fa4904ad178308a65531a5c8f84" and "a4efa7a69cbb43c586ada1abeb6ac038eb1660cd" have entirely different histories.
7bcbf182bc
...
a4efa7a69c
|
@ -1,10 +1,3 @@
|
|||
html {
|
||||
height: 100%;
|
||||
}
|
||||
body {
|
||||
min-height: 100%;
|
||||
}
|
||||
|
||||
ul {
|
||||
list-style-type: none;
|
||||
margin: 0;
|
||||
|
@ -16,13 +9,13 @@ li {
|
|||
}
|
||||
|
||||
.sidebar-toggle-btn {
|
||||
background: #dadada;
|
||||
background: linear-gradient(-90deg, #e8e5e5, #ffffff);
|
||||
filter: drop-shadow(2px 1px 1px #666);
|
||||
margin-left: -12px;
|
||||
z-index: 500;
|
||||
}
|
||||
|
||||
.sidebar-toggle-btn mat-icon.mat-icon {
|
||||
.sidebar-toggle-btn mat-icon {
|
||||
color: #666666;
|
||||
}
|
||||
|
||||
|
@ -31,6 +24,16 @@ li {
|
|||
padding-right: 15px;
|
||||
}
|
||||
|
||||
.right {
|
||||
float: right;
|
||||
width: 300px;
|
||||
}
|
||||
|
||||
.left {
|
||||
float: left;
|
||||
width: calc(100% - 400px);
|
||||
}
|
||||
|
||||
.scrollable-menu {
|
||||
height: auto;
|
||||
max-height: 200px;
|
||||
|
|
|
@ -1,17 +1,3 @@
|
|||
: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;
|
||||
|
|
|
@ -1,17 +1,3 @@
|
|||
: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%;
|
||||
}
|
||||
|
|
|
@ -1,17 +1,3 @@
|
|||
: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;
|
||||
}
|
||||
|
|
|
@ -1,17 +1,3 @@
|
|||
: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%;
|
||||
}
|
||||
|
|
|
@ -48,6 +48,6 @@ export class UserListSheetComponent implements OnInit {
|
|||
|
||||
selectUser(user) {
|
||||
this.bottomSheetRef.dismiss();
|
||||
this.router.navigate(['overview', 'member', user._id]);
|
||||
this.router.navigate(['overview', {outlets: {'right': ['member', user._id]}}]);
|
||||
}
|
||||
}
|
||||
|
|
|
@ -1,3 +0,0 @@
|
|||
form {
|
||||
margin-top: 45px;
|
||||
}
|
|
@ -1,3 +0,0 @@
|
|||
form {
|
||||
margin-top: 45px;
|
||||
}
|
|
@ -57,12 +57,10 @@
|
|||
|
||||
.war-list-header {
|
||||
margin: auto;
|
||||
padding: 15px 5px 5px;
|
||||
border-right: 1px solid #dadada;
|
||||
border-bottom: 1px solid #dadada;
|
||||
}
|
||||
|
||||
.war-list-header > button {
|
||||
.stats-add-btn {
|
||||
background: white;
|
||||
font-weight: 700;
|
||||
color: #3e3e3e;
|
||||
|
|
|
@ -1,8 +1,8 @@
|
|||
<div class="war-list-header" *ngIf="loginService.hasPermission(3)">
|
||||
<button mat-stroked-button (click)="selectNewWar()">
|
||||
<div class="input-group war-list-header" *ngIf="loginService.hasPermission(3)">
|
||||
<button mat-stroked-button class="stats-add-btn" (click)="selectNewWar()">
|
||||
Schlacht hinzufügen
|
||||
</button>
|
||||
<button mat-stroked-button (click)="selectNewCampaign()">
|
||||
<button mat-stroked-button class="stats-add-btn" (click)="selectNewCampaign()">
|
||||
Kampagne hinzufügen
|
||||
</button>
|
||||
</div>
|
||||
|
|
|
@ -1,3 +0,0 @@
|
|||
form {
|
||||
margin-top: 45px;
|
||||
}
|
|
@ -2,6 +2,7 @@
|
|||
position: fixed;
|
||||
overflow-y: scroll;
|
||||
overflow-x: hidden;
|
||||
border-left: thin solid lightgrey;
|
||||
padding: 20px 0 0 50px;
|
||||
top: 50px;
|
||||
height: 100vh;
|
||||
|
|
|
@ -45,7 +45,6 @@ form {
|
|||
margin: 0;
|
||||
position: static;
|
||||
float: left;
|
||||
border-right: thin solid #dadada;
|
||||
}
|
||||
|
||||
#right {
|
||||
|
|
Loading…
Reference in New Issue