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

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

Browse Source
This commit is contained in:
mandutzse68104
2019-02-08 13:40:34 +01:00
parent 31f1add35d c802056b2d
commit 1dbb310560
8 changed files with 97 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files
public/bookmark.js
+39 -7
View File
@@ -1,13 +1,45 @@
const BookmarkRouter = {
template: `
<div>
<div class="bookmark-headline"><h3>Gepeicherte Beiträge</h3></div>
<MsgCard
v-for="(msg, index) in messages"
:key="msg.id"
:msg="msg"
></MsgCard>
</div>`,
<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. <br><br>
<a href="#">#beispiel #tag</a></p>
<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">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></p>
<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">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></p>
<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">bookmark</i>
</div></div>
</div>
</div>`,
data: function () {
return { messages: _messages };
},
public/createMessage.js
+1 -8
View File
@@ -1,7 +1,7 @@
const CreateMsgRouter = {
template: `
<div class="card om-card">
<h5>Neue Nachricht erstellen</h5>
<h4>Neue Nachricht erstellen</h4>
<form class="new-msg-form" @submit.prevent=createMsg>
<div class="form-group bmd-form-group">
<label class="bmd-label-floating">Betreff</label>
@@ -19,13 +19,6 @@ const CreateMsgRouter = {
<label class="bmd-label-floating">User</label>
<input type="text" class="form-control" id="user" value="Dito27">
</div>
<div class="form-group">
<div class="checkbox">
<label>
<input type="checkbox"> Zusätzlich als E-mail versenden
</label>
</div>
</div>
<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>
public/files.js
+2 -2
View File
@@ -1,9 +1,9 @@
const FileRouter = {
template: `
<div>
<h3>Dateiablage</h3>
<h4>Wichtige Links</h4>
<div class="empty-state">
<i class="material-icons"> folder_open </i><br>
<i class="material-icons"> widgets </i><br>
Diese Funktion steht noch nicht bereit.
</div>
</div>
public/img/app_icon.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 46 KiB

public/index.html
+1 -1
View File
@@ -60,7 +60,7 @@
<div id="api">
<div class="om-header-container">
<div class="om-header">
<a href="index.html"><img src="img/th_nbg_ohmicon_amp.png" width=55px height=55px></a>
<a class="logo-img" href="index.html"><img src="img/app_icon.png" width=45px height=45px></a>
<form class="om-searchbar">
<input type="search" placeholder="Search...">
</form>
public/profilCard.js
+2 -2
View File
@@ -10,8 +10,8 @@ Vue.component('ProfilCard', {
</div>
<hr>
<div class="om-tab">
<button class="tablinks"><b>Abonniert<br>{{ profil.abos }}</b></button>
<button class="tablinks"><b>Gespeichert<br>{{ profil.saved }}</b></button>
<button class="tablinks om-tablinks"><b>Abonniert<br>{{ profil.abos }}</b></button>
<button class="tablinks om-tablinks"><b>Gespeichert<br>{{ profil.saved }}</b></button>
</div>
</div>
</div>`,
public/style/style.css
+23 -15
View File
@@ -11,18 +11,21 @@
display: flex;
padding-left: 2%;
padding-right: 2%;
height: 8%;
height: 65px;
background-color: #0046a0;
}
.logo-img {
padding: 10px;
}
.om-searchbar {
display: inline-block;
padding-bottom: 0%;
margin: 3%;
padding: 0;
margin: 15px;
}
.om-content {
margin: 10px;
margin-top: 75px;
margin-bottom: 70px;
margin-top: 80px;
margin-bottom: 80px;
}
.om-content a {
color: #0046a0;
@@ -30,6 +33,16 @@
.om-content a:hover {
color: #0046a0;
}
.om-nav {
position: fixed;
bottom: 0;
height: 65px;
width: 100%;
background-color: #0046a0;
}
.om-nav i {
color: white;
}
.om-card {
margin: 10px;
margin-bottom: 20px;
@@ -57,18 +70,9 @@
.om-user-line i {
margin-right: 2%;
}
.om-nav {
position: fixed;
bottom: 0;
height: 8%;
width: 100%;
background-color: #0046a0;
}
.om-nav i {
color: white;
}
.bookmark-headline {
margin: 10px;
padding-bottom: 10px;
}
.empty-state {
margin: 40px;
@@ -122,6 +126,10 @@
margin-right: auto;
margin-bottom: 10px;
}
.om-tablinks {
background: 0;
border: 0;
}
.form-group.is-focused .form-control .custom-file-control,
.form-control,
.is-focused .custom-file-control,
public/style/style.less
+29 -17
View File
@@ -14,27 +14,44 @@
display: flex;
padding-left: 2%;
padding-right: 2%;
height: 8%;
height: 65px;
background-color: @color;
}
.logo-img{
padding:10px;
}
.om-searchbar{
display: inline-block;
padding-bottom: 0%;
margin: 3%;
padding: 0;
margin: 15px;
}
//content
.om-content{
margin: 10px;
margin-top: 75px;
margin-bottom: 70px;
margin-top: 80px;
margin-bottom: 80px;
a{
color: @color;
&:hover{color:@color;}
}
}
//footer
.om-nav{
position:fixed;
bottom: 0;
height: 65px;
width: 100%;
background-color: @color;
i{
color: white;
}
}
//msg-Card
.om-card{
margin: 10px;
margin-bottom: 20px;
@@ -45,6 +62,7 @@
justify-content: space-between;
display: flex;
}
.om-btn{
background-color: @color;
color: white;
@@ -66,21 +84,10 @@
}
}
//footer
.om-nav{
position:fixed;
bottom: 0;
height: 8%;
width: 100%;
background-color: @color;
i{
color: white;
}
}
// bookmark
.bookmark-headline{
margin: 10px;
padding-bottom: 10px;
}
//empty state
@@ -139,6 +146,11 @@
margin-bottom: 10px;
}
.om-tablinks{
background: 0;
border: 0;
}
//bmd changes