diff --git a/module/action/lang/zh-cn.php b/module/action/lang/zh-cn.php index 956a29183d..44c54c41bc 100755 --- a/module/action/lang/zh-cn.php +++ b/module/action/lang/zh-cn.php @@ -318,7 +318,7 @@ $lang->action->label->paused = '暂停了'; $lang->action->label->verified = '验收了'; $lang->action->label->delayed = '延期了'; $lang->action->label->suspended = '挂起了'; -$lang->action->label->login = '登录了系统'; +$lang->action->label->login = '登录系统'; $lang->action->label->logout = "退出了登录"; $lang->action->label->notified = "通知了"; $lang->action->label->deleteestimate = "删除了工时"; diff --git a/module/company/css/dynamic.css b/module/company/css/dynamic.css index bde70fd5a0..227495350b 100644 --- a/module/company/css/dynamic.css +++ b/module/company/css/dynamic.css @@ -22,11 +22,13 @@ .c-user, .c-order {width: 96px !important; overflow: unset;} .c-date {width: 200px;} -.timeline>li:before {left: -26px;} -.timeline>li+li:after {left: -23px;} +.timeline > li:before {left: -26px;} +.timeline > li + li:after {left: -23px;} .timeline-text {margin-left: -18px;} .label-action {padding: 0 4px;} .label-id {margin-left: 4px;} -.timeline>li.active:before {left: -30px;} -.timeline>li>div:after {left: -27px;} +.timeline > li.active:before {left: -30px;} +.timeline > li > div:after {left: -27px;} .timeline .timeline-text {display: block; overflow: hidden; text-overflow: ellipsis; white-space: nowrap;} +.timeline > li > div > .timeline-tag, .timeline > li > div > .timeline-text > .label-action {color: #838A9D;} +.timeline > li > div > .timeline-text > a {color: #313C52;} diff --git a/module/execution/css/dynamic.css b/module/execution/css/dynamic.css index 0858328480..33b2c09989 100644 --- a/module/execution/css/dynamic.css +++ b/module/execution/css/dynamic.css @@ -20,11 +20,13 @@ .dynamic.collapsed .timeline > li + li {display: none;} .dynamic.collapsed .dynamic-btn > .icon:before {content: '\f0d8';} -.timeline>li:before {left: -26px;} -.timeline>li+li:after {left: -23px;} +.timeline > li:before {left: -26px;} +.timeline > li + li:after {left: -23px;} .timeline-text {margin-left: -18px;} .label-action {padding: 0 4px;} .label-id {margin-left: 4px;} -.timeline>li.active:before {left: -30px;} -.timeline>li>div:after {left: -27px;} +.timeline > li.active:before {left: -30px;} +.timeline > li > div:after {left: -27px;} .timeline .timeline-text {display: block; overflow: hidden; text-overflow: ellipsis; white-space: nowrap;} +.timeline > li > div > .timeline-tag, .timeline > li > div > .timeline-text > .label-action {color: #838A9D;} +.timeline > li > div > .timeline-text > a {color: #313C52;} diff --git a/module/my/css/dynamic.css b/module/my/css/dynamic.css index 071ed48304..4f445adaab 100644 --- a/module/my/css/dynamic.css +++ b/module/my/css/dynamic.css @@ -19,11 +19,13 @@ .dynamic.collapsed .timeline > li + li {display: none;} .dynamic.collapsed .dynamic-btn > .icon:before {content: '\f0d8';} -.timeline>li:before {left: -26px;} -.timeline>li+li:after {left: -23px;} +.timeline > li:before {left: -26px;} +.timeline > li + li:after {left: -23px;} .timeline-text {margin-left: -18px;} .label-action {padding: 0 4px;} .label-id {margin-left: 4px;} -.timeline>li.active:before {left: -30px;} -.timeline>li>div:after {left: -27px;} +.timeline > li.active:before {left: -30px;} +.timeline > li > div:after {left: -27px;} .timeline .timeline-text {display: block; overflow: hidden; text-overflow: ellipsis; white-space: nowrap;} +.timeline > li > div > .timeline-tag, .timeline > li > div > .timeline-text > .label-action {color: #838A9D;} +.timeline > li > div > .timeline-text > a {color: #313C52;} diff --git a/module/product/css/dynamic.css b/module/product/css/dynamic.css index 0858328480..620a0e8cfa 100644 --- a/module/product/css/dynamic.css +++ b/module/product/css/dynamic.css @@ -20,11 +20,13 @@ .dynamic.collapsed .timeline > li + li {display: none;} .dynamic.collapsed .dynamic-btn > .icon:before {content: '\f0d8';} -.timeline>li:before {left: -26px;} -.timeline>li+li:after {left: -23px;} +.timeline > li:before {left: -26px;} +.timeline > li + li:after {left: -23px;} .timeline-text {margin-left: -18px;} .label-action {padding: 0 4px;} .label-id {margin-left: 4px;} -.timeline>li.active:before {left: -30px;} -.timeline>li>div:after {left: -27px;} +.timeline >li.active:before {left: -30px;} +.timeline >li > div:after {left: -27px;} .timeline .timeline-text {display: block; overflow: hidden; text-overflow: ellipsis; white-space: nowrap;} +.timeline > li > div > .timeline-tag, .timeline > li > div > .timeline-text > .label-action {color: #838A9D;} +.timeline > li > div > .timeline-text > a {color: #313C52;} diff --git a/module/project/css/dynamic.css b/module/project/css/dynamic.css index 0858328480..33b2c09989 100644 --- a/module/project/css/dynamic.css +++ b/module/project/css/dynamic.css @@ -20,11 +20,13 @@ .dynamic.collapsed .timeline > li + li {display: none;} .dynamic.collapsed .dynamic-btn > .icon:before {content: '\f0d8';} -.timeline>li:before {left: -26px;} -.timeline>li+li:after {left: -23px;} +.timeline > li:before {left: -26px;} +.timeline > li + li:after {left: -23px;} .timeline-text {margin-left: -18px;} .label-action {padding: 0 4px;} .label-id {margin-left: 4px;} -.timeline>li.active:before {left: -30px;} -.timeline>li>div:after {left: -27px;} +.timeline > li.active:before {left: -30px;} +.timeline > li > div:after {left: -27px;} .timeline .timeline-text {display: block; overflow: hidden; text-overflow: ellipsis; white-space: nowrap;} +.timeline > li > div > .timeline-tag, .timeline > li > div > .timeline-text > .label-action {color: #838A9D;} +.timeline > li > div > .timeline-text > a {color: #313C52;} diff --git a/module/user/css/dynamic.css b/module/user/css/dynamic.css index 2151548788..d000e94dc1 100644 --- a/module/user/css/dynamic.css +++ b/module/user/css/dynamic.css @@ -19,11 +19,13 @@ .dynamic.collapsed .timeline > li + li {display: none;} .dynamic.collapsed .dynamic-btn > .icon:before {content: '\f0d8';} -.timeline>li:before {left: -26px;} -.timeline>li+li:after {left: -23px;} +.timeline > li:before {left: -26px;} +.timeline > li + li:after {left: -23px;} .timeline-text {margin-left: -18px;} .label-action {padding: 0 4px;} .label-id {margin-left: 4px;} -.timeline>li.active:before {left: -30px;} -.timeline>li>div:after {left: -27px;} +.timeline > li.active:before {left: -30px;} +.timeline > li > div:after {left: -27px;} .timeline .timeline-text {display: block; overflow: hidden; text-overflow: ellipsis; white-space: nowrap;} +.timeline > li > div > .timeline-tag, .timeline > li > div > .timeline-text > .label-action {color: #838A9D;} +.timeline > li > div > .timeline-text > a {color: #313C52;}