no message

app/Http/Controllers/Api/ProjectController.php

@@ -163,8 +163,8 @@ class ProjectController extends AbstractController
      *
      * @apiParam {Number} project_id        项目ID
      * @apiParam {Number} [column_id]       列表ID，留空取第一个
-     * @apiParam {String} name              任务名称
+     * @apiParam {String} name              任务描述
-     * @apiParam {String} [content]         任务描述
+     * @apiParam {String} [content]         任务详情
      * @apiParam {Array} [times]            计划时间（格式：开始时间,结束时间；如：2020-01-01 00:00,2020-01-01 23:59）
      * @apiParam {Number} [owner]           负责人，留空为自己
      * @apiParam {Array} [subtasks]         子任务（格式：[{name,owner,times}]）

app/Models/ProjectTask.php

@@ -25,6 +25,7 @@ use Carbon\Carbon;
  * @property \Illuminate\Support\Carbon|null $deleted_at
  * @property-read int $file_num
  * @property-read int $msg_num
+ * @property-read int $sub_num
  * @property-read bool $overdue
  * @property-read int $percent
  * @property-read bool $today
@@ -55,6 +56,7 @@ class ProjectTask extends AbstractModel
     protected $appends = [
         'file_num',
         'msg_num',
+        'sub_num',
         'percent',
         'today',
         'overdue',
@@ -84,14 +86,35 @@ class ProjectTask extends AbstractModel
         return $this->attributes['msg_num'];
     }
 
