Compare commits

..

2 Commits

13 changed files with 82 additions and 18 deletions

View File

@ -1,3 +1,10 @@
html {
height: 100%;
}
body {
min-height: 100%;
}
ul { ul {
list-style-type: none; list-style-type: none;
margin: 0; margin: 0;
@ -9,13 +16,13 @@ li {
} }
.sidebar-toggle-btn { .sidebar-toggle-btn {
background: linear-gradient(-90deg, #e8e5e5, #ffffff); background: #dadada;
filter: drop-shadow(2px 1px 1px #666); filter: drop-shadow(2px 1px 1px #666);
margin-left: -12px; margin-left: -12px;
z-index: 500; z-index: 500;
} }
.sidebar-toggle-btn mat-icon { .sidebar-toggle-btn mat-icon.mat-icon {
color: #666666; color: #666666;
} }
@ -24,16 +31,6 @@ li {
padding-right: 15px; padding-right: 15px;
} }
.right {
float: right;
width: 300px;
}
.left {
float: left;
width: calc(100% - 400px);
}
.scrollable-menu { .scrollable-menu {
height: auto; height: auto;
max-height: 200px; max-height: 200px;

View File

@ -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 { .army-member-view {
width: 90%; width: 90%;
height: 100vh; height: 100vh;

View File

@ -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 { .army-column {
width: 45%; width: 45%;
} }

View File

@ -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 { h1 {
margin-bottom: 30px; margin-bottom: 30px;
} }

View File

@ -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 { table {
width: 100%; width: 100%;
} }

View File

@ -48,6 +48,6 @@ export class UserListSheetComponent implements OnInit {
selectUser(user) { selectUser(user) {
this.bottomSheetRef.dismiss(); this.bottomSheetRef.dismiss();
this.router.navigate(['overview', {outlets: {'right': ['member', user._id]}}]); this.router.navigate(['overview', 'member', user._id]);
} }
} }

View File

@ -0,0 +1,3 @@
form {
margin-top: 45px;
}

View File

@ -0,0 +1,3 @@
form {
margin-top: 45px;
}

View File

@ -57,10 +57,12 @@
.war-list-header { .war-list-header {
margin: auto; margin: auto;
padding: 15px 5px 5px;
border-right: 1px solid #dadada; border-right: 1px solid #dadada;
border-bottom: 1px solid #dadada;
} }
.stats-add-btn { .war-list-header > button {
background: white; background: white;
font-weight: 700; font-weight: 700;
color: #3e3e3e; color: #3e3e3e;

View File

@ -1,8 +1,8 @@
<div class="input-group war-list-header" *ngIf="loginService.hasPermission(3)"> <div class="war-list-header" *ngIf="loginService.hasPermission(3)">
<button mat-stroked-button class="stats-add-btn" (click)="selectNewWar()"> <button mat-stroked-button (click)="selectNewWar()">
Schlacht hinzufügen Schlacht hinzufügen
</button> </button>
<button mat-stroked-button class="stats-add-btn" (click)="selectNewCampaign()"> <button mat-stroked-button (click)="selectNewCampaign()">
Kampagne hinzufügen Kampagne hinzufügen
</button> </button>
</div> </div>

View File

@ -0,0 +1,3 @@
form {
margin-top: 45px;
}

View File

@ -2,7 +2,6 @@
position: fixed; position: fixed;
overflow-y: scroll; overflow-y: scroll;
overflow-x: hidden; overflow-x: hidden;
border-left: thin solid lightgrey;
padding: 20px 0 0 50px; padding: 20px 0 0 50px;
top: 50px; top: 50px;
height: 100vh; height: 100vh;

View File

@ -45,6 +45,7 @@ form {
margin: 0; margin: 0;
position: static; position: static;
float: left; float: left;
border-right: thin solid #dadada;
} }
#right { #right {