Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(refactor/theme): change incorrect css variables to the common va… #1027

Merged
merged 4 commits into from
Jan 16, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions packages/common/component/BlockLinkEvent.vue
Original file line number Diff line number Diff line change
Expand Up @@ -198,22 +198,22 @@ export default {
padding: 3px 0;
border: 1px solid var(--ti-lowcode-tabs-border-color);
border-radius: 3px;
background-color: var(--ti-lowcode-toolbar-view-hover-bg);
background-color: var(--te-common-bg-container);
box-shadow: 0 1px 15px 0 rgb(0 0 0 / 20%);
display: flex;
flex-direction: column;
.menu-item {
font-size: 12px;
display: flex;
justify-content: space-between;
color: var(--ti-lowcode-toolbar-breadcrumb-color);
color: var(--te-common-text-secondary);
padding: 6px 15px;
&:not(:last-child) {
border-bottom: 1px solid var(--ti-lowcode-tabs-border-color);
}
&:hover {
color: var(--ti-lowcode-toolbar-icon-color);
background: var(--ti-lowcode-canvas-wrap-bg);
background: var(--te-common-bg-container);
}

.link-item {
Expand Down
4 changes: 2 additions & 2 deletions packages/common/component/ConfigCollapse.vue
Original file line number Diff line number Diff line change
Expand Up @@ -40,10 +40,10 @@ export default {
transition: 0.3s;

&:hover {
color: var(--ti-lowcode-toolbar-icon-color);
color: var(--te-common-icon-primary);

svg {
color: var(--ti-lowcode-toolbar-icon-color);
color: var(--te-common-icon-primary);
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion packages/common/component/ConfigItem.vue
Original file line number Diff line number Diff line change
Expand Up @@ -678,7 +678,7 @@ export default {
display: flex;
align-items: center;
margin-top: 8px;
color: var(--ti-lowcode-common-error-color);
color: var(--te-common-color-error);
font-size: 12px;
.failure-icon {
width: 16px;
Expand Down
10 changes: 5 additions & 5 deletions packages/common/component/EmptyTip.vue
Original file line number Diff line number Diff line change
Expand Up @@ -33,12 +33,12 @@ export default {
<style scoped lang="less">
.tip {
display: flex;
border: 1px solid var(--ti-lowcode-toolbar-border-color);
border-left: 2px solid var(--ti-lowcode-success-border-color);
border: 1px solid var(--te-common-border-default);
border-left: 2px solid var(--te-common-color-success);
border-radius: 0 4px 4px 0;
align-items: center;
padding: 8px 12px;
background-color: var(--ti-lowcode-toolbar-view-hover-bg);
background-color: var(--te-common-bg-container);

.left {
width: 20px;
Expand All @@ -52,9 +52,9 @@ export default {
}
}
.waring {
border-left: 2px solid var(--ti-lowcode-description-warning-color);
border-left: 2px solid var(--te-common-color-warning);
}
.error {
border-left: 2px solid var(--ti-lowcode-description-error-color);
border-left: 2px solid var(--te-common-color-error);
}
</style>
2 changes: 1 addition & 1 deletion packages/common/component/MetaCodeEditor.vue
Original file line number Diff line number Diff line change
Expand Up @@ -325,7 +325,7 @@ export default {
margin-left: 4px;
flex-shrink: 0;
cursor: pointer;
color: var(--ti-lowcode-common-text-main-color);
color: var(--te-common-text-secondary);
}
}

Expand Down
20 changes: 10 additions & 10 deletions packages/common/component/MetaDescription.vue
Original file line number Diff line number Diff line change
Expand Up @@ -92,34 +92,34 @@ export default {
padding-block: 4px;
padding-inline: 11px 8px;
width: auto;
color: var(--ti-lowcode-toolbar-breadcrumb-color);
background-color: var(--ti-lowcode-toolbar-view-hover-bg);
color: var(--te-common-text-secondary);
background-color: var(--te-common-bg-container);
box-shadow: 0px 0px 6px 2px rgba(0, 0, 0, 0.3);
&.warning {
color: var(--ti-lowcode-description-warning-color);
color: var(--te-common-color-warning);
}
&.error {
color: var(--ti-lowcode-description-error-color);
color: var(--te-common-color-error);
}

&.border {
border-top: 1px solid var(--ti-lowcode-collapse-active-border-color);
border-right: 1px solid var(--ti-lowcode-collapse-active-border-color);
border-bottom: 1px solid var(--ti-lowcode-collapse-active-border-color);
border-top: 1px solid var(--te-common-border-default);
border-right: 1px solid var(--te-common-border-default);
border-bottom: 1px solid var(--te-common-border-default);
}
.content {
color: var(--ti-lowcode-toolbar-breadcrumb-color);
color: var(--te-common-text-secondary);
}
.footer {
display: flex;
justify-content: space-between;
align-items: center;
color: var(--ti-lowcode-toolbar-breadcrumb-color);
color: var(--te-common-text-secondary);
.footer-text {
cursor: pointer;
&.link {
display: block;
color: var(--ti-lowcode-text-link-color);
color: var(--te-common-text-link);
&:hover {
text-decoration: underline;
}
Expand Down
2 changes: 1 addition & 1 deletion packages/common/component/MetaListActions.vue
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ export default {
.actionsItem {
display: inline-block;
padding: 5px 5px;
background-color: var(--ti-lowcode-canvas-wrap-bg);
background-color: var(--te-common-bg-container);
&:not(:last-child) {
border-right: 1px solid var(--ti-lowcode-optionitem-border-color);
}
Expand Down
4 changes: 2 additions & 2 deletions packages/common/component/MetaListItem.vue
Original file line number Diff line number Diff line change
Expand Up @@ -249,7 +249,7 @@ export default {
border-right: none;
background: var(--ti-lowcode-meta-list-item-bg-color);
margin-bottom: -1px;
color: var(--ti-lowcode-toolbar-breadcrumb-color);
color: var(--te-common-text-primary);
&.active-item {
background-color: var(--te-common-bg-container);
}
Expand All @@ -264,7 +264,7 @@ export default {
margin-right: 5px;
font-size: 12px;
opacity: 0.4;
color: var(--ti-lowcode-toolbar-breadcrumb-color);
color: var(--te-common-text-primary);
&:hover {
cursor: pointer;
opacity: 1;
Expand Down
2 changes: 1 addition & 1 deletion packages/common/component/MetaModal.vue
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ export default {

.modal-content {
padding: 8px;
color: var(--ti-lowcode-toolbar-breadcrumb-color);
color: var(--te-common-text-secondary);
border: 1px solid var(--ti-lowcode-tabs-border-color);
border-radius: 4px;
background-color: var(--ti-lowcode-toolbar-bg);
Expand Down
2 changes: 1 addition & 1 deletion packages/common/component/MetaModalItem.vue
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ export default {
justify-content: space-between;
align-items: center;
padding: 10px 0;
color: var(--ti-lowcode-toolbar-breadcrumb-color);
color: var(--te-common-text-secondary);

.header-title {
font-size: 14px;
Expand Down
2 changes: 1 addition & 1 deletion packages/common/component/MonacoEditor.vue
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ export default {
right: var(--base-right-panel-width);
z-index: 100;
padding: 10px 16px 16px 16px;
background-color: var(--ti-lowcode-common-component-bg);
background-color: var(--te-common-bg-default);
height: auto !important;
}

Expand Down
6 changes: 3 additions & 3 deletions packages/common/component/PluginBlockList.vue
Original file line number Diff line number Diff line change
Expand Up @@ -437,7 +437,7 @@ export default {
gap: 12px;
overflow-y: auto;
overflow-x: hidden;
color: var(--ti-lowcode-common-secondary-text-color);
color: var(--te-common-text-secondary);

.block-item {
display: flex;
Expand Down Expand Up @@ -519,7 +519,7 @@ export default {
}

&.is-active {
background: var(--ti-lowcode-component-block-list-item-active-bg, --ti-lowcode-canvas-wrap-bg);
background: var(--ti-lowcode-component-block-list-item-active-bg);
}

&.is-disabled {
Expand Down Expand Up @@ -601,7 +601,7 @@ export default {
}

.block-detail-icon {
color: var(--ti-lowcode-base-gray-50);
color: var(--te-common-icon-secondary);
&:hover {
cursor: pointer;
color: var(--ti-lowcode-component-block-list-setting-btn-hover-color);
Expand Down
2 changes: 1 addition & 1 deletion packages/common/component/PluginSetting.vue
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ export default {
top: 0;
width: var(--base-collection-panel-width);
height: 100%;
border-right: 1px solid var(--ti-lowcode-toolbar-border-color);
border-right: 1px solid var(--te-common-border-default);
background: var(--ti-lowcode-plugin-setting-panel-bg, --ti-lowcode-toolbar-bg);
overflow: hidden;
border-left: 1px solid var(--ti-lowcode-plugin-panel-header-border-bottom-color);
Expand Down
2 changes: 1 addition & 1 deletion packages/common/component/ToolbarBase.vue
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ export default {
</script>
<style scoped>
.split-line {
color: var(--ti-lowcode-toolbar-border-color);
color: var(--te-common-border-default);
margin: 0 4px;
font-size: 14px;
}
Expand Down
2 changes: 1 addition & 1 deletion packages/common/component/VideoGuide.vue
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ export default {

<style lang="less" scoped>
.block-guide {
color: var(--ti-lowcode-toolbar-breadcrumb-color);
color: var(--te-common-text-secondary);
line-height: 2;
border: none;
border-color: var(--ti-lowcode-block-video-tip-color);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -176,17 +176,17 @@ const change = (item) => {
color: var(--te-common-text-weaken);

&:hover {
background-color: var(--ti-lowcode-base-gray-101);
color: var(--te-common-text-primary);
background-color: var(--te-common-bg-prompt);
color: var(--te-common-text-secondary);
border-radius: 4px;
.svg-icon {
color: var(--te-common-text-primary);
}
}

&.selected {
background-color: var(--ti-lowcode-base-gray-101);
color: var(--te-common-text-primary);
background-color: var(--te-common-bg-prompt);
color: var(--te-common-text-secondary);
border-radius: 4px;
.svg-icon {
color: var(--te-common-text-primary);
Expand Down
2 changes: 1 addition & 1 deletion packages/design-core/src/preview/src/Toolbar.vue
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ export default {
width: 100%;
height: var(--base-top-panel-height);
text-align: center;
background-color: var(--ti-lowcode-common-layout-bg);
background-color: var(--te-common-bg-default);
position: relative;
z-index: 1001;
border-bottom: 1px solid var(--ti-lowcode-toolbar-border-bottom-color);
Expand Down
6 changes: 3 additions & 3 deletions packages/layout/src/DesignPlugins.vue
Original file line number Diff line number Diff line change
Expand Up @@ -201,7 +201,7 @@ export default {
width: var(--base-left-panel-width);
height: calc(100vh - var(--base-top-panel-height));
border-right: 1px solid var(--ti-lowcode-plugin-panel-border-right-color);
background: var(--ti-lowcode-common-component-bg);
background: var(--te-common-bg-default);
display: flex;
flex-direction: column;
position: absolute;
Expand Down Expand Up @@ -239,7 +239,7 @@ export default {
display: flex;
flex-direction: column;
justify-content: space-between;
background: var(--ti-lowcode-common-layout-bg);
background: var(--te-common-bg-default);
box-sizing: border-box;
z-index: 1000;
border-right: 1px solid var(--ti-lowcode-plugin-panel-border-right-color);
Expand Down Expand Up @@ -285,7 +285,7 @@ export default {
position: relative;

.item-icon {
color: var(--ti-lowcode-common-primary-color);
color: var(--te-common-text-checked);
}
}

Expand Down
4 changes: 2 additions & 2 deletions packages/layout/src/DesignToolbars.vue
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ export default {
width: 100%;
height: var(--base-top-panel-height);
text-align: center;
background-color: var(--ti-lowcode-common-layout-bg);
background-color: var(--te-common-bg-default);
position: relative;
z-index: 1001;
border-bottom: 1px solid var(--ti-lowcode-toolbar-border-bottom-color);
Expand Down Expand Up @@ -137,7 +137,7 @@ export default {
background: var(--ti-lowcode-toolbar-view-active-bg);
}
&.active {
color: var(--ti-lowcode-common-primary-color);
color: var(--te-common-text-checked);
}
&.disabled {
cursor: not-allowed;
Expand Down
2 changes: 1 addition & 1 deletion packages/layout/src/ToolbarCollapse.vue
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ export default {

.empty-line {
margin: 4px 0px;
border-top: 1px solid var(--ti-lowcode-canvas-wrap-bg);
border-top: 1px solid var(--te-common-bg-container);
}

.icon-hides {
Expand Down
2 changes: 1 addition & 1 deletion packages/plugins/block/src/BlockConfig.vue
Original file line number Diff line number Diff line change
Expand Up @@ -321,7 +321,7 @@ export default {
line-height: 20px;
padding-top: 0;
padding-bottom: 0;
border: 1px solid var(--ti-lowcode-base-default-button-border-disable-color);
border: 1px solid var(--te-common-border-default);
}

.tiny-input {
Expand Down
2 changes: 1 addition & 1 deletion packages/plugins/block/src/BlockEventList.vue
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ export default {
}
.add-button {
:deep(.tiny-button) {
border: 1px solid var(--ti-lowcode-base-default-button-border-disable-color);
border: 1px solid var(--te-common-border-default);
}
.icon-plus {
margin-right: 6px;
Expand Down
6 changes: 3 additions & 3 deletions packages/plugins/block/src/BlockPropertyForm.vue
Original file line number Diff line number Diff line change
Expand Up @@ -270,7 +270,7 @@ export default {
display: inline-block;
margin-top: 6px;
font-size: 12px;
color: var(--ti-lowcode-common-primary-color);
color: var(--te-common-text-checked);
cursor: pointer;

.text {
Expand All @@ -296,8 +296,8 @@ export default {
width: 280px;
height: 100%;
padding: 20px;
background-color: var(--ti-lowcode-common-component-bg);
border-right: 1px solid var(--ti-lowcode-toolbar-border-color);
background-color: var(--te-common-bg-default);
border-right: 1px solid var(--te-common-border-default);
}

.config-list {
Expand Down
2 changes: 1 addition & 1 deletion packages/plugins/block/src/BlockPropertyList.vue
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ export default {
padding: 0 12px;
width: 66px;
margin-right: 5px;
border: 1px solid var(--ti-lowcode-base-default-button-border-disable-color);
border: 1px solid var(--te-common-border-default);
}
.plus-icon {
width: 16px;
Expand Down
8 changes: 4 additions & 4 deletions packages/plugins/block/src/Main.vue
Original file line number Diff line number Diff line change
Expand Up @@ -507,9 +507,9 @@ export default {
left: -6px;
right: 0;
padding: 8px 16px;
background-color: var(--ti-lowcode-component-search-bg);
border-top: 1px solid var(--te-common-border-divider);
color: var(--ti-lowcode-component-block-list-item-color);
background-color: var(--te-common-bg-default);
color: var(--te-common-text-primary);
display: flex;
justify-content: space-between;
:deep(.tiny-dropdown) {
Expand All @@ -527,7 +527,7 @@ export default {
}
.footer-layout {
font-size: 12px;
color: var(--ti-lowcode-component-block-list-item-color);
color: var(--te-common-text-primary);
.tiny-svg {
cursor: pointer;
margin-left: 8px;
Expand Down Expand Up @@ -570,7 +570,7 @@ export default {
.popper__arrow {
&,
&::after {
border-right-color: var(--ti-lowcode-common-component-hover-bg);
border-right-color: var(--te-common-bg-container);
}
}
}
Expand Down
Loading
Loading