From b2ecbb6e1259c4d9b90afb312f0feb4a1cf35397 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Xenia=20Gr=C3=BCnzinger?=
 <xenia@roam208166.roam.fh-nuernberg.de>
Date: Tue, 18 Dec 2018 09:20:13 +0100
Subject: [PATCH] Bookmark-Icon auf Card gepackt + Keine Nav-Zeile beim
 Formular

---
 public/createMessage.js | 2 +-
 public/index.html       | 2 +-
 public/msgCard.js       | 5 +++--
 public/style/style.css  | 5 +++++
 public/style/style.less | 7 ++++++-
 5 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/public/createMessage.js b/public/createMessage.js
index ef9eac5..4dfbefc 100644
--- a/public/createMessage.js
+++ b/public/createMessage.js
@@ -22,7 +22,7 @@ const CreateMsgRouter = {
 				</label>
 			</div>
 		</div>
-		<button class="btn btn-default"><a href="index.html#/home">ABBRECHEN </a></button>
+		<button class="btn btn-default"><a @click="$router.go(-1)">ABBRECHEN </a></button>
 		<button type="submit" class="btn btn-raised om-btn">SENDEN</button>
 	</form>
 </div>
diff --git a/public/index.html b/public/index.html
index 8c4dbea..9b7bcbe 100644
--- a/public/index.html
+++ b/public/index.html
@@ -73,7 +73,7 @@
             <router-view></router-view>
         </div>
 
-        <nav class="nav nav-tabs nav-justified om-nav ">
+        <nav class="nav nav-tabs nav-justified om-nav" v-if="$route.path !=='/createMessage' ">
             <router-link to="/home" class="nav-item nav-link"><i class="material-icons">home</i></router-link>
             <router-link to="/files" class="nav-item nav-link"><i class="material-icons">folder</i></router-link>
             <router-link to="/createMessage" class="nav-item nav-link outlined"><i class="material-icons">add_circle</i></router-link>
diff --git a/public/msgCard.js b/public/msgCard.js
index 792c16a..5276995 100644
--- a/public/msgCard.js
+++ b/public/msgCard.js
@@ -6,9 +6,10 @@ Vue.component('MsgCard', {
                 </h6>
                 {{ msg.message }}<br><br>
                 <a href="#">{{ msg.tag }}</a></p>
-                <div class="om-user-line">
+                <div class="om-card-footer"> <div class="om-user-line">
                 <i class="material-icons">account_circle</i>
-                Erstellt von {{ msg.user }}
+                Erstellt von {{ msg.user }}</div>
+				<i class="material-icons">bookmark_border</i>
                 </div></div>`,
     props: ['msg']
 });
diff --git a/public/style/style.css b/public/style/style.css
index ae6f4b2..3637034 100644
--- a/public/style/style.css
+++ b/public/style/style.css
@@ -35,6 +35,10 @@
   margin-bottom: 20px;
   padding: 20px;
 }
+.om-card-footer {
+  justify-content: space-between;
+  display: flex;
+}
 .om-btn {
   background-color: #0046a0;
   color: white;
@@ -48,6 +52,7 @@
 }
 .om-user-line {
   display: flex;
+  width: 80%;
 }
 .om-user-line i {
   margin-right: 2%;
diff --git a/public/style/style.less b/public/style/style.less
index e301ff7..9f26ec3 100644
--- a/public/style/style.less
+++ b/public/style/style.less
@@ -40,6 +40,11 @@
     margin-bottom: 20px;
     padding: 20px;
 }
+
+.om-card-footer{
+	justify-content: space-between;
+	display: flex;
+}
 .om-btn{
     background-color: @color;
 	color: white;
@@ -53,9 +58,9 @@
 	}
 }
 
-
 .om-user-line{
     display: flex;
+	width: 80%;
     i{
         margin-right: 2%;
     }