Merge branch 'master' into matdev

This commit is contained in:
Sebastian Frank
2017-09-25 13:08:03 +02:00
15 changed files with 381 additions and 319 deletions

View File

@@ -12,7 +12,7 @@
</a>
<nav class="user_menu">
<ul>
<router-link tag="li" v-for="(item, i) in items" :key="i" v-if="showIf(item.show)" :to="item.to" active-class="active" exact>
<router-link tag="li" v-for="(item, i) in items" :key="i" v-if="showIf(item.show)" :to="item.to" active-class="active" exact @click.native="toggleMenu">
<a>
<i :class="['icon', item.icon]"></i>
<div class="title">{{ item.name }}</div>