diff --git a/public/css/fonts/taskfont.ttf b/public/css/fonts/taskfont.ttf index a7886ef23..523a6fa2c 100644 Binary files a/public/css/fonts/taskfont.ttf and b/public/css/fonts/taskfont.ttf differ diff --git a/public/css/fonts/taskfont.woff b/public/css/fonts/taskfont.woff index f40f4161c..b7d38974e 100644 Binary files a/public/css/fonts/taskfont.woff and b/public/css/fonts/taskfont.woff differ diff --git a/public/css/fonts/taskfont.woff2 b/public/css/fonts/taskfont.woff2 index 532c1ed41..b7feab22f 100644 Binary files a/public/css/fonts/taskfont.woff2 and b/public/css/fonts/taskfont.woff2 differ diff --git a/resources/assets/js/pages/manage/components/ChatInput/index.vue b/resources/assets/js/pages/manage/components/ChatInput/index.vue index ef8437d2c..76281ed04 100755 --- a/resources/assets/js/pages/manage/components/ChatInput/index.vue +++ b/resources/assets/js/pages/manage/components/ChatInput/index.vue @@ -151,7 +151,7 @@ export default { const {wrapperWidth, editorHeight} = this; if (wrapperWidth > 0 && editorHeight > 0 - && (wrapperWidth < 300 || editorHeight > 40)) { + && (wrapperWidth < 280 || editorHeight > 40)) { return { width: '100%' }; diff --git a/resources/assets/js/pages/manage/components/ProjectAll.vue b/resources/assets/js/pages/manage/components/ProjectAll.vue deleted file mode 100644 index aaffa4e6d..000000000 --- a/resources/assets/js/pages/manage/components/ProjectAll.vue +++ /dev/null @@ -1,36 +0,0 @@ - - - diff --git a/resources/assets/js/pages/manage/components/ProjectList.vue b/resources/assets/js/pages/manage/components/ProjectList.vue index 6bd2e43d8..478e67ccc 100644 --- a/resources/assets/js/pages/manage/components/ProjectList.vue +++ b/resources/assets/js/pages/manage/components/ProjectList.vue @@ -1,1422 +1,108 @@ diff --git a/resources/assets/js/pages/manage/messenger.vue b/resources/assets/js/pages/manage/messenger.vue index 1d6ada8d9..774dd5356 100644 --- a/resources/assets/js/pages/manage/messenger.vue +++ b/resources/assets/js/pages/manage/messenger.vue @@ -163,11 +163,11 @@ export default { }, computed: { - ...mapState(['userId', 'cacheDialogs', 'windowMax768']), + ...mapState(['userId', 'cacheDialogs', 'isDesktop']), dialogId() { const {dialogId} = this.$route.params; - if (dialogId && !/^\d+$/.test(dialogId)) { + if (['dialog', 'contacts'].includes(dialogId)) { this.tabActive = dialogId } return parseInt(/^\d+$/.test(dialogId) ? dialogId : 0); @@ -317,7 +317,7 @@ export default { }, openContacts(user) { - if (!this.windowMax768) { + if (this.isDesktop) { this.tabActive = 'dialog'; } this.$store.dispatch("openDialogUserid", user.userid).then(({data}) => { diff --git a/resources/assets/js/pages/manage/project.vue b/resources/assets/js/pages/manage/project.vue index 00fe33504..4b9f0bd97 100644 --- a/resources/assets/js/pages/manage/project.vue +++ b/resources/assets/js/pages/manage/project.vue @@ -1,20 +1,20 @@