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

Compare commits

...

4 Commits
35b5748af9 ... c8aee0c979

Author SHA1 Message Date
Xenia
c8aee0c979 x bei suche geändert 2019-07-19 15:36:38 +02:00
Xenia
d8091ecafd x bei suche formatiert 2019-07-19 15:35:11 +02:00
Xenia
a56ab9cadd Merge remote-tracking branch 'origin/developer' into developer 
# Conflicts:
#	public/index.html
#	public/routes/navRoutes.js
 2019-07-19 15:34:10 +02:00
Xenia
a4da6243f5 few style changes 2019-07-19 15:28:26 +02:00
3 changed files with 20 additions and 4 deletions

3
public/index.html

@ -52,7 +52,6 @@
<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">-->
>>>>>>> origin/developer
<!-- NOTE: Call manifest.json -->
<link rel="manifest" href="manifest.json">
@ -73,7 +72,6 @@
<!-- <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">-->
>>>>>>> origin/developer
<!-- CSS_Custom Design -->
<link rel="stylesheet" type="text/css" href="style/style.css">
@ -105,6 +103,7 @@
<b-autocomplete rounded v-model="searchtext" @keydown.native.enter="search" :data="filteredDataArray" placeholder="suche..." icon="magnify" @select="option => selected = option">
</b-autocomplete>
<button @click="clear">x</button>
</b-field>
</form>

4
public/routes/navRoutes.js

@ -7,8 +7,8 @@ Vue.component('nav-router', {
<i class="material-icons">home</i>
</router-link>
<router-link to="/files" class="navbar-item is-primary is-expanded is-hidden-desktop">
<i class="material-icons">language</i>
<router-link to="/files" class="navbar-item is-primary is-expanded">
<i class="material-icons">search</i>
</router-link>
<router-link to="/createMessage" class="navbar-item is-primary is-expanded is-hidden-desktop">

17
public/style/style.css

@ -221,3 +221,20 @@ label.checkbox-inline input[type=checkbox]:checked + .checkbox-decorator .check
margin-top: 30%;
font-size:140%;
}*/
input.input.is-rounded{
border-radius: 0 !important;
box-shadow: none !important;
}
button.button.is-light{
border-radius: 0 !important;
background-color: white;
margin-left: -5px;
border-color: #dbdbdb;
border-left: white;
}