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:
Edwina Barbalan 2019-07-19 16:03:59 +02:00
commit 6318b358d2
2 changed files with 276 additions and 277 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
public/index.html
View File

@ -100,10 +100,8 @@
<a class="logo-img" href="index.html"><img src="img/app_icon.png" width=45px height=45px></a> <a class="logo-img" href="index.html"><img src="img/app_icon.png" width=45px height=45px></a>
<form class="om-searchbar" @submit.prevent="search()"> <form class="om-searchbar" @submit.prevent="search()">
<b-field> <b-field>
<b-autocomplete rounded v-model="searchtext" @keydown.native.enter="search" :data="filteredDataArray" placeholder="suche..." icon="magnify" @select="option => selected = option"> <b-autocomplete v-model="searchtext" @keydown.native.enter="search" :data="filteredDataArray" placeholder="suche..." icon="magnify" @select="option => selected = option">
</b-autocomplete> </b-autocomplete>
<button @click="clear">x</button> <button @click="clear">x</button>
</b-field> </b-field>
</form> </form>
@ -125,7 +123,6 @@
'efi', 'efi',
'wichtig', 'wichtig',
]; ];
</script> </script>
<script> <script>
@ -238,6 +235,7 @@
console.log("searching: err: " + e + f + g); console.log("searching: err: " + e + f + g);
}) })
} }
function messages() { function messages() {
$.ajax({ $.ajax({
url: "api/msg/ids", url: "api/msg/ids",
@ -294,7 +292,6 @@
}, },
}; };
*/ */
</script> </script>
<!-- CDN_Vue.js minified lib --> <!-- CDN_Vue.js minified lib -->

6
public/style/style.css
View File

@ -223,17 +223,19 @@ label.checkbox-inline input[type=checkbox]:checked + .checkbox-decorator .check
}*/ }*/
input.input.is-rounded{ .om-searchbar input.input{
border-radius: 0 !important; border-radius: 0 !important;
box-shadow: none !important; box-shadow: none !important;
border-right: white;
} }
button.button.is-light{ button.clearButton{
border-radius: 0 !important; border-radius: 0 !important;
background-color: white; background-color: white;
margin-left: -5px; margin-left: -5px;
border-color: #dbdbdb; border-color: #dbdbdb;
border-left: white; border-left: white;
} }