+    /**
+     * 子任务数量
+     * @return int
+     */
+    public function getSubNumAttribute()
+    {
+        if ($this->parent_id > 0) {
+            return 0;
+        }
+        if (!isset($this->attributes['sub_num'])) {
+            $this->attributes['sub_num'] = self::whereParentId($this->id)->count();
+        }
+        return $this->attributes['sub_num'];
+    }
+
     /**
      * 进度（0-100）
      * @return int
      */
     public function getPercentAttribute()
     {
+        if ($this->parent_id > 0) {
+            return 0;
+        }
         $builder = self::whereParentId($this->id);
-        $subTaskTotal = $builder->count();
+        if (!isset($this->attributes['sub_num'])) {
+            $this->attributes['sub_num'] = $builder->count();
+        }
+        $subTaskTotal = $this->attributes['sub_num'];
         if ($subTaskTotal == 0) {
             return $this->complete_at ? 1 : 0;
         }

resources/assets/js/components/TEditor.vue

@@ -49,84 +49,6 @@
     </div>
 </template>
 
-<style lang="scss">
-:global {
-    .teditor-box {
-        textarea {
-            opacity: 0;
-        }
-
-        .tox-tinymce {
-            box-shadow: none;
-            box-sizing: border-box;
-            border-color: #dddee1;
-            border-radius: 4px;
-            overflow: hidden;
-
-            .tox-statusbar {
-                span.tox-statusbar__branding {
-                    a {
-                        display: none;
-                    }
-                }
-            }
-        }
-    }
-
-    .teditor-transfer {
-        background-color: #ffffff;
-
-        .tox-toolbar {
-            > div:last-child {
-                > button:last-child {
-                    margin-right: 64px;
-                }
-            }
-        }
-
-        .ivu-modal-header {
-            display: none;
-        }
-
-        .ivu-modal-close {
-            top: 7px;
-            z-index: 2;
-        }
-
-        .teditor-transfer-body {
-            position: absolute;
-            top: 0;
-            left: 0;
-            width: 100%;
-            height: 100%;
-            padding: 0;
-            margin: 0;
-
-            textarea {
-                opacity: 0;
-            }
-
-            .tox-tinymce {
-                border: 0;
-
-                .tox-statusbar {
-                    span.tox-statusbar__branding {
-                        a {
-                            display: none;
-                        }
-                    }
-                }
-            }
-        }
-    }
-
-    .tox {
-        &.tox-silver-sink {
-            z-index: 13000;
-        }
-    }
-}
-</style>
 <style lang="scss" scoped>
 :global {
     .teditor-loadstyle {
@@ -206,7 +128,11 @@
             readonly: {
                 type: Boolean,
                 default: false
-            }
+            },
+            placeholder: {
+                type: String,
+                default: ''
+            },
         },
         data() {
             return {
@@ -293,6 +219,7 @@
                     language: "zh_CN",
                     toolbar: this.toolbar,
                     plugins: this.plugin(isFull),
+                    placeholder: this.placeholder,
                     save_onsavecallback: (e) => {
                         this.$emit('editorSave', e);
                     },

resources/assets/js/functions/web.js

@@ -147,48 +147,6 @@
         aAjaxWsReady: false,
         aAjaxWsListener: [],
 
-        /**
-         * 编辑器参数配置
-         * @returns {{modules: {toolbar: *[]}}}
-         */
-        editorOption() {
-            return {
-                modules: {
-                    toolbar: [
-                        ['bold', 'italic'],
-                        [{ 'list': 'ordered'}, { 'list': 'bullet' }],
-                        [{ 'size': ['small', false, 'large', 'huge'] }],
-                        [{ 'header': [1, 2, 3, 4, 5, 6, false] }],
-                        [{ 'color': [] }, { 'background': [] }],
-                        [{ 'align': [] }]
-                    ]
-                }
-            };
-        },
-
-        /**
-         * 获取用户信息（并保存）
-         * @param callback                  网络请求获取到用户信息回调（监听用户信息发生变化）
-         * @returns Object
-         */
-        getUserInfo(callback) {
-            if (typeof callback === 'function' || callback === true) {
-                $A.apiAjax({
-                    url: 'users/info',
-                    error: () => {
-                        $A.userLogout();
-                    },
-                    success: (res) => {
-                        if (res.ret === 1) {
-                            $A.app.$store.commit('setUserInfo', res.data);
-                            typeof callback === "function" && callback(res.data, $A.app.$store.state.userToken);
-                        }
-                    },
-                });
-            }
-            return $A.app.$store.state.userInfo;
-        },
-
         /**
          * 打开登录页面
          */

resources/assets/js/pages/manage.vue

@@ -252,7 +252,7 @@ export default {
         }
     },
     mounted() {
-        $A.getUserInfo(this.getProjectLists);
+        this.$store.commit('getUserInfo', this.getProjectLists);
     },
     deactivated() {
         this.addShow = false;

resources/assets/js/pages/manage/components/project-list.vue

@@ -49,11 +49,11 @@
                     </div>
                     <ul>
                         <li v-for="item in column.project_task">
-                            <div class="task-head">
+                            <div :class="['task-head', item.desc ? 'has-desc' : '']">
-                                <div class="task-title">{{item.name}}</div>
+                                <div class="task-title"><pre>{{item.name}}</pre></div>
                                 <Icon type="ios-more" />
                             </div>
-                            <div v-if="item.desc" class="task-desc">{{item.desc}}</div>
+                            <div v-if="item.desc" class="task-desc" v-html="item.desc"></div>
                             <div v-if="item.task_tag.length > 0" class="task-tags">
                                 <Tag v-for="(tag, keyt) in item.task_tag" :key="keyt" :color="tag.color">{{tag.name}}</Tag>
                             </div>
@@ -68,9 +68,14 @@
                             </div>
                             <div class="task-progress">
                                 <Progress :percent="item.percent" :stroke-width="6" />
-                                <div v-if="item.end_at" :class="['task-time', item.today ? 'today' : '', item.overdue ? 'overdue' : '']">
+                                <Tooltip
-                                    <Icon type="ios-time-outline" />{{item.end_at}}
+                                    v-if="item.end_at"
-                                </div>
+                                    :class="['task-time', item.today ? 'today' : '', item.overdue ? 'overdue' : '']"
+                                    :delay="600"
+                                    :content="item.end_at"
+                                    transfer>
+                                    <Icon type="ios-time-outline"/>{{ formatTime(item.end_at) }}
+                                </Tooltip>
                             </div>
                         </li>
                     </ul>
@@ -640,14 +645,24 @@
                             }
                             .task-head {
                                 display: flex;
-                                align-items: center;
+                                align-items: flex-start;
                                 .task-title {
                                     flex: 1;
-                                    font-weight: 600;
+                                    padding-top: 1px;
+                                    > pre {
+                                        margin: 0;
+                                        padding: 0;
+                                    }
                                 }
                                 .ivu-icon {
                                     font-size: 22px;
                                     color: #666666;
+                                    padding-left: 4px;
+                                }
+                                &.has-desc {
+                                    .task-title {
+                                        font-weight: 600;
+                                    }
                                 }
                             }
                             .task-desc {
@@ -696,8 +711,10 @@
                                 margin-top: 10px;
                                 display: flex;
                                 align-items: center;
+                                justify-content: flex-end;
                                 .task-time {
                                     flex-shrink: 0;
+                                    color: #777777;
                                     background-color: #EAEDF2;
                                     padding: 1px 4px;
                                     font-size: 12px;
@@ -715,7 +732,7 @@
                                         background-color: #ff9900;
                                     }
                                     .ivu-icon {
-                                        margin-right: 2px;
+                                        margin-right: 3px;
                                         font-size: 14px;
                                     }
                                 }
@@ -914,7 +931,20 @@ export default {
                     }
                 }
             });
