diff --git a/nezha-fronted/src/assets/css/common.scss b/nezha-fronted/src/assets/css/common.scss index a0155fd7a..d7f89853e 100644 --- a/nezha-fronted/src/assets/css/common.scss +++ b/nezha-fronted/src/assets/css/common.scss @@ -234,3 +234,13 @@ td .nz-icon-gear:before{ opacity: 1 !important; } } +.right-box .right-box-form-add,.right-box .right-box-form-minus-box{ + padding:4px 6px; + background: $--background-color-copy; + border-radius: $--border-radius-small; + border: 1px solid $--span-nz-icon-border-color; + cursor: pointer; + .nz-icon-plus { + color: $--nz-icon-color; + } +} diff --git a/nezha-fronted/src/assets/css/components/common/paramBpx/paramBox.scss b/nezha-fronted/src/assets/css/components/common/paramBpx/paramBox.scss new file mode 100644 index 000000000..26b92c863 --- /dev/null +++ b/nezha-fronted/src/assets/css/components/common/paramBpx/paramBox.scss @@ -0,0 +1,40 @@ +/* start--param*/ +.param-box, .tag-edit-box { + border: 1px solid #DCDFE6; + border-radius: 2px; +} +.param-box-endpoint { + height: 325px; +} +.param-box-module, .tag-edit-box { + height: 140px; +} +.param-box-row { + padding: 0; + position: relative; +} +.param-box-row>div { + display: inline-block; +} +.param-box-row-key, .param-box-row-value { + display: inline-block; + width: 43%; +} +.param-box-row-eq { + display: inline-block; + width: 22px; + text-align: center; + height: 32px; + line-height: 32px; + color: #c4c7cF; +} +.param-box-row-symbol { + display: inline-block; + padding-left: 3px; + font-size: 12px; + color: $--color-text-regular; + cursor: pointer; +} +.param-box .param-box-row .is-error { + padding-bottom: 10px; +} diff --git a/nezha-fronted/src/assets/css/components/common/rightBox/moduleBox.scss b/nezha-fronted/src/assets/css/components/common/rightBox/moduleBox.scss index 31993e939..80e95bad4 100644 --- a/nezha-fronted/src/assets/css/components/common/rightBox/moduleBox.scss +++ b/nezha-fronted/src/assets/css/components/common/rightBox/moduleBox.scss @@ -53,7 +53,7 @@ padding-left: 0; } .el-tabs__item{ - width: 90px; + min-width: 90px; padding: 0 10px; text-align: center; } @@ -102,10 +102,6 @@ padding: 10px 0px 10px 15px; width:100%; margin-left: 0px; - pre{ - max-height: 300px; - min-height: 100px; - } } .configs-copy-value .copy-value-content{ position: absolute; @@ -138,8 +134,9 @@ position: absolute; right: 20px; top: 15px; - background: rgba(236,127,102,0.1); + background: $--background-color-copy; padding: 2px 6px; + border: 1px solid $--span-nz-icon-border-color; color: $--nz-icon-color; } .endpoint-title{ @@ -169,13 +166,13 @@ } } .value-mapping-add { - background: rgba(250,144,28,0.1); - border: 1px solid #FFE0BD; margin-bottom: 10px; height: 24px; - line-height: 24px; - color: $--color-primary; + line-height: 23px; box-sizing: border-box; + background: $--background-color-copy; + border: 1px solid $--span-nz-icon-border-color; + color: $--nz-icon-color; } #module-box-relabel .vue-tags-input{ max-width: unset; @@ -198,6 +195,15 @@ text-transform: Capitalize; } } + .configs-copy-value { + pre { + color: $--color-text-primary; + padding: 15px; + } + i { + color: $--color-text-regular; + } + } } .sub-label { padding-right: 15px; @@ -250,4 +256,7 @@ color: $--color-text-regular !important; } } + .ti-input:hover { + border: 1px solid $--border-color-light-hover; + } } diff --git a/nezha-fronted/src/assets/css/components/index.scss b/nezha-fronted/src/assets/css/components/index.scss index 790896fbb..50ed37545 100644 --- a/nezha-fronted/src/assets/css/components/index.scss +++ b/nezha-fronted/src/assets/css/components/index.scss @@ -87,3 +87,5 @@ @import './page/monitor/project/project.scss'; @import 'common/v-selectpagenew/selectpage.scss'; + +@import "common/paramBpx/paramBox"; diff --git a/nezha-fronted/src/assets/css/components/page/dashboard/explore/explore.scss b/nezha-fronted/src/assets/css/components/page/dashboard/explore/explore.scss index bff01217d..f87c11add 100644 --- a/nezha-fronted/src/assets/css/components/page/dashboard/explore/explore.scss +++ b/nezha-fronted/src/assets/css/components/page/dashboard/explore/explore.scss @@ -3,6 +3,19 @@ padding: 10px 0 10px 10px; background-color: $--background-color-base; box-sizing: border-box; + pre { + border: 1px solid $--border-color-base; + border-left: 4px solid #e6522c; + border-radius: 0; + font-family: "Courier New", Monaco, Menlo, Consolas, monospace; + background-color: $--background-color-empty; + color: $--color-text-primary; + padding: 15px; + } + + pre code { + white-space: pre; + } .el-table--border::after, .el-table--group::after, .el-table::before { height: 0; @@ -280,20 +293,6 @@ background-color: transparent; } -pre { - border: 1px solid $--border-color-base; - border-left: 4px solid #e6522c; - border-radius: 0; - font-family: "Courier New", Monaco, Menlo, Consolas, monospace; - background-color: $--background-color-empty; - color: $--color-text-primary; - padding: 15px; -} - -pre code { - white-space: pre; -} - code { color: $--color-text-primary; } diff --git a/nezha-fronted/src/assets/css/themes/theme-dark.scss b/nezha-fronted/src/assets/css/themes/theme-dark.scss index 476fe8dbf..f514aa708 100644 --- a/nezha-fronted/src/assets/css/themes/theme-dark.scss +++ b/nezha-fronted/src/assets/css/themes/theme-dark.scss @@ -143,6 +143,7 @@ $--select-page-tag-background-color: $--background-color-empty; // icon字色 $--nz-icon-color: $--button-primary-color; +$--span-nz-icon-border-color: $--border-color-light-hover; // value $--value-background-color: $--background-color-empty; diff --git a/nezha-fronted/src/assets/css/themes/theme-light.scss b/nezha-fronted/src/assets/css/themes/theme-light.scss index b80d0301f..7c0228e9c 100644 --- a/nezha-fronted/src/assets/css/themes/theme-light.scss +++ b/nezha-fronted/src/assets/css/themes/theme-light.scss @@ -141,6 +141,7 @@ $--select-page-tag-background-color: #e4eaee; // icon 字色 $--nz-icon-color: $--color-primary; //icon +$--span-nz-icon-border-color: $--asset-label-btn-border-color; // value $--value-background-color: #5C6BC0; diff --git a/nezha-fronted/src/assets/stylus/main.scss b/nezha-fronted/src/assets/stylus/main.scss index 651cea591..40633dcd2 100644 --- a/nezha-fronted/src/assets/stylus/main.scss +++ b/nezha-fronted/src/assets/stylus/main.scss @@ -707,46 +707,6 @@ li { .right-box-form-btns button { margin-left: 10px; } -/* start--param*/ -.param-box, .tag-edit-box { - border: 1px solid #DCDFE6; - border-radius: 2px; -} -.param-box-endpoint { - height: 325px; -} -.param-box-module, .tag-edit-box { - height: 140px; -} -.param-box-row { - padding: 0; - position: relative; -} -.param-box-row>div { - display: inline-block; -} -.param-box-row-key, .param-box-row-value { - display: inline-block; - width: 43%; -} -.param-box-row-eq { - display: inline-block; - width: 22px; - text-align: center; - height: 32px; - line-height: 32px; - color: #c4c7cF; -} -.param-box-row-symbol { - display: inline-block; - padding-left: 3px; - font-size: 12px; - color: #DCDFE6; - cursor: pointer; -} -.param-box .param-box-row .is-error { - padding-bottom: 10px; -} /* end--param*/ .right-box-form-content .el-select { width: 100%; @@ -1424,24 +1384,6 @@ li { width: calc(50% - 30px); margin-left: 0; } -.right-box .right-box-form-add,.right-box .right-box-form-minus-box{ - background: rgba(250,144,28,.1); - padding:4px 6px; - border-radius: 2px; - cursor: pointer; -} -.right-box .right-box-form-add .nz-icon-create-square{ - color: $--color-primary; - cursor: pointer; -} -.right-box .right-box-form-add .nz-icon-plus{ - color: $--color-primary; - cursor: pointer; -} -.right-box .right-box-form-minus-box .nz-icon-minus{ - color: $--color-primary; - cursor: pointer; -} .nz-icon-caret-right{ font-size: 12px; } diff --git a/nezha-fronted/src/components/common/rightBox/editEndpointBoxNew.vue b/nezha-fronted/src/components/common/rightBox/editEndpointBoxNew.vue index 359e41b68..fe15c0dea 100644 --- a/nezha-fronted/src/components/common/rightBox/editEndpointBoxNew.vue +++ b/nezha-fronted/src/components/common/rightBox/editEndpointBoxNew.vue @@ -563,7 +563,7 @@
{{configsCopyValue}}
+ {{configsCopyValue}}
{{configsCopyValue}}
+ {{configsCopyValue}}