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

Compare commits

base: hopfma:c8aee0c979ae5c8ab3d72e1f4bc3684dbaff1d4c
Branches Tags
hopfma:developer
hopfma:master
..
compare: hopfma:35b5748af946db37265a7a25d8ff8e1f95fa1442
Branches Tags
hopfma:developer
hopfma:master

No commits in common. "c8aee0c979ae5c8ab3d72e1f4bc3684dbaff1d4c" and "35b5748af946db37265a7a25d8ff8e1f95fa1442" have entirely different histories.
c8aee0c979 ... 35b5748af9

3 changed files with 4 additions and 20 deletions
Show Stats Expand all files Collapse all files

3
public/index.html
View File

@ -52,6 +52,7 @@
<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 --> <!-- CSS_Material Design for Bootstrap minified CSS -->
<!--<link rel="stylesheet" href="lib/bootstrap-material-design.min.css">--> <!--<link rel="stylesheet" href="lib/bootstrap-material-design.min.css">-->
>>>>>>> origin/developer
<!-- NOTE: Call manifest.json --> <!-- NOTE: Call manifest.json -->
<link rel="manifest" href="manifest.json"> <link rel="manifest" href="manifest.json">
@ -72,6 +73,7 @@
<!-- <script src="lib/vuetify-1.5.14.min.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.css">-->
<!-- <link rel="stylesheet" type="text/css" href="lib/vuetify-1.5.14.min.css">--> <!-- <link rel="stylesheet" type="text/css" href="lib/vuetify-1.5.14.min.css">-->
>>>>>>> origin/developer
<!-- 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">
@ -103,7 +105,6 @@
<b-autocomplete rounded v-model="searchtext" @keydown.native.enter="search" :data="filteredDataArray" placeholder="suche..." icon="magnify" @select="option => selected = option"> <b-autocomplete rounded 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>

4
public/routes/navRoutes.js
View File

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

17
public/style/style.css
View File

@ -221,20 +221,3 @@ label.checkbox-inline input[type=checkbox]:checked + .checkbox-decorator .check
margin-top: 30%; margin-top: 30%;
font-size:140%; 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;
}