diff --git a/src/Login.vue b/src/Login.vue index c196ddfa..125b23e3 100644 --- a/src/Login.vue +++ b/src/Login.vue @@ -259,155 +259,8 @@ export default { } } - diff --git a/src/assets/css/components/components/common/login.scss b/src/assets/css/components/components/common/login.scss index 29ea43b8..6c0d8452 100644 --- a/src/assets/css/components/components/common/login.scss +++ b/src/assets/css/components/components/common/login.scss @@ -13,7 +13,6 @@ $color-input-border: #295688; background-color: var(--el-color-black); background-size: auto; background-repeat: round; - //background-image: url("../public/images/bg.png"); .el-input__inner { border: none; @@ -78,6 +77,7 @@ $color-input-border: #295688; flex-direction: row; align-items: center; justify-content: space-between; + width: 100%; .license__btn { position: relative; diff --git a/src/assets/css/components/views/charts2/networkOverviewApps.scss b/src/assets/css/components/views/charts2/networkOverviewApps.scss index 37a942bf..bb788065 100644 --- a/src/assets/css/components/views/charts2/networkOverviewApps.scss +++ b/src/assets/css/components/views/charts2/networkOverviewApps.scss @@ -170,13 +170,7 @@ display: flex; align-items: center; - .no-records { - background: #21B4ED; - color: #FFFFFF !important; - opacity: 0.6; - cursor: not-allowed !important; - } - .header__operation { + .business-button { min-width: 72px; height: 30px; margin-right: 20px; diff --git a/src/assets/css/components/views/setting/knowledgeBase.scss b/src/assets/css/components/views/setting/knowledgeBase.scss index 8ad0d23b..4de2ec8b 100644 --- a/src/assets/css/components/views/setting/knowledgeBase.scss +++ b/src/assets/css/components/views/setting/knowledgeBase.scss @@ -335,40 +335,11 @@ $color-mousemove-cursor: #D3D0D8; flex-direction: row; justify-content: center; font-size: 14px; - font-weight: 400; align-items: center; padding-left: 16px; padding-right: 16px; padding-bottom: 20px; - .top-tool-btn--update { - background-color: $color-business !important; - padding-left: 7px; - padding-right: 7px; - color: $color-white; - font-size: 12px; - font-weight: 500; - border: 1px solid rgba(46, 136, 166, 0.85); - border-radius: 2px; - line-height: 28px; - height: 28px; - cursor: pointer; - display: flex; - justify-content: center; - align-items: center; - - i { - color: $color-white; - font-size: 14px !important; - margin-right: 5px; - } - } - - .top-tool-btn--update:hover { - background-color: $color-business-hover !important; - border-color: $color-business-border-hover !important; - } - .card-type { display: flex; flex-direction: row; @@ -637,23 +608,6 @@ $color-mousemove-cursor: #D3D0D8; & > div { //padding: 0 0 0 10px; } - - .el-button { - color: $color-regular; - } - - .el-button--small { - padding: 7px 9px !important; - min-height: 28px !important; - - &.active i { - color: $color-primary; - } - - i { - font-size: 12px; - } - } } .top-tools__left { @@ -1124,6 +1078,18 @@ $color-mousemove-cursor: #D3D0D8; } } } + + .business-button { + padding-left: 7px; + padding-right: 7px; + font-size: 12px; + height: 28px; + + i { + font-size: 14px !important; + margin-right: 5px; + } + } } .reference-tag__tip { @@ -1836,34 +1802,6 @@ $color-mousemove-cursor: #D3D0D8; border-top: 1px solid $color-border-lighter; box-shadow: inset 0 -1px 0 0 rgba(0, 0, 0, 0.07); padding: 11px 0 12px !important; - - .el-button { - padding: 8px 21px !important; - line-height: 12px; - font-size: 12px; - font-weight: 500; - min-height: 28px; - } - - .el-button:nth-child(1) { - margin-right: 20px; - width: 80px; - height: 28px; - color: $color-text-primary; - background: $color-fill-light; - border: 1px solid $color-border-dark; - border-radius: 2px; - } - - .el-button:nth-child(2) { - width: 80px; - height: 28px; - margin-right: 20px; - margin-left: 0 !important; - background: $color-business; - border: 1px solid $color-business-border-hover; - border-radius: 2px; - } } } @@ -1996,43 +1934,6 @@ $color-mousemove-cursor: #D3D0D8; flex-direction: row; justify-content: center; font-size: 14px; - font-weight: 400; - - .top-tool-btn--update { - background-color: $color-business !important; - padding-left: 7px; - padding-right: 7px; - color: $color-white; - font-size: 12px; - font-weight: 500; - border: 1px solid rgba(46, 136, 166, 0.85); - border-radius: 2px; - line-height: 28px; - height: 28px; - cursor: pointer; - display: flex; - justify-content: center; - align-items: center; - - i { - color: $color-white; - font-size: 14px !important; - margin-right: 5px; - } - } - - .top-tool-btn--update:disabled { - cursor: not-allowed; - opacity: 0.66; - - i { - } - } - - .top-tool-btn--update:hover { - background-color: $color-business-hover !important; - border-color: $color-business-border-hover !important; - } } } @@ -2057,44 +1958,7 @@ $color-mousemove-cursor: #D3D0D8; flex-direction: row; justify-content: center; font-size: 14px; - font-weight: 400; align-items: center; - - .top-tool-btn--update { - background-color: $color-business !important; - padding-left: 7px; - padding-right: 7px; - color: $color-white; - font-size: 12px; - font-weight: 500; - border: 1px solid rgba(46, 136, 166, 0.85); - border-radius: 2px; - line-height: 28px; - height: 28px; - cursor: pointer; - display: flex; - justify-content: center; - align-items: center; - - i { - color: $color-white; - font-size: 14px !important; - margin-right: 5px; - } - } - - .top-tool-btn--update:disabled { - cursor: not-allowed; - opacity: 0.66; - - i { - } - } - - .top-tool-btn--update:hover { - background-color: $color-business-hover !important; - border-color: $color-business-border-hover !important; - } } } @@ -2252,30 +2116,10 @@ $color-mousemove-cursor: #D3D0D8; justify-content: flex-end; padding-top: 32px; - .el-button { - padding: 10px 21px !important; - line-height: 12px; - font-size: 12px; - font-weight: 500; - min-height: 32px; - width: 80px; - height: 32px; - } - - .el-button:nth-child(1) { - margin-right: 20px; - color: $color-text-primary; - background: $color-fill-light; - border: 1px solid $color-border-dark; - border-radius: 2px; - } - - .el-button:nth-child(2) { - color: $color-white; - margin-left: 0 !important; - background: $color-business; - border: 1px solid $color-business-border-hover; - border-radius: 2px; + .business-button { + margin-left: 15px; + height: 30px; + min-width: 72px; } } } @@ -2286,12 +2130,10 @@ $color-mousemove-cursor: #D3D0D8; margin-top: 25px; .psiphon3-title { - font-family: NotoSansSC-Medium; font-size: 12px; color: $color-text-primary; letter-spacing: 0; line-height: 14px; - font-weight: 500; } .psiphon3-bar { diff --git a/src/assets/css/components/views/tag/tag.scss b/src/assets/css/components/views/tag/tag.scss index c2694cd4..69c66d52 100644 --- a/src/assets/css/components/views/tag/tag.scss +++ b/src/assets/css/components/views/tag/tag.scss @@ -1,9 +1,9 @@ .cn-tag { - background: #fff; margin: 10px; height: calc(100% - 20px) !important; display: flex; flex-direction: row; + .cn-tag-right { flex: 1; .list-page .main-container { diff --git a/src/components/table/setting/knowledgeBaseTableForCard.vue b/src/components/table/setting/knowledgeBaseTableForCard.vue index 0993115d..8a08755c 100644 --- a/src/components/table/setting/knowledgeBaseTableForCard.vue +++ b/src/components/table/setting/knowledgeBaseTableForCard.vue @@ -14,7 +14,7 @@
{{ data.desc ? $t(data.desc) : '—' }}
-
@@ -233,8 +233,8 @@
{{ $t('knowledge.updateTips') }}
diff --git a/src/views/charts2/charts/networkOverview/NetworkOverviewApps.vue b/src/views/charts2/charts/networkOverview/NetworkOverviewApps.vue index b63abc77..65c37e06 100644 --- a/src/views/charts2/charts/networkOverview/NetworkOverviewApps.vue +++ b/src/views/charts2/charts/networkOverview/NetworkOverviewApps.vue @@ -63,7 +63,7 @@
{{$t('overall.add')}}
- +
diff --git a/src/views/tag/Tag.vue b/src/views/tag/Tag.vue index 7ebc0bf4..43617932 100644 --- a/src/views/tag/Tag.vue +++ b/src/views/tag/Tag.vue @@ -11,24 +11,23 @@ @search="search" >