hardi
/
opt-cc
1
0
Fork 0
Code Pull Requests Releases 47 Activity

Fix cut off table in member overview

pull/1/head
Florian Hartwich 2017-05-18 18:01:00 +02:00
parent 12f63492cf
commit 156604105e
2 changed files with 22 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
static/src/app/army/army-member.component.css
View File

@ -2,13 +2,23 @@
position: fixed; position: fixed;
overflow-y: scroll; overflow-y: scroll;
overflow-x: hidden; overflow-x: hidden;
bottom: 20px;
width: 100%; width: 100%;
padding-left: 50px; padding-left: 50px;
padding-top: 20px; padding-top: 190px;
margin-left: 10px; margin-left: 10px;
height: 100vh; height: 100vh;
} }
.return-button {
background: white;
width: 90vw;
height: 80px;
z-index: 1;
position: relative;
padding: 20px 0 20px 0;
}
.table { .table {
overflow-wrap: break-word; overflow-wrap: break-word;
table-layout: fixed; table-layout: fixed;
@ -21,14 +31,12 @@
.opfor { .opfor {
color: firebrick; color: firebrick;
margin: 40px 0 40px 0; font-weight: 600;
font-weight: 600
} }
.blufor { .blufor {
color: blue; color: blue;
margin: 40px 0 40px 0; font-weight: 600;
font-weight: 600
} }
.table-head { .table-head {
@ -37,5 +45,5 @@
} }
.cell-outline { .cell-outline {
outline:1px solid #D4D4D4; outline: 1px solid #D4D4D4;
} }

12
static/src/app/army/army-member.component.html
View File

@ -1,10 +1,14 @@
<span class="btn btn-default" style="margin-top: 20px" (click)="backToOverview()">< zurück zur Übersicht</span> <div class="return-button">
<span class="btn btn-default" style="float:left" (click)="backToOverview()">< zurück zur Übersicht</span>
<h3 [ngClass]="user.squad?.fraction === 'BLUFOR' ? 'blufor' : 'opfor'" style="padding-left: 20%;">
Auszeichnungen von {{user.rank?.name}} {{user.username}}
</h3>
</div>
<div class="overview"> <div class="overview">
<h3 [ngClass]="user.squad?.fraction === 'BLUFOR' ? 'blufor' : 'opfor'">Auszeichnungen von {{user.rank?.name}}
{{user.username}}</h3>
<div class="pull-left" style="margin-top:20px;"> <div class="pull-left" style="margin-top:20px;">
<div class="table-container" style="width: 75%; min-width: 500px"> <div class="table-container" style="width: 75%; min-width: 500px">
<table class="table table-hover"> <table class="table table-hover">