diff options
| author | Maksim Pechnikov <parallel588@gmail.com> | 2020-06-18 08:47:50 +0300 |
|---|---|---|
| committer | Maksim Pechnikov <parallel588@gmail.com> | 2020-06-18 08:47:50 +0300 |
| commit | 08444c390348076231f15bd84b613cf39380bb72 (patch) | |
| tree | 4e00c479c37a052e51c8d081a76b0d03b3986127 /src/App.vue | |
| parent | e3d0b2f137ccb355c16788e9b890df609cee1698 (diff) | |
| parent | 57626c125d0477716a638854c4243ee0fde96923 (diff) | |
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma-fe into develop
Diffstat (limited to 'src/App.vue')
| -rw-r--r-- | src/App.vue | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/src/App.vue b/src/App.vue index 1b1c2648..7b9ad3dc 100644 --- a/src/App.vue +++ b/src/App.vue @@ -46,15 +46,16 @@ @toggled="onSearchBarToggled" @click.stop.native /> - <router-link + <a + href="#" class="mobile-hidden" - :to="{ name: 'settings'}" + @click.stop="openSettingsModal" > <i class="button-icon icon-cog nav-icon" :title="$t('nav.preferences')" /> - </router-link> + </a> <a v-if="currentUser && currentUser.role === 'admin'" href="/pleroma/admin/#/login-pleroma" @@ -78,9 +79,12 @@ </nav> <div id="content" - class="container" + class="container underlay" > - <div class="sidebar-flexer mobile-hidden"> + <div + class="sidebar-flexer mobile-hidden" + :style="sidebarAlign" + > <div class="sidebar-bounds"> <div class="sidebar-scroller"> <div class="sidebar"> @@ -122,6 +126,7 @@ <MobilePostStatusButton /> <UserReportingModal /> <PostStatusModal /> + <SettingsModal /> <portal-target name="modal" /> </div> </template> |
