diff --git a/frontend/pc/src/i18n/lang/en.js b/frontend/pc/src/i18n/lang/en.js index 635e68a04..73adf475c 100644 --- a/frontend/pc/src/i18n/lang/en.js +++ b/frontend/pc/src/i18n/lang/en.js @@ -2465,6 +2465,7 @@ export const m = { '暂未开放': 'Unopen', '请输入模板内容': 'Please enter the template content', '确认要删除?': 'Are you sure you want to delete?', + '复制': 'Copy', '导入': 'Import', '导出': 'Export', '文件': 'File', diff --git a/frontend/pc/src/i18n/lang/zh.js b/frontend/pc/src/i18n/lang/zh.js index 272dda1d5..b50a0ca52 100644 --- a/frontend/pc/src/i18n/lang/zh.js +++ b/frontend/pc/src/i18n/lang/zh.js @@ -2547,6 +2547,7 @@ export const m = { '暂未开放': '暂未开放', '请输入模板内容': '请输入模板内容', '确认要删除?': '确认要删除?', + '复制': '复制', '导入': '导入', '导出': '导出', '文件': '文件', diff --git a/frontend/pc/src/scss/bk-new-change.scss b/frontend/pc/src/scss/bk-new-change.scss index 0a0ff2a13..9ab68dafe 100644 --- a/frontend/pc/src/scss/bk-new-change.scss +++ b/frontend/pc/src/scss/bk-new-change.scss @@ -78,12 +78,12 @@ padding: 0 20px; display: inline-block; border: 1px solid #C4C6CC; - border-radius: 11px; + // border-radius: 11px; color: #979BA5; font-size: 12px; padding: 0 8px; line-height: 22px; - background-color: #fff; + background-color: #fbf9e2; white-space: nowrap; cursor: pointer; &:hover { diff --git a/frontend/pc/src/scss/icon/fonts/commonicon.eot b/frontend/pc/src/scss/icon/fonts/commonicon.eot index ab4dc934a..6ea94a7a5 100644 Binary files a/frontend/pc/src/scss/icon/fonts/commonicon.eot and b/frontend/pc/src/scss/icon/fonts/commonicon.eot differ diff --git a/frontend/pc/src/scss/icon/fonts/commonicon.svg b/frontend/pc/src/scss/icon/fonts/commonicon.svg index 9908079a5..4168c6283 100644 --- a/frontend/pc/src/scss/icon/fonts/commonicon.svg +++ b/frontend/pc/src/scss/icon/fonts/commonicon.svg @@ -857,6 +857,12 @@ + + + + + + diff --git a/frontend/pc/src/scss/icon/fonts/commonicon.ttf b/frontend/pc/src/scss/icon/fonts/commonicon.ttf index 4495b7dc4..bd3ba9ad2 100644 Binary files a/frontend/pc/src/scss/icon/fonts/commonicon.ttf and b/frontend/pc/src/scss/icon/fonts/commonicon.ttf differ diff --git a/frontend/pc/src/scss/icon/fonts/commonicon.woff b/frontend/pc/src/scss/icon/fonts/commonicon.woff index 0adab649d..149e41f96 100644 Binary files a/frontend/pc/src/scss/icon/fonts/commonicon.woff and b/frontend/pc/src/scss/icon/fonts/commonicon.woff differ diff --git a/frontend/pc/src/scss/icon/iconfont.css b/frontend/pc/src/scss/icon/iconfont.css index 31bbf7beb..a32de282d 100644 --- a/frontend/pc/src/scss/icon/iconfont.css +++ b/frontend/pc/src/scss/icon/iconfont.css @@ -8,6 +8,7 @@ url("scss/icon/fonts/commonicon.eot?#iefix") format("embedded-opentype"); font-style: normal; } + .bk-itsm-icon { /* use !important to prevent issues with browser extensions that change fonts */ font-family: 'commonicon' !important; @@ -851,3 +852,9 @@ url("scss/icon/fonts/commonicon.eot?#iefix") format("embedded-opentype"); .icon-pinglun:before { content: "\e220"; } +.icon-kaishi:before { + content: "\e221"; +} +.icon-jieshu:before { + content: "\e222"; +} diff --git a/frontend/pc/src/views/commonComponent/preview/NodeTemplate.vue b/frontend/pc/src/views/commonComponent/preview/NodeTemplate.vue index ac034ed8a..ff1ab3473 100644 --- a/frontend/pc/src/views/commonComponent/preview/NodeTemplate.vue +++ b/frontend/pc/src/views/commonComponent/preview/NodeTemplate.vue @@ -28,10 +28,10 @@ @mousemove="moveFn" @mouseup="onNodeClick(node, $event)">
- {{ $t('m.treeinfo["开始"]') }} +
-
- {{ $t('m.treeinfo["结束"]') }} +
+