Merge remote-tracking branch 'origin/developer' into developer

public/routes/createMessage.js

@@ -1,8 +1,8 @@
 const CreateMsgRouter = {
 	template: `
 <div class="content">
-    <div class="is-hidden-desktop">
-        <div id="mobile" class="content card om-card">
+    <div class="column pull-right-sm is-four-fifths-desktop">
+        <div id="mobile" class="om-card card">
             <h4>Neue Nachricht erstellen</h4>
             <b-field>
                 <b-input placeholder="User" id="user"></b-input>
@@ -34,40 +34,6 @@ const CreateMsgRouter = {
 	       <b-button type="is-primary" @click="createMsg">SENDEN</b-button>
         </div>
     </div>
-
-    <div class="column is-three-quarters is-pulled-right is-hidden-touch content-desktop">
-        <div id="desktop" class="content">
-            <h4>Neue Nachricht erstellen</h4>
-            <b-field>
-                <b-input placeholder="User" id="user"></b-input>
-            </b-field>
-
-            <b-field>
-                <b-input placeholder="Betreff" id="subject"></b-input>
-            </b-field>
-
-            <b-field label="Tags">
-                <b-taginput
-                    id="tag"
-                    v-model="selected"
-                    :data="filteredDataArray"
-                    autocomplete
-                    allow-new:false
-                    icon="label"
-                    placeholder="#"
-
-                    @input="saveTagsToArray">
-                </b-taginput>
-            </b-field>
-
-            <b-field>
-                <b-input placeholder="Nachricht" id="message" type="textarea"></b-input>
-            </b-field>
-
-            <b-button @click="$router.go(-1)">ABBRECHEN</b-button>
-            <b-button type="is-primary" @click="createMsg">SENDEN</b-button>
-        </div>
-    </div>
 </div>`,
 
 	data: function () {

public/routes/files.js

@@ -1,8 +1,7 @@
 const FileRouter = {
     template: `
 <div class="content">
-
-<div class="is-hidden-desktop">
+<div class="column is-four-fifths-desktop pull-right-sm">
 	<h4>Erweiterte Suche</h4>
 	<b-field label="Suche nach">
 		<b-select
@@ -38,44 +37,6 @@ const FileRouter = {
     ></MsgCard>
 </div>
 </div>
-
-<div class="column is-three-quarters is-pulled-right is-hidden-touch content-desktop">
-	<h4>Erweiterte Suche</h4>
-	<b-field label="Suche nach">
-		<b-select
-			placeholder="Wähle eine Suchform"
-			v-model="selectedOptions">
-			<option value="freeSearch">Freie Suche</option>
-			<option value="subject">Betreff</option>
-			<option value="tags">Tags</option>
-			<option value="text">Nachrichtentext</option>
-			<option value="user">User</option>
-		</b-select>
-	</b-field>
-
-	<b-field v-if="selectedOptions=='freeSearch'||selectedOptions=='subject'|| selectedOptions=='text' || selectedOptions=='user'">
-        <b-input id="freeSe"></b-input>
-    </b-field>
-
-	<b-field v-if="selectedOptions=='tags'">
-        <b-autocomplete rounded v-model="searchtext"
-        :data="filteredDataArray"
-        placeholder="suche..." icon="magnify"
-        @select="option => selected = option">
-        </b-autocomplete>
-	</b-field>
-
-	<b-button type="is-primary" @click="search">SUCHE</b-button>
-
-<div id="om-msg-cards">
-    <MsgCard
-        v-for="id in messagelist.slice().reverse()"
-        :key="id"
-        :msg="messages[id] || {}"
-    ></MsgCard>
-</div>
-</div>
-
 </div>
 `,
     data: function () {