diff options
| author | shpuld <shp@cock.li> | 2017-11-08 12:55:10 +0200 |
|---|---|---|
| committer | shpuld <shp@cock.li> | 2017-11-08 12:55:10 +0200 |
| commit | 4d5782b51f14913df47f5c9f13ec9d045fc731cf (patch) | |
| tree | cca57c2ad1c5d65b5cb257b6e4eae50169bc17e9 /src/App.vue | |
| parent | 191bbe76a83123b5d63ec07af00723721552ddd7 (diff) | |
| parent | 37f5e0d8b6230ccb4801b1ee0e185d64acc00348 (diff) | |
Fix conflict
Diffstat (limited to 'src/App.vue')
| -rw-r--r-- | src/App.vue | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/App.vue b/src/App.vue index 479358b2..8e802a02 100644 --- a/src/App.vue +++ b/src/App.vue @@ -6,9 +6,9 @@ <router-link :to="{ name: 'root'}">{{sitename}}</router-link> </div> <div class='item right'> - <user-finder></user-finder> - <router-link :to="{ name: 'settings'}"><i class="icon-cog"></i></router-link> - <a href="#" v-if="currentUser" @click.prevent="logout"><i class="icon-logout" :title="$t('login.logout')" ></i></a> + <user-finder class="nav-icon"></user-finder> + <router-link :to="{ name: 'settings'}"><i class="icon-cog nav-icon"></i></router-link> + <a href="#" v-if="currentUser" @click.prevent="logout"><i class="icon-logout nav-icon" :title="$t('login.logout')"></i></a> </div> </div> </nav> |