diff --git a/core/core-frontend/src/components/dashboard/DbCanvasAttr.vue b/core/core-frontend/src/components/dashboard/DbCanvasAttr.vue index 8d98c98..fa003d3 100644 --- a/core/core-frontend/src/components/dashboard/DbCanvasAttr.vue +++ b/core/core-frontend/src/components/dashboard/DbCanvasAttr.vue @@ -205,11 +205,11 @@ const saveSelfSubject = () => { } :deep(.ed-radio__input.is-checked + .ed-radio__label) { - color: #1f2329 !important; + color: #fff ; } :deep(.ed-radio__input.is-disabled + span.ed-radio__label) { - color: var(--ed-text-color-placeholder) !important; + color: #fff !important; } :deep(.ed-collapse-item.ed-collapse--light .ed-collapse-item__content) { diff --git a/core/core-frontend/src/components/visualization/DvSidebar.vue b/core/core-frontend/src/components/visualization/DvSidebar.vue index 7c07be9..611cf45 100644 --- a/core/core-frontend/src/components/visualization/DvSidebar.vue +++ b/core/core-frontend/src/components/visualization/DvSidebar.vue @@ -355,6 +355,7 @@ const onComponentNameChange = () => { .ed-popper.is-light { border: 1px solid #434343 !important; background: rgba(41, 41, 41, 1) !important; + color: #ffffff ; } .ed-popper[data-popper-placement^=bottom] .ed-popper__arrow::before { background: rgba(41, 41, 41, 1) !important; diff --git a/core/core-frontend/src/style/index.less b/core/core-frontend/src/style/index.less index 939e837..05d2f3f 100644 --- a/core/core-frontend/src/style/index.less +++ b/core/core-frontend/src/style/index.less @@ -742,4 +742,8 @@ strong { } .de-el-dropdown-menu-fixed .de-panel .mod-left .ed-input__wrapper{ background-color: rgba(37, 38, 38, 0) !important; -} \ No newline at end of file +} + +.form-draggable-title{ + color: #ffffff; +} diff --git a/core/core-frontend/src/style/mixin.less b/core/core-frontend/src/style/mixin.less index 5dd7b8b..2cd6ca3 100644 --- a/core/core-frontend/src/style/mixin.less +++ b/core/core-frontend/src/style/mixin.less @@ -56,3 +56,7 @@ color: #fff ; } +:deep(.ed-row.drag-data.padding-lr svg){ + width: 100%; + height: 100%; +} \ No newline at end of file diff --git a/core/core-frontend/src/views/chart/components/editor/drag-item/DimensionItem.vue b/core/core-frontend/src/views/chart/components/editor/drag-item/DimensionItem.vue index abee9c6..f76bc22 100644 --- a/core/core-frontend/src/views/chart/components/editor/drag-item/DimensionItem.vue +++ b/core/core-frontend/src/views/chart/components/editor/drag-item/DimensionItem.vue @@ -801,7 +801,7 @@ span { .item-span-style { display: flex; max-width: 170px; - color: #1f2329; + color: #fff; margin-left: 4px; &.hidden-status, diff --git a/core/core-frontend/src/views/chart/components/editor/drag-item/DrillItem.vue b/core/core-frontend/src/views/chart/components/editor/drag-item/DrillItem.vue index 911e9d4..8dff655 100644 --- a/core/core-frontend/src/views/chart/components/editor/drag-item/DrillItem.vue +++ b/core/core-frontend/src/views/chart/components/editor/drag-item/DrillItem.vue @@ -409,7 +409,7 @@ span { .item-span-style { display: flex; max-width: 170px; - color: #1f2329; + color: #fff; margin-left: 4px; &.sort-status { diff --git a/core/core-frontend/src/views/chart/components/editor/drag-item/FilterItem.vue b/core/core-frontend/src/views/chart/components/editor/drag-item/FilterItem.vue index 4e33420..6e5fe78 100644 --- a/core/core-frontend/src/views/chart/components/editor/drag-item/FilterItem.vue +++ b/core/core-frontend/src/views/chart/components/editor/drag-item/FilterItem.vue @@ -201,7 +201,7 @@ span { white-space: nowrap; text-overflow: ellipsis; overflow: hidden; - color: #1f2329; + color: #fff; margin-left: 4px; } diff --git a/core/core-frontend/src/views/chart/components/editor/drag-item/QuotaItem.vue b/core/core-frontend/src/views/chart/components/editor/drag-item/QuotaItem.vue index 47575dc..5b473b2 100644 --- a/core/core-frontend/src/views/chart/components/editor/drag-item/QuotaItem.vue +++ b/core/core-frontend/src/views/chart/components/editor/drag-item/QuotaItem.vue @@ -951,7 +951,7 @@ span { .item-span-style { display: flex; max-width: 170px; - color: #1f2329; + color: #fff; margin-left: 4px; .item-name { diff --git a/core/core-frontend/src/views/chart/components/editor/filter/auth-tree-chart/AuthTree.vue b/core/core-frontend/src/views/chart/components/editor/filter/auth-tree-chart/AuthTree.vue index 13408f7..cc45f25 100644 --- a/core/core-frontend/src/views/chart/components/editor/filter/auth-tree-chart/AuthTree.vue +++ b/core/core-frontend/src/views/chart/components/editor/filter/auth-tree-chart/AuthTree.vue @@ -279,10 +279,12 @@ const del = (index, child) => { .ed-popper.is-light{ border:1px solid #434343; background: rgba(41, 41, 41, 1); + color: #ffffff ; } .ed-popper.is-light .ed-popper__arrow::before{ background:rgba(41, 41, 41, 1); border: 1px solid rgba(70, 70, 70, 1); + color: #ffffff ; } diff --git a/core/core-frontend/src/views/chart/components/editor/index.vue b/core/core-frontend/src/views/chart/components/editor/index.vue index 07392c5..f0cb7fa 100644 --- a/core/core-frontend/src/views/chart/components/editor/index.vue +++ b/core/core-frontend/src/views/chart/components/editor/index.vue @@ -4145,7 +4145,7 @@ const deleteChartFieldItem = id => { .editor-light { border-left: solid 1px @side-outline-border-color-light !important; color: @canvas-main-font-color-light!important; - background-color: @side-area-background-light!important; + // background-color: @side-area-background-light!important; :deep(.ed-tabs__header) { border-top: solid 1px @side-outline-border-color-light !important; } @@ -4172,18 +4172,18 @@ const deleteChartFieldItem = id => { background-color: @side-outline-border-color-light !important; } :deep(.item-span-style) { - color: @canvas-main-font-color-light!important; + color: #fff!important; } - :deep(.editor-title) { - color: #1f2329 !important; - } - :deep(.collapse-title) { - color: #1f2329 !important; - } - :deep(.collapse-icon) { - color: #646a73 !important; - } + // :deep(.editor-title) { + // color: #1f2329 !important; + // } + // :deep(.collapse-title) { + // color: #1f2329 !important; + // } + // :deep(.collapse-icon) { + // color: #646a73 !important; + // } .query-style-tab { width: 100%; border-top: solid 1px @side-outline-border-color-light !important; @@ -4564,6 +4564,7 @@ span { display: flex; flex-direction: row; align-items: center; + color: #fff; :deep(.required::after) { content: '*'; color: var(--ed-color-danger); @@ -4767,7 +4768,7 @@ span { justify-content: space-between; height: 40px; padding: 0 6px; - + color: #fff; .margin20-radio { margin-right: 20px; } diff --git a/core/core-frontend/src/viewsnew/application/permissionset/index.vue b/core/core-frontend/src/viewsnew/application/permissionset/index.vue index 3bb048c..8b1f4d7 100644 --- a/core/core-frontend/src/viewsnew/application/permissionset/index.vue +++ b/core/core-frontend/src/viewsnew/application/permissionset/index.vue @@ -218,9 +218,9 @@ function menuclick(name){ box-shadow:none; border: 1px solid #f54a45; } - :deep(.ed-pagination__total){ - color: #1f2329 !important; - } + // :deep(.ed-pagination__total){ + // color: #1f2329 !important; + // } :deep(.ed-checkbox__inner){ background-color: #ffffff !important; border:1px solid #bbbfc4 !important; diff --git a/core/core-frontend/src/viewsnew/application/service/dataset/form/AddSql.vue b/core/core-frontend/src/viewsnew/application/service/dataset/form/AddSql.vue index 5da3b7c..0832724 100644 --- a/core/core-frontend/src/viewsnew/application/service/dataset/form/AddSql.vue +++ b/core/core-frontend/src/viewsnew/application/service/dataset/form/AddSql.vue @@ -1750,6 +1750,7 @@ const mousedownDrag = () => { .ed-popper.is-light { border: 1px solid #434343; background: rgba(41, 41, 41, 1) !important; + color: #ffffff ; } .ed-tree-node__content:hover{ background-color: #434343;