hopfma/om
4
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Desktopansicht angepasst

Browse Source
This commit is contained in:
Edwina Barbalan 2019-07-19 11:54:13 +02:00
parent 9d3d1b707e
commit 373d644134
7 changed files with 268 additions and 138 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
public/index.html
View File

@ -47,11 +47,8 @@
<link rel="apple-touch-startup-image" sizes="640x1136" href="ios-splash/apple_splash_640.png" /><!-- Phone --> <link rel="apple-touch-startup-image" sizes="640x1136" href="ios-splash/apple_splash_640.png" /><!-- Phone -->
<!-- NOTE: CSS --> <!-- NOTE: CSS -->
<!-- CSS_Material Design for Bootstrap fonts and icons --> <!-- CSS_Material Design for Bootstrap fonts and icons -->
<link rel="stylesheet" href="lib/bootstrap-font-and-icons.css"> <link rel="stylesheet" href="lib/bootstrap-font-and-icons.css">
<!-- CSS_Material Design for Bootstrap minified CSS -->
<!--<link rel="stylesheet" href="lib/bootstrap-material-design.min.css">-->
<!-- NOTE: Call manifest.json --> <!-- NOTE: Call manifest.json -->
<link rel="manifest" href="manifest.json"> <link rel="manifest" href="manifest.json">
@ -63,15 +60,10 @@
<!-- Buefy/Vuetify --> <!-- Buefy/Vuetify -->
<script src="lib/buefy-0.7.5.js"></script> <script src="lib/buefy-0.7.5.js"></script>
<!-- <script src="lib/buefy-0.7.5.min.js"></script>--> <!-- <script src="lib/buefy-0.7.5.min.js"></script>-->
<link rel="stylesheet" href="https://cdn.materialdesignicons.com/2.5.94/css/materialdesignicons.min.css"> <link rel="stylesheet" href="https://cdn.materialdesignicons.com/2.5.94/css/materialdesignicons.min.css">
<link rel="stylesheet" type="text/css" href="lib/buefy-0.7.5.css"> <link rel="stylesheet" type="text/css" href="lib/buefy-0.7.5.css">
<!--<link rel="stylesheet" type="text/css" href="lib/buefy-0.7.5.min.css">--> <!--<link rel="stylesheet" type="text/css" href="lib/buefy-0.7.5.min.css">-->
<!-- <script src="lib/vuetify-1.5.14.js"></script>-->
<!-- <script src="lib/vuetify-1.5.14.min.js"></script>-->
<!-- <link rel="stylesheet" type="text/css" href="lib/vuetify-1.5.14.css">-->
<!-- <link rel="stylesheet" type="text/css" href="lib/vuetify-1.5.14.min.css">-->
<!-- CSS_Custom Design --> <!-- CSS_Custom Design -->
<link rel="stylesheet" type="text/css" href="style/style.css"> <link rel="stylesheet" type="text/css" href="style/style.css">
@ -155,36 +147,6 @@
</b-tabs>--> </b-tabs>-->
<!--
<nav class="navbar is-fixed-bottom is-expanded is-light is-hoverable" role="navigation" aria-label="main navigation">
<div class="navbar-brand is-expanded">
<router-link to="/home" class="navbar-item is-expanded has-text-centered is-active">
<i class="material-icons">home</i>
</router-link>
<router-link to="/files" class="navbar-item is-expanded">
<i class="material-icons">language</i>
</router-link>
<router-link to="/createMessage" class="navbar-item is-expanded">
<i class="material-icons">add_circle</i>
</router-link>
<router-link to="/bookmark" class="navbar-item is-expanded">
<i class="material-icons">bookmark</i>
</router-link>
<router-link to="/profil" class="navbar-item is-expanded">
<i class="material-icons">person</i>
</router-link>
</div>
</nav>
<nav class="nav nav-tabs nav-justified om-nav" v-if="$route.path !=='/createMessage' ">
<router-link to="/home" class="navbar-item has-text-centered"><i class="material-icons">home</i></router-link>
<router-link to="/files" class="navbar-item has-text-centered"><i class="material-icons">language</i></router-link>
<router-link to="/createMessage" class="navbar-item has-text-centered outlined"><i class="material-icons">add_circle</i></router-link>
<router-link to="/bookmark" class="navbar-item has-text-centered"><i class="material-icons">bookmark</i></router-link>
<router-link to="/profil" class="navbar-item has-text-centered"><i class="material-icons">person</i></router-link>
</nav>
</div>
-->
<script> <script>
var tagArray = ["lorem"]; var tagArray = ["lorem"];
const dat=[ const dat=[
@ -194,18 +156,6 @@
]; ];
</script> </script>
<!-- const routes = [
{ path: "/", component: HomeRouter },
{ path: "/home", component: HomeRouter },
{ path: "/files", component: FileRouter },
{ path: "/createMessage", component: CreateMsgRouter },
{ path: "/bookmark", component: BookmarkRouter },
{ path: "/profil", component: ProfilRouter },
];
const router = new VueRouter({
routes
}); -->
<script> <script>
var app = new Vue({ var app = new Vue({
router, router,

50
public/lib/buefy-0.7.5.css
View File

@ -442,13 +442,13 @@ body {
line-height: 1.5; } line-height: 1.5; }
a { a {
color: #0046a0; color: white;
cursor: pointer; cursor: pointer;
text-decoration: none; } text-decoration: none; }
a strong { a strong {
color: currentColor; } color: currentColor; }
a:hover { a:hover {
color: #363636; } color: white; }
code { code {
background-color: whitesmoke; background-color: whitesmoke;
@ -4139,22 +4139,40 @@ a.list-item {
font-size: 1.5rem; } font-size: 1.5rem; }
.menu-list { .menu-list {
line-height: 1.25; } line-height: 1.25;
float: left;
width: 230px;
height: 85%;
position: fixed;
text-align: left;
background-color: #0046a0;
color: white; }
.menu-list a { .menu-list a {
border-radius: 2px; border-radius: 2px;
color: #4a4a4a;
display: block; display: block;
padding: 0.5em 0.75em; } padding: 0.5em 0.75em;
.menu-list a:hover { background-color: #0046a0; }
background-color: whitesmoke; .menu-list a:hover {
color: #363636; } background-color: #01295d;
.menu-list a.is-active { color: white; }
background-color: #0046a0; .menu-list a.is-active{
color: white; } background-color: #01295d;
.menu-list li ul { color: white; }
border-left: 1px solid #dbdbdb; .menu-item ul {
list-style-type: none;
margin: 0.75em; margin: 0.75em;
padding-left: 0.75em; } padding-left: 0.75em;
background-color: #0046a0; }
.menu-item li a {
display: block;
padding: 8px 16px;
text-decoration: none;
color: white;
}
.menu-item {
background-color: #0046a0;
color: white;
}
.menu-label { .menu-label {
color: #7a7a7a; color: #7a7a7a;
@ -4569,8 +4587,8 @@ a.list-item {
.navbar.is-primary .navbar-end > a.navbar-item.is-active, .navbar.is-primary .navbar-end > a.navbar-item.is-active,
.navbar.is-primary .navbar-end .navbar-link:hover, .navbar.is-primary .navbar-end .navbar-link:hover,
.navbar.is-primary .navbar-end .navbar-link.is-active { .navbar.is-primary .navbar-end .navbar-link.is-active {
background-color: #e8e8e8; background-color: #0046a0;
color: #0046a0; } color: white; }
.navbar.is-primary .navbar-start .navbar-link::after, .navbar.is-primary .navbar-start .navbar-link::after,
.navbar.is-primary .navbar-end .navbar-link::after { .navbar.is-primary .navbar-end .navbar-link::after {
border-color: white; } border-color: white; }

127
public/routes/bookmark.js
View File

@ -1,48 +1,111 @@
const BookmarkRouter = { const BookmarkRouter = {
template: ` template: `
<div> <div class="content">
<div class="bookmark-headline"><h4>Gepeicherte Beiträge</h4></div> <div class="is-hidden-desktop">
<div class="om-card card"> <div class="bookmark-headline"><h4>Gepeicherte Beiträge</h4></div>
<h6 class="msg-head"> <div class="om-card card">
<h6 class="msg-head">
<b>Betreff</b> <b>Betreff</b>
<img src="favicon.ico" width=20px height=20px> <img src="favicon.ico" width=20px height=20px>
</h6> </h6>
Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. <br><br> Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. <br><br>
<a href="#">#beispiel #tag</a></p> <a href="#">#beispiel #tag</a>
<div class="om-card-footer"> <div class="om-user-line"> <div class="om-card-footer">
<i class="material-icons">account_circle</i> <div class="om-user-line">
Erstellt von User 1</div> <i class="material-icons">account_circle</i>
Erstellt von User 1
</div>
<i class="material-icons" @click="myFilter" v-if="!isActive">bookmark_border</i> <i class="material-icons" @click="myFilter" v-if="!isActive">bookmark_border</i>
<i class="material-icons" @click="myFilter" v-else="isActive">bookmark</i> <i class="material-icons" @click="myFilter" v-else="isActive">bookmark</i>
</div></div> </div>
<div class="om-card card"> </div>
<h6 class="msg-head"> <div class="om-card card">
<h6 class="msg-head">
<b>Betreff</b> <b>Betreff</b>
<img src="favicon.ico" width=20px height=20px> <img src="favicon.ico" width=20px height=20px>
</h6> </h6>
Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. <br><br> Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. <br><br>
<a href="#">#beispiel #tag</a></p> <a href="#">#beispiel #tag</a>
<div class="om-card-footer"> <div class="om-user-line"> <div class="om-card-footer">
<i class="material-icons">account_circle</i> <div class="om-user-line">
Erstellt von User 2</div> <i class="material-icons">account_circle</i>
<i class="material-icons" @click="myFilter" v-if="!isActive">bookmark_border</i> Erstellt von User 2
</div>
<i class="material-icons" @click="myFilter" v-if="!isActive">bookmark_border</i>
<i class="material-icons" @click="myFilter" v-else="isActive">bookmark</i> <i class="material-icons" @click="myFilter" v-else="isActive">bookmark</i>
</div></div> </div>
<div class="om-card card"> </div>
<h6 class="msg-head"> <div class="om-card card">
<h6 class="msg-head">
<b>Betreff</b> <b>Betreff</b>
<img src="favicon.ico" width=20px height=20px> <img src="favicon.ico" width=20px height=20px>
</h6> </h6>
Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. <br><br> Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. <br><br>
<a href="#">#beispiel #tag</a></p> <a href="#">#beispiel #tag</a>
<div class="om-card-footer"> <div class="om-user-line"> <div class="om-card-footer">
<i class="material-icons">account_circle</i> <div class="om-user-line">
Erstellt von User 3</div> <i class="material-icons">account_circle</i>
Erstellt von User 3
</div>
<i class="material-icons" @click="myFilter" v-if="!isActive">bookmark_border</i> <i class="material-icons" @click="myFilter" v-if="!isActive">bookmark_border</i>
<i class="material-icons" @click="myFilter" v-else="isActive">bookmark</i> <i class="material-icons" @click="myFilter" v-else="isActive">bookmark</i>
</div></div> </div>
</div> </div>
</div>`, </div>
<div class="column is-three-quarters is-pulled-right is-hidden-touch content-desktop">
<div class="bookmark-headline"><h4>Gepeicherte Beiträge</h4></div>
<div class="om-card card">
<h6 class="msg-head">
<b>Betreff</b>
<img src="favicon.ico" width=20px height=20px>
</h6>
Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. <br><br>
<a href="#">#beispiel #tag</a>
<div class="om-card-footer">
<div class="om-user-line">
<i class="material-icons">account_circle</i>
Erstellt von User 1
</div>
<i class="material-icons" @click="myFilter" v-if="!isActive">bookmark_border</i>
<i class="material-icons" @click="myFilter" v-else="isActive">bookmark</i>
</div>
</div>
<div class="om-card card">
<h6 class="msg-head">
<b>Betreff</b>
<img src="favicon.ico" width=20px height=20px>
</h6>
Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. <br><br>
<a href="#">#beispiel #tag</a>
<div class="om-card-footer">
<div class="om-user-line">
<i class="material-icons">account_circle</i>
Erstellt von User 2
</div>
<i class="material-icons" @click="myFilter" v-if="!isActive">bookmark_border</i>
<i class="material-icons" @click="myFilter" v-else="isActive">bookmark</i>
</div>
</div>
<div class="om-card card">
<h6 class="msg-head">
<b>Betreff</b>
<img src="favicon.ico" width=20px height=20px>
</h6>
Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. <br><br>
<a href="#">#beispiel #tag</a>
<div class="om-card-footer">
<div class="om-user-line">
<i class="material-icons">account_circle</i>
Erstellt von User 3
</div>
<i class="material-icons" @click="myFilter" v-if="!isActive">bookmark_border</i>
<i class="material-icons" @click="myFilter" v-else="isActive">bookmark</i>
</div>
</div>
</div>
</div>`,
data: function () { data: function () {
return { return {
messages: _messages, messages: _messages,

92
public/routes/createMessage.js
View File

@ -6,40 +6,76 @@ const data=[
]; ];
const CreateMsgRouter = { const CreateMsgRouter = {
template: ` template: `
<div class="content card om-card"> <div class="content">
<h4>Neue Nachricht erstellen</h4> <div class="is-hidden-desktop">
<div class="content card om-card">
<h4>Neue Nachricht erstellen</h4>
<b-field>
<b-input placeholder="User" id="user"></b-input>
</b-field>
<b-field> <b-field>
<b-input placeholder="User" id="user"></b-input> <b-input placeholder="Betreff" id="subject"></b-input>
</b-field> </b-field>
<b-field> <b-field label="Tags">
<b-input placeholder="Betreff" id="subject"></b-input> <b-taginput
</b-field> id="tag"
v-model="selected"
:data=taglist
autocomplete
allow-new:false
icon="label"
placeholder="#"
@typing="getFilteredTags"
@input="saveTagsToArray">
</b-taginput>
</b-field>
<b-field label="Tags"> <b-field>
<b-taginput <b-input placeholder="Nachricht" id="message" type="textarea"></b-input>
id="tag" </b-field>
v-model="selected"
:data=taglist
autocomplete
allow-new:false
icon="label"
placeholder="#"
@typing="getFilteredTags"
@input="saveTagsToArray">
</b-taginput>
</b-field>
<b-field> <b-button @click="$router.go(-1)">ABBRECHEN</b-button>
<b-input placeholder="Nachricht" id="message" type="textarea"></b-input> <b-button type="is-primary" @click="createMsg">SENDEN</b-button>
</b-field> </div>
</div>
<b-button @click="$router.go(-1)">ABBRECHEN</b-button> <div class=" column is-three-quarters is-pulled-right is-hidden-touch content-desktop">
<b-button type="is-primary" @click="createMsg">SENDEN</b-button> <div class="content card om-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=taglist
autocomplete
allow-new:false
icon="label"
placeholder="#"
@typing="getFilteredTags"
@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>`,
</div>
`,
data: function () { data: function () {
return { return {
selected: [], selected: [],

64
public/routes/navRoutes.js
View File

@ -1,29 +1,57 @@
Vue.component('nav-router', { Vue.component('nav-router', {
template: ` template: `
<div> <div>
<nav class="navbar is-fixed-bottom is-expanded is-primary" role="navigation" aria-label="main navigation"> <nav class="navbar is-fixed-bottom is-expanded is-primary is-hidden-desktop" role="navigation" aria-label="main navigation">
<div class="navbar-brand is-expanded is-light"> <div class="navbar-brand is-expanded is-light">
<router-link to="/home" class="navbar-item is-primary is-expanded has-text-centered"> <router-link to="/home" class="navbar-item is-primary is-expanded has-text-centered is-hidden-desktop">
<i class="material-icons">home</i> <i class="material-icons">home</i>
</router-link> </router-link>
<router-link to="/files" class="navbar-item is-primary is-expanded"> <router-link to="/files" class="navbar-item is-primary is-expanded is-hidden-desktop">
<i class="material-icons">language</i> <i class="material-icons">language</i>
</router-link> </router-link>
<router-link to="/createMessage" class="navbar-item is-primary is-expanded"> <router-link to="/createMessage" class="navbar-item is-primary is-expanded is-hidden-desktop">
<i class="material-icons">add_circle</i> <i class="material-icons">add_circle</i>
</router-link> </router-link>
<router-link to="/bookmark" class="navbar-item is-primary is-expanded"> <router-link to="/bookmark" class="navbar-item is-primary is-expanded is-hidden-desktop">
<i class="material-icons">bookmark</i> <i class="material-icons">bookmark</i>
</router-link> </router-link>
<router-link to="/profil" class="navbar-item is-primary is-expanded"> <router-link to="/profil" class="navbar-item is-primary is-expanded is-hidden-desktop">
<i class="material-icons">person</i> <i class="material-icons">person</i>
</router-link> </router-link>
</div> </div>
</nav> </nav>
<div class="is-fullheight">
<div class="column is-sidebar-menu is-hidden-touch">
<aside class="menu is-medium">
<ul class="menu-list">
<li><router-link to="/home" class="is-hidden-touch">
<i class="material-icons">home</i> Home
</router-link></li>
<li><router-link to="/files" class="is-hidden-touch">
<i class="material-icons">language</i> Language
</router-link></li>
<li><router-link to="/createMessage" class="is-hidden-touch">
<i class="material-icons">add_circle</i> Create Message
</router-link></li>
<li><router-link to="/bookmark" class="is-hidden-touch">
<i class="material-icons">bookmark</i> Bookmark
</router-link></li>
<li><router-link to="/profil" class="is-hidden-touch">
<i class="material-icons">person</i> Profil
</router-link></li>
</ul>
</aside>
</div>
</div>
</div>`, </div>`,
}); });
@ -41,3 +69,27 @@ const router = new VueRouter({
routes, routes,
linkActiveClass: 'is-active' linkActiveClass: 'is-active'
}); });
/*
<div class="nav-right nav-menu is-hidden-desktop-only">
<router-link to="/home" class="nav-item is-primary is-expanded has-text-centered is-hidden-desktop-only">
<i class="material-icons">home</i> Home
</router-link>
<router-link to="/files" class="nav-item is-primary is-expanded has-text-centered is-hidden-desktop-only">
<i class="material-icons">language</i> Language
</router-link>
<router-link to="/createMessage" class="navbar-item is-primary is-expanded has-text-centered is-hidden-desktop-only">
<i class="material-icons">add_circle</i> Create Message
</router-link>
<router-link to="/bookmark" class="navbar-item is-primary is-expanded has-text-centered is-hidden-desktop-only">
<i class="material-icons">bookmark</i> Bookmark
</router-link>
<router-link to="/profil" class="navbar-item is-primary is-expanded has-text-centered is-hidden-desktop-only">
<i class="material-icons">person</i> Profil
</router-link>
</div>
*/

9
public/style/style.css
View File

@ -27,12 +27,17 @@
margin: 10px; margin: 10px;
margin-top: 80px; margin-top: 80px;
margin-bottom: 80px; margin-bottom: 80px;
width: auto;
overflow: hidden;
} }
.om-content a { .om-content a {
color: #0046a0; color: white;
} }
.om-content a:hover { .om-content a:hover {
color: #0046a0; color: white;
}
.content-desktop {
margin-right: 30px;
} }
.om-nav { .om-nav {
position: fixed; position: fixed;

10
public/style/style.less
View File

@ -34,12 +34,18 @@
margin: 10px; margin: 10px;
margin-top: 80px; margin-top: 80px;
margin-bottom: 80px; margin-bottom: 80px;
width: auto;
overflow: hidden;
a{ a{
color: @color; color: white;
&:hover{color:@color;} &:hover{color:white;}
} }
} }
.content-desktop {
margin-right: 30px;
}
//footer //footer
.om-nav{ .om-nav{
position:fixed; position:fixed;