diff options
| author | Shpuld Shpuldson <shp@cock.li> | 2020-10-29 08:36:39 +0200 |
|---|---|---|
| committer | Shpuld Shpuldson <shp@cock.li> | 2020-10-29 08:36:39 +0200 |
| commit | cb3578fcca763a43ec946af75e6e345ed5adc14a (patch) | |
| tree | 85fdd3f8bf98eae557d33ca1a82e3688e4e7f309 /src/App.vue | |
| parent | 7007659e05842dc06eb2c13eddaba6ab657df5ea (diff) | |
| parent | a84db4bd8f04bdfc14836f55f441aa8478265291 (diff) | |
fix conflicts
Diffstat (limited to 'src/App.vue')
| -rw-r--r-- | src/App.vue | 26 |
1 files changed, 16 insertions, 10 deletions
diff --git a/src/App.vue b/src/App.vue index 0276c6a6..6e44c7e9 100644 --- a/src/App.vue +++ b/src/App.vue @@ -42,36 +42,42 @@ <div class="item right"> <search-bar v-if="currentUser || !privateMode" - class="nav-icon mobile-hidden" + class="mobile-hidden" @toggled="onSearchBarToggled" @click.stop.native /> <a href="#" - class="mobile-hidden" + class="mobile-hidden nav-icon" @click.stop="openSettingsModal" > - <i - class="button-icon icon-cog nav-icon" + <FAIcon + fixed-width + class="fa-scale-110 fa-old-padding" + icon="cog" :title="$t('nav.preferences')" /> </a> <a v-if="currentUser && currentUser.role === 'admin'" href="/pleroma/admin/#/login-pleroma" - class="mobile-hidden" + class="mobile-hidden nav-icon" target="_blank" - ><i - class="button-icon icon-gauge nav-icon" + ><FAIcon + fixed-width + class="fa-scale-110 fa-old-padding" + icon="tachometer-alt" :title="$t('nav.administration')" /></a> <a v-if="currentUser" href="#" - class="mobile-hidden" + class="mobile-hidden nav-icon" @click.prevent="logout" - ><i - class="button-icon icon-logout nav-icon" + ><FAIcon + fixed-width + class="fa-scale-110 fa-old-padding" + icon="sign-out-alt" :title="$t('login.logout')" /></a> </div> |