diff options
| author | Shpuld Shpludson <shp@cock.li> | 2020-08-27 14:45:03 +0000 |
|---|---|---|
| committer | Shpuld Shpludson <shp@cock.li> | 2020-08-27 14:45:03 +0000 |
| commit | e768ec1fca2f7580d111b0878a9695b0c8b9dbb1 (patch) | |
| tree | 668ebbcd6818b3c7ad70a372c9f77fa9cffb6a3f /src/App.vue | |
| parent | 5d49edc823ba2ea3e34d4fd6c5efcc84ef9712f7 (diff) | |
| parent | d09f43ba7a179cdca9a2d808631f8ba213dd7710 (diff) | |
Merge branch '2.1.0-rc0' into 'master'
2.1.0 into master
See merge request pleroma/pleroma-fe!1217
Diffstat (limited to 'src/App.vue')
| -rw-r--r-- | src/App.vue | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/src/App.vue b/src/App.vue index ff62fc51..0276c6a6 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" @@ -76,11 +77,15 @@ </div> </div> </nav> + <div class="app-bg-wrapper app-container-wrapper" /> <div id="content" 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"> @@ -108,9 +113,7 @@ {{ $t("login.hint") }} </router-link> </div> - <transition name="fade"> - <router-view /> - </transition> + <router-view /> </div> <media-modal /> </div> @@ -122,7 +125,9 @@ <MobilePostStatusButton /> <UserReportingModal /> <PostStatusModal /> + <SettingsModal /> <portal-target name="modal" /> + <GlobalNoticeList /> </div> </template> |