diff options
| author | syuilo <syuilotan@yahoo.co.jp> | 2019-02-18 00:41:05 +0900 |
|---|---|---|
| committer | syuilo <syuilotan@yahoo.co.jp> | 2019-02-18 00:41:05 +0900 |
| commit | 021f74da5411a5fc97f4fe77199ed0477d73be16 (patch) | |
| tree | 7c3bfc266befcfb30b7dd59d68a142ebde7598f2 /src/client/app | |
| parent | Update CHANGELOG.md (diff) | |
| download | sharkey-021f74da5411a5fc97f4fe77199ed0477d73be16.tar.gz sharkey-021f74da5411a5fc97f4fe77199ed0477d73be16.tar.bz2 sharkey-021f74da5411a5fc97f4fe77199ed0477d73be16.zip | |
:art:
Diffstat (limited to 'src/client/app')
| -rw-r--r-- | src/client/app/desktop/script.ts | 4 | ||||
| -rw-r--r-- | src/client/app/desktop/views/components/ui.header.nav.vue | 2 | ||||
| -rw-r--r-- | src/client/app/desktop/views/components/ui.sidebar.vue | 8 |
3 files changed, 6 insertions, 8 deletions
diff --git a/src/client/app/desktop/script.ts b/src/client/app/desktop/script.ts index 8c8e3c3fbf..9f4fbbc0e8 100644 --- a/src/client/app/desktop/script.ts +++ b/src/client/app/desktop/script.ts @@ -144,8 +144,8 @@ init(async (launch, os) => { { path: '/notes/:note', name: 'note', component: () => import('./views/deck/deck.note-column.vue').then(m => m.default) }, { path: '/search', component: () => import('./views/deck/deck.search-column.vue').then(m => m.default) }, { path: '/tags/:tag', name: 'tag', component: () => import('./views/deck/deck.hashtag-column.vue').then(m => m.default) }, - { path: '/featured', component: () => import('./views/deck/deck.featured-column.vue').then(m => m.default) }, - { path: '/explore', component: () => import('./views/deck/deck.explore-column.vue').then(m => m.default) }, + { path: '/featured', name: 'featured', component: () => import('./views/deck/deck.featured-column.vue').then(m => m.default) }, + { path: '/explore', name: 'explore', component: () => import('./views/deck/deck.explore-column.vue').then(m => m.default) }, { path: '/explore/tags/:tag', props: true, component: () => import('./views/deck/deck.explore-column.vue').then(m => m.default) }, { path: '/i/favorites', component: () => import('./views/deck/deck.favorites-column.vue').then(m => m.default) } ]} diff --git a/src/client/app/desktop/views/components/ui.header.nav.vue b/src/client/app/desktop/views/components/ui.header.nav.vue index 690d2fe847..08e8d47c66 100644 --- a/src/client/app/desktop/views/components/ui.header.nav.vue +++ b/src/client/app/desktop/views/components/ui.header.nav.vue @@ -1,7 +1,7 @@ <template> <div class="nav"> <ul> - <li v-if="!$store.state.device.inDeckMode" class="timeline" :class="{ active: $route.name == 'index' }" @click="goToTop"> + <li class="timeline" :class="{ active: $route.name == 'index' }" @click="goToTop"> <router-link to="/"><fa icon="home"/><p>{{ $t('@.timeline') }}</p></router-link> </li> <li class="featured" :class="{ active: $route.name == 'featured' }"> diff --git a/src/client/app/desktop/views/components/ui.sidebar.vue b/src/client/app/desktop/views/components/ui.sidebar.vue index a0fca81021..1f8e8ee7a4 100644 --- a/src/client/app/desktop/views/components/ui.sidebar.vue +++ b/src/client/app/desktop/views/components/ui.sidebar.vue @@ -6,11 +6,9 @@ </div> <div class="nav" v-if="$store.getters.isSignedIn"> - <template v-if="!$store.state.device.inDeckMode"> - <div class="home" :class="{ active: $route.name == 'index' }" @click="goToTop"> - <router-link to="/"><fa icon="home"/></router-link> - </div> - </template> + <div class="home" :class="{ active: $route.name == 'index' }" @click="goToTop"> + <router-link to="/"><fa icon="home"/></router-link> + </div> <div class="featured" :class="{ active: $route.name == 'featured' }"> <router-link to="/featured"><fa :icon="faNewspaper"/></router-link> </div> |