Browse Source

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

pull/1/head
Senta Mandutz 5 years ago
parent
commit
1dbb310560

+ 39
- 7
public/bookmark.js View File

const BookmarkRouter = { const BookmarkRouter = {
template: ` template: `
<div> <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 () { data: function () {
return { messages: _messages }; return { messages: _messages };
}, },

+ 1
- 8
public/createMessage.js View File

const CreateMsgRouter = { const CreateMsgRouter = {
template: ` template: `
<div class="card om-card"> <div class="card om-card">
<h5>Neue Nachricht erstellen</h5>
<h4>Neue Nachricht erstellen</h4>
<form class="new-msg-form" @submit.prevent=createMsg> <form class="new-msg-form" @submit.prevent=createMsg>
<div class="form-group bmd-form-group"> <div class="form-group bmd-form-group">
<label class="bmd-label-floating">Betreff</label> <label class="bmd-label-floating">Betreff</label>
<label class="bmd-label-floating">User</label> <label class="bmd-label-floating">User</label>
<input type="text" class="form-control" id="user" value="Dito27"> <input type="text" class="form-control" id="user" value="Dito27">
</div> </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 class="btn btn-default"><a @click="$router.go(-1)">ABBRECHEN </a></button>
<button type="submit" class="btn btn-raised om-btn">SENDEN</button> <button type="submit" class="btn btn-raised om-btn">SENDEN</button>
</form> </form>

+ 2
- 2
public/files.js View File

const FileRouter = { const FileRouter = {
template: ` template: `
<div> <div>
<h3>Dateiablage</h3>
<h4>Wichtige Links</h4>
<div class="empty-state"> <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. Diese Funktion steht noch nicht bereit.
</div> </div>
</div> </div>

BIN
public/img/app_icon.png View File


+ 1
- 1
public/index.html View File

<div id="api"> <div id="api">
<div class="om-header-container"> <div class="om-header-container">
<div class="om-header"> <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"> <form class="om-searchbar">
<input type="search" placeholder="Search..."> <input type="search" placeholder="Search...">
</form> </form>

+ 2
- 2
public/profilCard.js View File

</div> </div>
<hr> <hr>
<div class="om-tab"> <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> </div>
</div>`, </div>`,

+ 23
- 15
public/style/style.css View File

display: flex; display: flex;
padding-left: 2%; padding-left: 2%;
padding-right: 2%; padding-right: 2%;
height: 8%;
height: 65px;
background-color: #0046a0; background-color: #0046a0;
} }
.logo-img {
padding: 10px;
}
.om-searchbar { .om-searchbar {
display: inline-block; display: inline-block;
padding-bottom: 0%;
margin: 3%;
padding: 0;
margin: 15px;
} }
.om-content { .om-content {
margin: 10px; margin: 10px;
margin-top: 75px;
margin-bottom: 70px;
margin-top: 80px;
margin-bottom: 80px;
} }
.om-content a { .om-content a {
color: #0046a0; color: #0046a0;
.om-content a:hover { .om-content a:hover {
color: #0046a0; color: #0046a0;
} }
.om-nav {
position: fixed;
bottom: 0;
height: 65px;
width: 100%;
background-color: #0046a0;
}
.om-nav i {
color: white;
}
.om-card { .om-card {
margin: 10px; margin: 10px;
margin-bottom: 20px; margin-bottom: 20px;
.om-user-line i { .om-user-line i {
margin-right: 2%; margin-right: 2%;
} }
.om-nav {
position: fixed;
bottom: 0;
height: 8%;
width: 100%;
background-color: #0046a0;
}
.om-nav i {
color: white;
}
.bookmark-headline { .bookmark-headline {
margin: 10px; margin: 10px;
padding-bottom: 10px;
} }
.empty-state { .empty-state {
margin: 40px; margin: 40px;
margin-right: auto; margin-right: auto;
margin-bottom: 10px; margin-bottom: 10px;
} }
.om-tablinks {
background: 0;
border: 0;
}
.form-group.is-focused .form-control .custom-file-control, .form-group.is-focused .form-control .custom-file-control,
.form-control, .form-control,
.is-focused .custom-file-control, .is-focused .custom-file-control,

+ 29
- 17
public/style/style.less View File

display: flex; display: flex;
padding-left: 2%; padding-left: 2%;
padding-right: 2%; padding-right: 2%;
height: 8%;
height: 65px;
background-color: @color; background-color: @color;
} }


.logo-img{
padding:10px;
}

.om-searchbar{ .om-searchbar{
display: inline-block; display: inline-block;
padding-bottom: 0%;
margin: 3%;
padding: 0;
margin: 15px;
} }


//content //content
.om-content{ .om-content{
margin: 10px; margin: 10px;
margin-top: 75px;
margin-bottom: 70px;
margin-top: 80px;
margin-bottom: 80px;
a{ a{
color: @color; color: @color;
&:hover{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{ .om-card{
margin: 10px; margin: 10px;
margin-bottom: 20px; margin-bottom: 20px;
justify-content: space-between; justify-content: space-between;
display: flex; display: flex;
} }

.om-btn{ .om-btn{
background-color: @color; background-color: @color;
color: white; color: white;
} }
} }


//footer
.om-nav{
position:fixed;
bottom: 0;
height: 8%;
width: 100%;
background-color: @color;
i{
color: white;
}
}

// bookmark // bookmark
.bookmark-headline{ .bookmark-headline{
margin: 10px; margin: 10px;
padding-bottom: 10px;
} }


//empty state //empty state
margin-bottom: 10px; margin-bottom: 10px;
} }


.om-tablinks{
background: 0;
border: 0;
}



//bmd changes //bmd changes



Loading…
Cancel
Save