+        },
+
+        formatTime(date) {
+            let time = Math.round(new Date(date).getTime() / 1000),
+                string = '';
+            if ($A.formatDate('Ymd') === $A.formatDate('Ymd', time)) {
+                string = $A.formatDate('H:i', time)
+            } else if ($A.formatDate('Y') === $A.formatDate('Y', time)) {
+                string = $A.formatDate('m-d', time)
+            } else {
+                string = $A.formatDate('Y-m-d', time)
             }
+            return string || '';
+        },
     }
 }
 </script>

resources/assets/js/pages/manage/components/task-add.vue

@@ -1,11 +1,22 @@
 <template>
     <div class="task-add">
         <Form class="task-add-form" label-position="top" @submit.native.prevent>
-            <FormItem :label="$L('任务名称')">
+            <FormItem :label="$L('任务描述')">
-                <Input type="text" v-model="value.name"></Input>
+                <Input
+                    v-model="value.name"
+                    type="textarea"
+                    :rows="1"
+                    :autosize="{ minRows: 1, maxRows: 3 }"
+                    :maxlength="255"
+                    :placeholder="$L('必填')"></Input>
             </FormItem>
             <FormItem :label="$L('任务详情')">
-                <TEditor v-model="value.content" :plugins="taskPlugins" :options="taskOptions" :option-full="taskOptionFull"></TEditor>
+                <TEditor
+                    v-model="value.content"
+                    :plugins="taskPlugins"
+                    :options="taskOptions"
+                    :option-full="taskOptionFull"
+                    :placeholder="$L('选填...')"></TEditor>
             </FormItem>
             <Button class="advanced-option" :class="{advanced: advanced}" @click="advanced=!advanced">{{$L('高级选项')}}</Button>
         </Form>
@@ -41,13 +52,17 @@
             <div class="subtasks">
                 <div v-if="value.subtasks.length > 0" class="sublist">
                     <Row>
-                        <Col span="12">{{$L('任务名称')}}</Col>
+                        <Col span="12">{{$L('任务描述')}}</Col>
                         <Col span="6">{{$L('计划时间')}}</Col>
                         <Col span="6">{{$L('负责人')}}</Col>
                     </Row>
                     <Row v-for="(item, key) in value.subtasks" :key="key">
                         <Col span="12">
-                            <Input v-model="item.name" @on-clear="value.subtasks.splice(key, 1)" clearable/>
+                            <Input
+                                v-model="item.name"
+                                :maxlength="255"
+                                clearable
+                                @on-clear="value.subtasks.splice(key, 1)"/>
                         </Col>
                         <Col span="6">
                             <DatePicker
@@ -60,7 +75,10 @@
                                 @on-change="taskTimeChange(item.times)"/>
                         </Col>
                         <Col span="6">
