From 156604105ecede6fb5a264a96792453c6fe5123a Mon Sep 17 00:00:00 2001
From: Florian Hartwich <s46831@beuth-hochschule.de>
Date: Thu, 18 May 2017 18:01:00 +0200
Subject: [PATCH] Fix cut off table in member overview

---
 static/src/app/army/army-member.component.css | 20 +++++++++++++------
 .../src/app/army/army-member.component.html   | 12 +++++++----
 2 files changed, 22 insertions(+), 10 deletions(-)

diff --git a/static/src/app/army/army-member.component.css b/static/src/app/army/army-member.component.css
index 833ee9e..bb6976b 100644
--- a/static/src/app/army/army-member.component.css
+++ b/static/src/app/army/army-member.component.css
@@ -2,13 +2,23 @@
   position: fixed;
   overflow-y: scroll;
   overflow-x: hidden;
+  bottom: 20px;
   width: 100%;
   padding-left: 50px;
-  padding-top: 20px;
+  padding-top: 190px;
   margin-left: 10px;
   height: 100vh;
 }
 
+.return-button {
+  background: white;
+  width: 90vw;
+  height: 80px;
+  z-index: 1;
+  position: relative;
+  padding: 20px 0 20px 0;
+}
+
 .table {
   overflow-wrap: break-word;
   table-layout: fixed;
@@ -21,14 +31,12 @@
 
 .opfor {
   color: firebrick;
-  margin: 40px 0 40px 0;
-  font-weight: 600
+  font-weight: 600;
 }
 
 .blufor {
   color: blue;
-  margin: 40px 0 40px 0;
-  font-weight: 600
+  font-weight: 600;
 }
 
 .table-head {
@@ -37,5 +45,5 @@
 }
 
 .cell-outline {
-  outline:1px solid #D4D4D4;
+  outline: 1px solid #D4D4D4;
 }
diff --git a/static/src/app/army/army-member.component.html b/static/src/app/army/army-member.component.html
index 7d1d016..da0b6ae 100644
--- a/static/src/app/army/army-member.component.html
+++ b/static/src/app/army/army-member.component.html
@@ -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">
 
-  <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="table-container" style="width: 75%; min-width: 500px">
       <table class="table table-hover">