sendnrw/misskey
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "wip"

Browse Source 
This reverts commit f83bd31fd5.
This commit is contained in:
syuilo
2022-12-19 13:54:35 +09:00
parent f83bd31fd5
commit 52cbe07a78
143 changed files with 306 additions and 311 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
packages/client/src/ui/deck/column.vue
View File

@@ -105,7 +105,7 @@ function toggleActive() {
function getMenu() {
let items = [{
icon: 'ti ti-settings',
icon: 'fas fa-cog',
text: i18n.ts._deck.configureColumn,
action: async () => {
const { canceled, result } = await os.form(props.column.name, {
@@ -170,7 +170,7 @@ function getMenu() {
popRightColumn(props.column.id);
},
} : undefined, null, {
icon: 'ti ti-trash',
icon: 'fas fa-trash-alt',
text: i18n.ts.remove,
danger: true,
action: () => {

2
packages/client/src/ui/deck/notifications-column.vue
View File

@@ -1,6 +1,6 @@
<template>
<XColumn :column="column" :is-stacked="isStacked" :menu="menu" @parent-focus="$event => emit('parent-focus', $event)">
<template #header><i class="ti ti-bell" style="margin-right: 8px;"></i>{{ column.name }}</template>
<template #header><i class="fas fa-bell" style="margin-right: 8px;"></i>{{ column.name }}</template>
<XNotifications :include-types="column.includingTypes"/>
</XColumn>

10
packages/client/src/ui/deck/tl-column.vue
View File

@@ -1,16 +1,16 @@
<template>
<XColumn :menu="menu" :column="column" :is-stacked="isStacked" :indicated="indicated" @change-active-state="onChangeActiveState" @parent-focus="$event => emit('parent-focus', $event)">
<template #header>
<i v-if="column.tl === 'home'" class="ti ti-home-2"></i>
<i v-else-if="column.tl === 'local'" class="ti ti-messages"></i>
<i v-else-if="column.tl === 'social'" class="ti ti-share"></i>
<i v-else-if="column.tl === 'global'" class="ti ti-world"></i>
<i v-if="column.tl === 'home'" class="fas fa-home"></i>
<i v-else-if="column.tl === 'local'" class="fas fa-comments"></i>
<i v-else-if="column.tl === 'social'" class="fas fa-share-alt"></i>
<i v-else-if="column.tl === 'global'" class="fas fa-globe"></i>
<span style="margin-left: 8px;">{{ column.name }}</span>
</template>
<div v-if="disabled" class="iwaalbte">
<p>
<i class="ti ti-minus-circle"></i>
<i class="fas fa-minus-circle"></i>
{{ $t('disabled-timeline.title') }}
</p>
<p class="desc">{{ $t('disabled-timeline.description') }}</p>