mirror of
https://activitypub.software/TransFem-org/Sharkey.git
synced 2024-12-16 01:55:44 +01:00
Merge branch 'develop' of https://github.com/syuilo/misskey into develop
This commit is contained in:
commit
9d826d6e52
3 changed files with 10 additions and 3 deletions
|
@ -141,7 +141,14 @@ workflows:
|
||||||
- l10n_develop
|
- l10n_develop
|
||||||
- imgbot
|
- imgbot
|
||||||
- patch-autogen
|
- patch-autogen
|
||||||
|
- hold:
|
||||||
|
type: approval
|
||||||
|
filters:
|
||||||
|
branches:
|
||||||
|
ignore: master
|
||||||
- build:
|
- build:
|
||||||
|
requires:
|
||||||
|
- hold
|
||||||
filters:
|
filters:
|
||||||
branches:
|
branches:
|
||||||
ignore:
|
ignore:
|
||||||
|
|
|
@ -61,6 +61,7 @@ common:
|
||||||
drive: "ドライブ"
|
drive: "ドライブ"
|
||||||
messaging: "トーク"
|
messaging: "トーク"
|
||||||
deck: "デッキ"
|
deck: "デッキ"
|
||||||
|
timeline: "タイムライン"
|
||||||
explore: "みつける"
|
explore: "みつける"
|
||||||
following: "フォロー中"
|
following: "フォロー中"
|
||||||
followers: "フォロワー"
|
followers: "フォロワー"
|
||||||
|
@ -1087,7 +1088,6 @@ desktop/views/components/ui.header.account.vue:
|
||||||
dark: "闇に飲まれる"
|
dark: "闇に飲まれる"
|
||||||
|
|
||||||
desktop/views/components/ui.header.nav.vue:
|
desktop/views/components/ui.header.nav.vue:
|
||||||
home: "ホーム"
|
|
||||||
game: "ゲーム"
|
game: "ゲーム"
|
||||||
|
|
||||||
desktop/views/components/ui.header.notifications.vue:
|
desktop/views/components/ui.header.notifications.vue:
|
||||||
|
|
|
@ -1,8 +1,8 @@
|
||||||
<template>
|
<template>
|
||||||
<div class="nav">
|
<div class="nav">
|
||||||
<ul>
|
<ul>
|
||||||
<li class="home active" @click="goToTop">
|
<li v-if="!$store.state.device.deckMode" class="timeline" @click="goToTop">
|
||||||
<router-link to="/"><fa icon="home"/><p>{{ $t('home') }}</p></router-link>
|
<router-link to="/"><fa icon="list"/><p>{{ $t('@.timeline') }}</p></router-link>
|
||||||
</li>
|
</li>
|
||||||
<li class="featured">
|
<li class="featured">
|
||||||
<router-link to="/featured"><fa :icon="faNewspaper"/><p>{{ $t('@.featured-notes') }}</p></router-link>
|
<router-link to="/featured"><fa :icon="faNewspaper"/><p>{{ $t('@.featured-notes') }}</p></router-link>
|
||||||
|
|
Loading…
Reference in a new issue