-                            <UserInput v-model="item.owner" :multiple-max="1" :placeholder="$L('选择负责人')"/>
+                            <UserInput
+                                v-model="item.owner"
+                                :multiple-max="1"
+                                :placeholder="$L('选择负责人')"/>
                         </Col>
                     </Row>
                 </div>

resources/assets/js/store/mutations.js

@@ -17,6 +17,29 @@ export default {
         state.setStorage('projectListPanel', state.projectListPanel);
     },
 
+    /**
+     * 获取/更新会员信息
+     * @param state
+     * @param callback
+     */
+    getUserInfo(state, callback) {
+        if (typeof callback === 'function' || callback === true) {
+            $A.apiAjax({
+                url: 'users/info',
+                error: () => {
+                    $A.userLogout();
+                },
+                success: ({ret, data, msg}) => {
+                    if (ret === 1) {
+                        this.commit('setUserInfo', data);
+                        typeof callback === "function" && callback(data);
+                    }
+                },
+            });
+        }
+        return state.userInfo;
+    },
+
     /**
      * 更新会员信息
      * @param state
@@ -38,6 +61,9 @@ export default {
      * @param project_id
      */
     getProjectDetail(state, project_id) {
+        if (state._runNum(project_id) == 0) {
+            return;
+        }
         if (state._isJson(state.cacheProject[project_id])) {
             state.projectDetail = state.cacheProject[project_id];
         }

resources/assets/sass/main.scss

@@ -500,3 +500,85 @@
         margin-bottom: 5px;
     }
 }
+
+// tinymce
+.teditor-box,
+.teditor-transfer {
+    .tox {
+        &.tox-silver-sink {
+            z-index: 13000;
+        }
+    }
+}
+
+.teditor-box {
+    textarea {
+        opacity: 0;
+    }
+
+    .tox-tinymce {
+        box-shadow: none;
+        box-sizing: border-box;
+        border-color: #dddee1;
+        border-radius: 4px;
+        overflow: hidden;
+
+        .tox-statusbar {
+            span.tox-statusbar__branding {
+                a {
+                    display: none;
+                }
+            }
+        }
+    }
+}
+
+.teditor-transfer {
+    background-color: #ffffff;
+
+    .tox-toolbar {
+        > div:last-child {
+            > button:last-child {
+                margin-right: 64px;
+            }
+        }
+    }
+
+    .ivu-modal-header {
+        display: none;
+    }
+
+    .ivu-modal-close {
+        top: 7px;
+        z-index: 2;
+    }
+
+    .teditor-transfer-body {
+        position: absolute;
+        top: 0;
+        left: 0;
+        width: 100%;
+        height: 100%;
+        padding: 0;
+        margin: 0;
+
+        textarea {
+            opacity: 0;
+        }
+
+        .tox-tinymce {
+            border: 0;
+
+            .tox-statusbar {
+                span.tox-statusbar__branding {
+                    a {
+                        display: none;
+                    }
+                }
+            }
+        }
+    }
+}
+
+
+

resources/assets/statics/public/js/tinymce/skins/ui/oxide/content.css

