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

public/lib/buefy-0.7.5.css

@@ -4148,7 +4148,7 @@ a.list-item {
     font-size: 1.5rem; }
 
 .menu-list {
-    line-height: 1.25;
+    line-height: 1.5;
     float: left;
     width: 230px;
     height: 100%;
@@ -4161,6 +4161,7 @@ a.list-item {
     color: white; }
   .menu-list a {
     border-radius: 2px;
+    padding-bottom: 5px;
     display: block;
     padding: 0.5em 0.75em;
     background-color: #0046a0;
@@ -4176,9 +4177,8 @@ a.list-item {
     margin: 0.75em;
     padding-left: 0.75em;
     background-color: #0046a0; }
-  .menu-item li a {
+  .menu-item li {
-    display: block;
+    line-height: 1.5;
-    padding: 8px 16px;
     text-decoration: none;
     color: white;
 }

public/routes/createMessage.js

@@ -1,42 +1,8 @@
 const CreateMsgRouter = {
 	template: `
 <div class="content">
-    <div class="is-hidden-desktop">
+    <div class="column pull-right-sm is-four-fifths-desktop">
-        <div id="mobile" class="content card om-card">
+        <div id="mobile" class="om-card card">
-            <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 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>

public/routes/files.js

@@ -1,8 +1,7 @@
 const FileRouter = {
     template: `
 <div class="content">
-
+<div class="column is-four-fifths-desktop pull-right-sm">
-<div class="is-hidden-desktop">
 	<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 () {

public/style/style.css

@@ -36,12 +36,6 @@
 .om-content a:hover {
   color: #0046a0;
 }
-.om-content a .menu-list {
-  color: white !important;
-}
-.om-content a .menu-list:hover {
-  color: white !important;
-}
 .content-desktop {
   margin-right: 30px;
 }
@@ -242,3 +236,8 @@ button.clearButton {
 .taglink {
   color: #0046a0;
 }
+@media (min-width: 1088px) {
+  .pull-right-sm {
+    float: right;
+  }
+}

public/style/style.less

@@ -39,10 +39,7 @@
     a{
         color: #0046a0;
         &:hover{color: #0046a0;}
-        .menu-list {
+    }
-            color: white !important;
-            &:hover{color: white !important; }
-        }}
 }
 
 .content-desktop {
@@ -282,3 +279,8 @@ button.clearButton{
 	color: @color;
 }
 
+@media (min-width: 1088px) {
+    .pull-right-sm {
+        float: right;
+    }
+}