diff --git a/resources/assets/js/pages/manage/components/ProjectPanel.vue b/resources/assets/js/pages/manage/components/ProjectPanel.vue
index bdef837e8..9f76c0f6e 100644
--- a/resources/assets/js/pages/manage/components/ProjectPanel.vue
+++ b/resources/assets/js/pages/manage/components/ProjectPanel.vue
@@ -131,7 +131,7 @@
- {{$L(c.name)}}
+ {{$L(c.name)}}
diff --git a/resources/assets/js/pages/manage/components/TaskOperation.vue b/resources/assets/js/pages/manage/components/TaskOperation.vue
index 680a94c44..e5585df1e 100644
--- a/resources/assets/js/pages/manage/components/TaskOperation.vue
+++ b/resources/assets/js/pages/manage/components/TaskOperation.vue
@@ -54,7 +54,7 @@
- {{$L(c.name)}}
+ {{$L(c.name)}}
diff --git a/resources/assets/js/pages/manage/messenger.vue b/resources/assets/js/pages/manage/messenger.vue
index 429c4fa73..d65f0cc77 100644
--- a/resources/assets/js/pages/manage/messenger.vue
+++ b/resources/assets/js/pages/manage/messenger.vue
@@ -150,17 +150,28 @@
- {{ $L(operateItem.top_at ? '取消置顶' : '置顶') }}
+
+ {{ $L(operateItem.top_at ? '取消置顶' : '置顶') }}
+
+
- {{ $L($A.getDialogUnread(operateItem, true) > 0 ? '标记已读' : '标记未读') }}
+
+ {{ $L($A.getDialogUnread(operateItem, true) > 0 ? '标记已读' : '标记未读') }}
+
+
+
- {{ $L(operateItem.silence ? '允许消息通知' : '消息免打扰') }}
+
+ {{ $L(operateItem.silence ? '允许消息通知' : '消息免打扰') }}
+
+
- {{$L(c.name)}}
+ {{$L(c.name)}}
+
diff --git a/resources/assets/js/store/state.js b/resources/assets/js/store/state.js
index a621a1804..59e1b53c9 100644
--- a/resources/assets/js/store/state.js
+++ b/resources/assets/js/store/state.js
@@ -147,7 +147,7 @@ export default {
// 列表背景色
columnColorList: [
{name: '默认', color: ''},
- {name: '灰色', color: '#444444'},
+ {name: '灰色', color: '#999999'},
{name: '棕色', color: '#947364'},
{name: '橘色', color: '#faaa6c'},
{name: '黄色', color: '#f2d86d'},
@@ -160,13 +160,13 @@ export default {
// 任务背景色
taskColorList: [
- {name: '默认', color: ''},
- {name: '黄色', color: '#fffae6'},
- {name: '蓝色', color: '#e5f5ff'},
- {name: '绿色', color: '#ecffe5'},
- {name: '粉色', color: '#ffeaee'},
- {name: '紫色', color: '#f6ecff'},
- {name: '灰色', color: '#f3f3f3'},
+ {name: '默认', color: '', primary: ''},
+ {name: '黄色', color: '#fffae6', primary: '#f2d86d'},
+ {name: '蓝色', color: '#e5f5ff', primary: '#51abea'},
+ {name: '绿色', color: '#ecffe5', primary: '#73b45c'},
+ {name: '粉色', color: '#ffeaee', primary: '#ff819c'},
+ {name: '紫色', color: '#f6ecff', primary: '#b583e3'},
+ {name: '灰色', color: '#f3f3f3', primary: '#999999'},
],
// 主题皮肤
diff --git a/resources/assets/sass/pages/page-messenger.scss b/resources/assets/sass/pages/page-messenger.scss
index 03c2aa7da..ebebb2526 100644
--- a/resources/assets/sass/pages/page-messenger.scss
+++ b/resources/assets/sass/pages/page-messenger.scss
@@ -592,9 +592,16 @@
}
.messenger-dialog-operation {
+ .ivu-dropdown-item-divided {
+ &:before {
+ transform: scaleY(0.5);
+ }
+ }
+
.item {
display: flex;
align-items: center;
+ justify-content: space-between;
> i {
flex-shrink: 0;
@@ -602,12 +609,11 @@
height: 18px;
line-height: 18px;
font-size: 18px;
- margin-right: 8px;
- padding: 0;
- color: #bbbbbb;
+ margin-left: 16px;
+ opacity: 0.7;
- &.ivu-icon {
- font-size: 16px;
+ &.color {
+ opacity: 1;
}
}
}
diff --git a/resources/assets/statics/public/css/fonts/taskfont/iconfont.ttf b/resources/assets/statics/public/css/fonts/taskfont/iconfont.ttf
index 6c16d6675..cad739184 100644
Binary files a/resources/assets/statics/public/css/fonts/taskfont/iconfont.ttf and b/resources/assets/statics/public/css/fonts/taskfont/iconfont.ttf differ
diff --git a/resources/assets/statics/public/css/fonts/taskfont/iconfont.woff b/resources/assets/statics/public/css/fonts/taskfont/iconfont.woff
index e2bf44995..c84908397 100644
Binary files a/resources/assets/statics/public/css/fonts/taskfont/iconfont.woff and b/resources/assets/statics/public/css/fonts/taskfont/iconfont.woff differ
diff --git a/resources/assets/statics/public/css/fonts/taskfont/iconfont.woff2 b/resources/assets/statics/public/css/fonts/taskfont/iconfont.woff2
index 157dde29b..b8b5ba5a6 100644
Binary files a/resources/assets/statics/public/css/fonts/taskfont/iconfont.woff2 and b/resources/assets/statics/public/css/fonts/taskfont/iconfont.woff2 differ