@@ -693,3 +693,10 @@ body {
 table {
   border-collapse: collapse;
 }
+.mce-content-body {
+    color: #515a6e;
+}
+.mce-content-body[data-mce-placeholder]:not(.mce-visualblocks)::before {
+    font-size: 15px;
+    color: rgba(34, 47, 62, 0.3);
+}

resources/assets/statics/public/js/tinymce/skins/ui/oxide/skin.css

@@ -6,7 +6,7 @@
  */
 .tox {
   box-sizing: content-box;
-  color: #222f3e;
+  color: #515a6e;
   cursor: auto;
   font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen-Sans, Ubuntu, Cantarell, "Helvetica Neue", sans-serif;
   font-size: 16px;
@@ -121,7 +121,7 @@ button::-moz-focus-inner {
 .tox .accessibility-issue--info .accessibility-issue__description {
   background-color: rgba(32, 122, 183, 0.1);
   border-color: rgba(32, 122, 183, 0.4);
-  color: #222f3e;
+  color: #515a6e;
 }
 .tox .accessibility-issue--info .accessibility-issue__description > *:last-child {
   border-color: rgba(32, 122, 183, 0.4);
@@ -138,7 +138,7 @@ button::-moz-focus-inner {
 .tox .accessibility-issue--warn .accessibility-issue__description {
   background-color: rgba(255, 165, 0, 0.1);
   border-color: rgba(255, 165, 0, 0.5);
-  color: #222f3e;
+  color: #515a6e;
 }
 .tox .accessibility-issue--warn .accessibility-issue__description > *:last-child {
   border-color: rgba(255, 165, 0, 0.5);
@@ -155,7 +155,7 @@ button::-moz-focus-inner {
 .tox .accessibility-issue--error .accessibility-issue__description {
   background-color: rgba(204, 0, 0, 0.1);
   border-color: rgba(204, 0, 0, 0.4);
-  color: #222f3e;
+  color: #515a6e;
 }
 .tox .accessibility-issue--error .accessibility-issue__description > *:last-child {
   border-color: rgba(204, 0, 0, 0.4);
@@ -172,7 +172,7 @@ button::-moz-focus-inner {
 .tox .accessibility-issue--success .accessibility-issue__description {
   background-color: rgba(120, 171, 70, 0.1);
   border-color: rgba(120, 171, 70, 0.4);
-  color: #222f3e;
+  color: #515a6e;
 }
 .tox .accessibility-issue--success .accessibility-issue__description > *:last-child {
   border-color: rgba(120, 171, 70, 0.4);
@@ -290,7 +290,7 @@ button::-moz-focus-inner {
   border-style: solid;
   border-width: 1px;
   box-shadow: none;
-  color: #222f3e;
+  color: #515a6e;
   outline: none;
   padding: 4px 16px;
   text-decoration: none;
@@ -308,21 +308,21 @@ button::-moz-focus-inner {
   background-image: none;
   border-color: #e3e3e3;
   box-shadow: none;
-  color: #222f3e;
+  color: #515a6e;
 }
 .tox .tox-button--secondary:hover:not(:disabled) {
   background-color: #e3e3e3;
   background-image: none;
   border-color: #e3e3e3;
   box-shadow: none;
-  color: #222f3e;
+  color: #515a6e;
 }
 .tox .tox-button--secondary:active:not(:disabled) {
   background-color: #d6d6d6;
   background-image: none;
   border-color: #d6d6d6;
   box-shadow: none;
-  color: #222f3e;
+  color: #515a6e;
 }
 .tox .tox-button--icon,
 .tox .tox-button.tox-button--icon,
@@ -356,7 +356,7 @@ button::-moz-focus-inner {
   background-color: transparent;
   border-color: transparent;
   box-shadow: unset;
-  color: #222f3e;
+  color: #515a6e;
 }
 .tox .tox-button--naked[disabled] {
   background-color: #f0f0f0;
@@ -368,25 +368,25 @@ button::-moz-focus-inner {
   background-color: #e3e3e3;
   border-color: #e3e3e3;
   box-shadow: none;
-  color: #222f3e;
+  color: #515a6e;
 }
 .tox .tox-button--naked:focus:not(:disabled) {
   background-color: #e3e3e3;
   border-color: #e3e3e3;
   box-shadow: none;
-  color: #222f3e;
+  color: #515a6e;
 }
 .tox .tox-button--naked:active:not(:disabled) {
   background-color: #d6d6d6;
   border-color: #d6d6d6;
   box-shadow: none;
-  color: #222f3e;
+  color: #515a6e;
 }
 .tox .tox-button--naked .tox-icon svg {
   fill: currentColor;
 }
 .tox .tox-button--naked.tox-button--icon:hover:not(:disabled) {
-  color: #222f3e;
+  color: #515a6e;
 }
 .tox .tox-checkbox {
   align-items: center;
@@ -521,7 +521,7 @@ button::-moz-focus-inner {
 }
 .tox .tox-collection__item {
   align-items: center;
-  color: #222f3e;
+  color: #515a6e;
   cursor: pointer;
   display: flex;
   -webkit-touch-callout: none;
@@ -543,31 +543,31 @@ button::-moz-focus-inner {
 }
 .tox .tox-collection--list .tox-collection__item--enabled {
   background-color: #fff;
-  color: #222f3e;
+  color: #515a6e;
 }
 .tox .tox-collection--list .tox-collection__item--active {
   background-color: #dee0e2;
 }
 .tox .tox-collection--toolbar .tox-collection__item--enabled {
   background-color: #c8cbcf;
-  color: #222f3e;
+  color: #515a6e;
 }
 .tox .tox-collection--toolbar .tox-collection__item--active {
   background-color: #dee0e2;
 }
 .tox .tox-collection--grid .tox-collection__item--enabled {
   background-color: #c8cbcf;
-  color: #222f3e;
+  color: #515a6e;
 }
 .tox .tox-collection--grid .tox-collection__item--active:not(.tox-collection__item--state-disabled) {
   background-color: #dee0e2;
-  color: #222f3e;
+  color: #515a6e;
 }
 .tox .tox-collection--list .tox-collection__item--active:not(.tox-collection__item--state-disabled) {
-  color: #222f3e;
+  color: #515a6e;
 }
 .tox .tox-collection--toolbar .tox-collection__item--active:not(.tox-collection__item--state-disabled) {
-  color: #222f3e;
+  color: #515a6e;
 }
 .tox .tox-collection__item--state-disabled {
   background-color: transparent;
@@ -621,7 +621,7 @@ button::-moz-focus-inner {
   min-height: inherit;
 }
 .tox .tox-collection__item-caret svg {
-  fill: #222f3e;
+  fill: #515a6e;
 }
 .tox .tox-collection--list .tox-collection__item:not(.tox-collection__item--enabled) .tox-collection__item-checkmark svg {
   display: none;
@@ -877,7 +877,7 @@ button::-moz-focus-inner {
 }
 .tox .tox-comment__header {
   align-items: center;
-  color: #222f3e;
+  color: #515a6e;
   display: flex;
   justify-content: space-between;
 }
@@ -886,7 +886,7 @@ button::-moz-focus-inner {
   font-size: 12px;
 }
 .tox .tox-comment__body {
-  color: #222f3e;
+  color: #515a6e;
   font-size: 14px;
   font-style: normal;
   font-weight: normal;
@@ -970,7 +970,7 @@ button::-moz-focus-inner {
 }
 .tox .tox-comment__loading-text {
   align-items: center;
-  color: #222f3e;
+  color: #515a6e;
   display: flex;
   flex-direction: column;
   position: relative;
@@ -992,7 +992,7 @@ button::-moz-focus-inner {
 .tox .tox-comment__overlaytext p {
   background-color: #fff;
   box-shadow: 0 0 8px 8px #fff;
-  color: #222f3e;
+  color: #515a6e;
   text-align: center;
 }
 .tox .tox-comment__overlaytext div:nth-of-type(2) {
@@ -1114,7 +1114,7 @@ button::-moz-focus-inner {
   align-items: center;
   background-color: #fff;
   border-bottom: none;
-  color: #222f3e;
+  color: #515a6e;
   display: flex;
   font-size: 16px;
   justify-content: space-between;
@@ -1148,7 +1148,7 @@ button::-moz-focus-inner {
   text-transform: none;
 }
 .tox .tox-dialog__body {
-  color: #222f3e;
+  color: #515a6e;
   display: flex;
   flex: 1;
   -ms-flex-preferred-size: auto;
@@ -1236,7 +1236,7 @@ button::-moz-focus-inner {
   text-decoration: none;
 }
 .tox .tox-dialog__body-content svg {
-  fill: #222f3e;
+  fill: #515a6e;
 }
 .tox .tox-dialog__body-content ul {
   display: block;
@@ -1701,7 +1701,7 @@ body.tox-dialog__disable-scroll {
   border-width: 1px;
   box-shadow: none;
   box-sizing: border-box;
-  color: #222f3e;
+  color: #515a6e;
   font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen-Sans, Ubuntu, Cantarell, "Helvetica Neue", sans-serif;
   font-size: 16px;
   line-height: 24px;
@@ -1744,7 +1744,7 @@ body.tox-dialog__disable-scroll {
 }
 .tox .tox-naked-btn svg {
   display: block;
-  fill: #222f3e;
+  fill: #515a6e;
 }
 .tox:not([dir=rtl]) .tox-toolbar-textfield + * {
   margin-left: 4px;
@@ -2002,7 +2002,7 @@ body.tox-dialog__disable-scroll {
   border: 0;
   border-radius: 3px;
   box-shadow: none;
-  color: #222f3e;
+  color: #515a6e;
   display: flex;
   flex: 0 0 auto;
   font-size: 14px;
@@ -2028,19 +2028,19 @@ body.tox-dialog__disable-scroll {
   background: #dee0e2;
   border: 0;
   box-shadow: none;
-  color: #222f3e;
+  color: #515a6e;
 }
 .tox .tox-mbtn--active {
   background: #c8cbcf;
   border: 0;
   box-shadow: none;
-  color: #222f3e;
+  color: #515a6e;
 }
 .tox .tox-mbtn:hover:not(:disabled):not(.tox-mbtn--active) {
   background: #dee0e2;
   border: 0;
   box-shadow: none;
-  color: #222f3e;
+  color: #515a6e;
 }
 .tox .tox-mbtn__select-label {
   cursor: default;
@@ -2087,67 +2087,67 @@ body.tox-dialog__disable-scroll {
 .tox .tox-notification--success {
   background-color: #e4eeda;
   border-color: #d7e6c8;
-  color: #222f3e;
+  color: #515a6e;
 }
 .tox .tox-notification--success p {
-  color: #222f3e;
+  color: #515a6e;
 }
 .tox .tox-notification--success a {
   color: #547831;
 }
 .tox .tox-notification--success svg {
-  fill: #222f3e;
+  fill: #515a6e;
 }
 .tox .tox-notification--error {
   background-color: #f8dede;
   border-color: #f2bfbf;
-  color: #222f3e;
+  color: #515a6e;
 }
 .tox .tox-notification--error p {
-  color: #222f3e;
+  color: #515a6e;
 }
 .tox .tox-notification--error a {
   color: #c00;
 }
 .tox .tox-notification--error svg {
-  fill: #222f3e;
+  fill: #515a6e;
 }
 .tox .tox-notification--warn,
 .tox .tox-notification--warning {
   background-color: #fffaea;
   border-color: #ffe89d;
-  color: #222f3e;
+  color: #515a6e;
 }
 .tox .tox-notification--warn p,
 .tox .tox-notification--warning p {
-  color: #222f3e;
+  color: #515a6e;
 }
 .tox .tox-notification--warn a,
 .tox .tox-notification--warning a {
-  color: #222f3e;
+  color: #515a6e;
 }
 .tox .tox-notification--warn svg,
 .tox .tox-notification--warning svg {
-  fill: #222f3e;
+  fill: #515a6e;
 }
 .tox .tox-notification--info {
   background-color: #d9edf7;
   border-color: #779ecb;
-  color: #222f3e;
+  color: #515a6e;
 }
 .tox .tox-notification--info p {
-  color: #222f3e;
+  color: #515a6e;
 }
 .tox .tox-notification--info a {
-  color: #222f3e;
+  color: #515a6e;
 }
 .tox .tox-notification--info svg {
-  fill: #222f3e;
+  fill: #515a6e;
 }
 .tox .tox-notification__body {
   -ms-grid-row-align: center;
       align-self: center;
-  color: #222f3e;
+  color: #515a6e;
   font-size: 14px;
   -ms-grid-column-span: 1;
   grid-column-end: 3;
@@ -2529,7 +2529,7 @@ body.tox-dialog__disable-scroll {
   border: 0;
   border-radius: 3px;
   box-shadow: none;
-  color: #222f3e;
+  color: #515a6e;
   display: flex;
   flex: 0 0 auto;
   font-size: 14px;
@@ -2546,7 +2546,7 @@ body.tox-dialog__disable-scroll {
 }
 .tox .tox-tbtn svg {
   display: block;
-  fill: #222f3e;
+  fill: #515a6e;
 }
 .tox .tox-tbtn.tox-tbtn-more {
   padding-left: 5px;
@@ -2562,19 +2562,19 @@ body.tox-dialog__disable-scroll {
   background: #dee0e2;
   border: 0;
   box-shadow: none;
-  color: #222f3e;
+  color: #515a6e;
 }
 .tox .tox-tbtn:hover svg {
-  fill: #222f3e;
+  fill: #515a6e;
 }
 .tox .tox-tbtn:active {
   background: #c8cbcf;
   border: 0;
   box-shadow: none;
-  color: #222f3e;
+  color: #515a6e;
 }
 .tox .tox-tbtn:active svg {
-  fill: #222f3e;
+  fill: #515a6e;
 }
 .tox .tox-tbtn--disabled,
 .tox .tox-tbtn--disabled:hover,
@@ -2598,7 +2598,7 @@ body.tox-dialog__disable-scroll {
   background: #c8cbcf;
   border: 0;
   box-shadow: none;
-  color: #222f3e;
+  color: #515a6e;
 }
 .tox .tox-tbtn--enabled > *,
 .tox .tox-tbtn--enabled:hover > * {
@@ -2607,13 +2607,13 @@ body.tox-dialog__disable-scroll {
 .tox .tox-tbtn--enabled svg,
 .tox .tox-tbtn--enabled:hover svg {
   /* stylelint-disable-line no-descending-specificity */
-  fill: #222f3e;
+  fill: #515a6e;
 }
 .tox .tox-tbtn:focus:not(.tox-tbtn--disabled) {
-  color: #222f3e;
+  color: #515a6e;
 }
 .tox .tox-tbtn:focus:not(.tox-tbtn--disabled) svg {
-  fill: #222f3e;
+  fill: #515a6e;
 }
 .tox .tox-tbtn:active > * {
   transform: none;
@@ -2684,7 +2684,7 @@ body.tox-dialog__disable-scroll {
 .tox .tox-split-button:focus {
   background: #dee0e2;
   box-shadow: none;
-  color: #222f3e;
+  color: #515a6e;
 }
 .tox .tox-split-button > * {
   border-radius: 0;
@@ -2793,7 +2793,7 @@ body.tox-dialog__disable-scroll {
   position: relative;
 }
 .tox .tox-tooltip__body {
-  background-color: #222f3e;
+  background-color: #515a6e;
   border-radius: 3px;
   box-shadow: 0 2px 4px rgba(34, 47, 62, 0.3);
   color: rgba(255, 255, 255, 0.75);
@@ -2809,14 +2809,14 @@ body.tox-dialog__disable-scroll {
 .tox .tox-tooltip--down .tox-tooltip__arrow {
   border-left: 8px solid transparent;
   border-right: 8px solid transparent;
-  border-top: 8px solid #222f3e;
+  border-top: 8px solid #515a6e;
   bottom: 0;
   left: 50%;
   position: absolute;
   transform: translateX(-50%);
 }
 .tox .tox-tooltip--up .tox-tooltip__arrow {
-  border-bottom: 8px solid #222f3e;
+  border-bottom: 8px solid #515a6e;
   border-left: 8px solid transparent;
   border-right: 8px solid transparent;
   left: 50%;
@@ -2826,7 +2826,7 @@ body.tox-dialog__disable-scroll {
 }
 .tox .tox-tooltip--right .tox-tooltip__arrow {
   border-bottom: 8px solid transparent;
-  border-left: 8px solid #222f3e;
+  border-left: 8px solid #515a6e;
   border-top: 8px solid transparent;
   position: absolute;
   right: 0;
@@ -2835,7 +2835,7 @@ body.tox-dialog__disable-scroll {
 }
 .tox .tox-tooltip--left .tox-tooltip__arrow {
   border-bottom: 8px solid transparent;
-  border-right: 8px solid #222f3e;
+  border-right: 8px solid #515a6e;
   border-top: 8px solid transparent;
   left: 0;
   position: absolute;