-
+
-
+
@@ -40,14 +32,14 @@ export default {
data() {
return {
title: '',
- creating: false,
+ creating: false
}
},
computed: {
...mapState({
- lists: (state) => state.TimelineSpace.Contents.Lists.Index.lists,
- loadingBackground: (state) => state.App.theme.wrapper_mask_color,
- }),
+ lists: state => state.TimelineSpace.Contents.Lists.Index.lists,
+ loadingBackground: state => state.App.theme.wrapper_mask_color
+ })
},
created() {
this.$store.commit('TimelineSpace/changeLoading', true)
@@ -60,29 +52,22 @@ export default {
return this.$route.params.id
},
fetch() {
- return this.$store
- .dispatch('TimelineSpace/Contents/Lists/Index/fetchLists')
- .catch(() => {
- this.$message({
- message: this.$t('message.lists_fetch_error'),
- type: 'error',
- })
+ return this.$store.dispatch('TimelineSpace/Contents/Lists/Index/fetchLists').catch(() => {
+ this.$message({
+ message: this.$t('message.lists_fetch_error'),
+ type: 'error'
})
+ })
},
async createList() {
this.creating = true
try {
- await this.$store.dispatch(
- 'TimelineSpace/Contents/Lists/Index/createList',
- this.title
- )
- await this.$store.dispatch(
- 'TimelineSpace/Contents/Lists/Index/fetchLists'
- )
+ await this.$store.dispatch('TimelineSpace/Contents/Lists/Index/createList', this.title)
+ await this.$store.dispatch('TimelineSpace/Contents/Lists/Index/fetchLists')
} catch (err) {
this.$message({
message: this.$t('message.list_create_error'),
- type: 'error',
+ type: 'error'
})
} finally {
this.creating = false
@@ -93,24 +78,17 @@ export default {
return this.$router.push(`/${this.id()}/lists/${list.id}/edit`)
},
del(list) {
- this.$confirm(
- this.$t('lists.index.delete.confirm.message'),
- this.$t('lists.index.delete.confirm.title'),
- {
- confirmButtonText: this.$t('lists.index.delete.confirm.ok'),
- cancelButtonText: this.$t('lists.index.delete.confirm.cancel'),
- type: 'warning',
- }
- )
+ this.$confirm(this.$t('lists.index.delete.confirm.message'), this.$t('lists.index.delete.confirm.title'), {
+ confirmButtonText: this.$t('lists.index.delete.confirm.ok'),
+ cancelButtonText: this.$t('lists.index.delete.confirm.cancel'),
+ type: 'warning'
+ })
.then(() => {
- this.$store.dispatch(
- 'TimelineSpace/Contents/Lists/Index/deleteList',
- list
- )
+ this.$store.dispatch('TimelineSpace/Contents/Lists/Index/deleteList', list)
})
.catch(() => {})
- },
- },
+ }
+ }
}
@@ -145,7 +123,7 @@ export default {
.list {
padding: 4px 24px;
display: flex;
- flex-dirrection: row;
+ flex-direction: row;
align-items: baseline;
justify-content: space-between;
border-bottom: 1px solid var(--theme-border-color);
diff --git a/src/renderer/components/TimelineSpace/Contents/Lists/Show.vue b/src/renderer/components/TimelineSpace/Contents/Lists/Show.vue
index f9a065fa..bc5f49bd 100644
--- a/src/renderer/components/TimelineSpace/Contents/Lists/Show.vue
+++ b/src/renderer/components/TimelineSpace/Contents/Lists/Show.vue
@@ -23,7 +23,7 @@
-
+
@@ -306,6 +306,10 @@ export default {
right: calc(20px + var(--current-sidebar-width));
transition: all 0.5s;
}
+
+ .upper-icon {
+ padding: 3px;
+ }
}
diff --git a/src/renderer/components/TimelineSpace/Contents/Local.vue b/src/renderer/components/TimelineSpace/Contents/Local.vue
index 3cb68b8c..658df670 100644
--- a/src/renderer/components/TimelineSpace/Contents/Local.vue
+++ b/src/renderer/components/TimelineSpace/Contents/Local.vue
@@ -23,7 +23,7 @@
-
+
@@ -61,7 +61,7 @@ export default {
openSideBar: state => state.TimelineSpace.Contents.SideBar.openSideBar,
backgroundColor: state => state.App.theme.background_color,
startReload: state => state.TimelineSpace.HeaderMenu.reload,
- unreadNotification: state => state.TimelineSpace.unreadNotification
+ unreadNotification: state => state.TimelineSpace.timelineSetting.unreadNotification
}),
...mapGetters('TimelineSpace/Modals', ['modalOpened']),
shortcutEnabled: function () {
@@ -77,6 +77,7 @@ export default {
}
},
async mounted() {
+ console.log(this.unreadNotification)
this.$store.commit('TimelineSpace/SideMenu/changeUnreadLocalTimeline', false)
document.getElementById('scroller').addEventListener('scroll', this.onScroll)
if (!this.unreadNotification.local) {
@@ -296,6 +297,10 @@ export default {
right: calc(20px + var(--current-sidebar-width));
transition: all 0.5s;
}
+
+ .upper-icon {
+ padding: 3px;
+ }
}
diff --git a/src/renderer/components/TimelineSpace/Contents/Mentions.vue b/src/renderer/components/TimelineSpace/Contents/Mentions.vue
index 19db37e2..6cf92b2c 100644
--- a/src/renderer/components/TimelineSpace/Contents/Mentions.vue
+++ b/src/renderer/components/TimelineSpace/Contents/Mentions.vue
@@ -29,7 +29,7 @@
-
+
@@ -300,6 +300,10 @@ export default {
right: calc(20px + var(--current-sidebar-width));
transition: all 0.5s;
}
+
+ .upper-icon {
+ padding: 3px;
+ }
}
diff --git a/src/renderer/components/TimelineSpace/Contents/Notifications.vue b/src/renderer/components/TimelineSpace/Contents/Notifications.vue
index d3cde175..b9be1e59 100644
--- a/src/renderer/components/TimelineSpace/Contents/Notifications.vue
+++ b/src/renderer/components/TimelineSpace/Contents/Notifications.vue
@@ -28,7 +28,7 @@