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.

Sign up for GitHub

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

Open feat(theme/datasource&setting): change datasource and setting panel theme variable #928

Merged
merged 3 commits into from
Dec 13, 2024
Merged

Open feat(theme/datasource&setting): change datasource and setting panel theme variable #928

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
91a3c5b
feat(theme/datasource&setting): change datasource and setting panel t…
wenmine Dec 6, 2024
e8e6cf5
feat(theme/datasource&setting): change datasource style
wenmine Dec 6, 2024
cfa156d
feat(theme/datasource&setting): change datasource and setting panel t…
wenmine Dec 6, 2024
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
2 changes: 1 addition & 1 deletion packages/configurator/src/code-list-configurator/CodeListConfigurator.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -220,7 +220,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
6 changes: 3 additions & 3 deletions packages/configurator/src/html-attributes-configurator/HtmlAttributesConfigurator.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,8 +195,8 @@ export default {
width: 24px;
height: 24px;
font-size: 16px;
color: var(--ti-lowcode-toolbar-breadcrumb-color);
background: var(--ti-lowcode-canvas-wrap-bg);
color: var(--te-common-text-secondary);
background: var(--te-common-bg-container);
border: 1px solid var(--ti-lowcode-left-button-border-color);
border-radius: 2px;
display: inline-flex;
Expand All @@ -223,7 +223,7 @@ export default {
border: 1px solid var(--ti-lowcode-optionitem-border-color);
background: var(--ti-lowcode-optionitem-background-color);
margin-bottom: -1px;
color: var(--ti-lowcode-toolbar-breadcrumb-color);
color: var(--te-common-text-secondary);
padding: 7px;
display: grid;
grid-template-columns: 3fr auto;
Expand Down
2 changes: 1 addition & 1 deletion packages/configurator/src/input-configurator/InputConfigurator.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ export default {
font-size: 16px;
&:hover {
cursor: pointer;
color: var(--ti-lowcode-dialog-font-color);
color: var(--te-common-text-primary);
}
}
</style>
10 changes: 5 additions & 5 deletions packages/configurator/src/layout-grid-configurator/LayoutGridConfigurator.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -268,7 +268,7 @@ export default {
box-sizing: border-box;
width: 48px;
border: 1px solid var(--ti-lowcode-tabs-border-color);
background: var(--ti-lowcode-canvas-wrap-bg);
background: var(--te-common-bg-container);
border-radius: 4px;
padding: 4px;
margin: 0 4px 4px 4px;
Expand Down Expand Up @@ -313,13 +313,13 @@ export default {
justify-content: center;
align-items: center;
display: flex;
background: var(--ti-lowcode-canvas-wrap-bg);
color: var(--ti-lowcode-toolbar-breadcrumb-color);
background: var(--te-common-bg-container);
color: var(--te-common-text-secondary);
transition: none;
}

:deep(.splitpanes__splitter) {
background: var(--ti-lowcode-toolbar-view-hover-bg);
background: var(--te-common-bg-container);
border-left: var(--ti-lowcode-tabs-border-color);
}

Expand All @@ -328,7 +328,7 @@ export default {

.customize {
margin-bottom: 8px;
color: var(--ti-lowcode-toolbar-breadcrumb-color);
color: var(--te-common-text-secondary);
}
}
}
Expand Down
6 changes: 3 additions & 3 deletions packages/configurator/src/select-icon-configurator/SelectIconConfigurator.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,15 +107,15 @@ export default {
padding-right: 20px;
width: 136px;
cursor: pointer;
background: var(--ti-lowcode-tabs-bg);
color: var(--ti-lowcode-toolbar-breadcrumb-color);
background: var(--te-common-bg-prompt);
color: var(--te-common-text-secondary);
border: 1px solid var(--ti-lowcode-tabs-active-bg);
border-radius: 3px;
.icon-box {
border-right: 1px solid var(--ti-lowcode-tabs-active-bg);
padding: 4px 8px;
.tiny-svg {
color: var(--ti-lowcode-toolbar-breadcrumb-color);
color: var(--te-common-text-secondary);
font-size: 14px;
}
}
Expand Down
6 changes: 3 additions & 3 deletions packages/configurator/src/slider-configurator/SliderConfigurator.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,22 +95,22 @@ export default {
height: 3px;
width: 100%;
border-radius: 2px;
background-color: var(--ti-lowcode-canvas-wrap-bg);
background-color: var(--te-common-bg-container);
.tiny-slider__handle {
width: 10px;
height: 10px;
margin: -4px -5px 0 -5px;
border-radius: 50%;
border: none;
cursor: ew-resize;
background-color: var(--ti-lowcode-toolbar-breadcrumb-color);
background-color: var(--te-common-text-secondary);
box-shadow: rgba(0, 0, 0, 0) 0px 0px 0px 1px, rgba(0, 0, 0, 0.3) 0px 0px 0px 0.5px;
}
.tiny-slider__range {
height: 3px;
border-radius: 3px;
margin-top: 0;
background: var(--ti-lowcode-canvas-wrap-bg);
background: var(--te-common-bg-container);
}

.tiny-slider__tips {
Expand Down
2 changes: 1 addition & 1 deletion packages/configurator/src/slot-configurator/SlotConfigurator.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ export default {
}
.slot-name {
width: 30%;
color: var(--ti-lowcode-dialog-font-color);
color: var(--te-common-text-primary);
font-size: 12px;
display: flex;
justify-content: space-between;
Expand Down
2 changes: 1 addition & 1 deletion packages/engine-cli/template/designer/src/configurators/MyInputConfigurator.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ export default {
font-size: 16px;
&:hover {
cursor: pointer;
color: var(--ti-lowcode-dialog-font-color);
color: var(--te-common-text-primary);
}
}
</style>
2 changes: 1 addition & 1 deletion packages/plugins/bridge/src/BridgeSetting.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -316,7 +316,7 @@ export default {
.title-wrap {
font-size: 12px;
font-weight: 700;
color: var(--ti-lowcode-data-source-color);
color: var(--te-common-text-primary);
.help-link {
display: inline-block;
color: var(--ti-lowcode-common-primary-color);
Expand Down
4 changes: 2 additions & 2 deletions packages/plugins/datasource/src/DataSourceField.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,10 +186,10 @@ export default {
align-items: center;

&.field-row-add {
color: var(--ti-lowcode-datasource-json-border-colorr);
color: var(--ti-lowcode-datasource-json-border-color);

svg {
color: var(--ti-lowcode-datasource-json-border-colorr);
color: var(--ti-lowcode-datasource-json-border-color);
}
}
}
Expand Down
8 changes: 4 additions & 4 deletions packages/plugins/datasource/src/DataSourceFieldForm.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,7 @@ export default {

<style lang="less" scoped>
.step-select-second {
border: 1px solid var(--ti-lowcode-data-source-border-color);
border: 1px solid var(--ti-lowcode-datasource-border-color);
border-radius: 4px;
padding: 12px;
margin-bottom: 16px;
Expand All @@ -193,7 +193,7 @@ export default {
padding: 0;
min-width: 40px;
margin-right: 2px;
border: 1px solid var(--ti-lowcode-data-source-color);
border: 1px solid var(--ti-lowcode-datasource-color);
}
}

Expand Down Expand Up @@ -224,7 +224,7 @@ export default {
height: 24px;
padding: 0;
border: none;
border-top: 1px solid var(--ti-lowcode-data-source-border-color);
border-top: 1px solid var(--ti-lowcode-datasource-border-color);
margin-bottom: 0;
border-radius: 0;
.field-row {
Expand All @@ -237,6 +237,6 @@ export default {
}

#default-item:last-child {
border-bottom: 1px solid var(--ti-lowcode-data-source-border-color);
border-bottom: 1px solid var(--ti-lowcode-datasource-border-color);
}
</style>
4 changes: 2 additions & 2 deletions packages/plugins/datasource/src/DataSourceFieldList.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ export default {
.field-cell-name {
margin-left: 5px;
.field-name {
color: var(--ti-lowcode-data-source-color);
color: var(--ti-lowcode-datasource-color);
}
.description {
color: var(--ti-lowcode-datasource-tip-color);
Expand All @@ -159,7 +159,7 @@ export default {
}
}
.form-item-border:hover {
background: var(--ti-lowcode-data-source-box-bg);
background: var(--ti-lowcode-datasource-box-bg);
.field-operation {
display: flex;
justify-content: space-between;
Expand Down
6 changes: 3 additions & 3 deletions packages/plugins/datasource/src/DataSourceFieldType.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ export default {

<style lang="less" scoped>
.step-select-first {
border: 1px solid var(--ti-lowcode-data-source-border-color);
border: 1px solid var(--ti-lowcode-datasource-border-color);
border-radius: 4px;
padding: 12px;
margin-bottom: 46px;
Expand Down Expand Up @@ -104,7 +104,7 @@ export default {
}
}
.btn {
color: var(--ti-lowcode-data-source-color);
color: var(--ti-lowcode-datasource-color);
font-size: 12px;
cursor: pointer;
}
Expand All @@ -123,7 +123,7 @@ export default {
justify-content: space-between;
flex-direction: column;
cursor: pointer;
background-color: var(--ti-lowcode-data-source-box-bg);
background-color: var(--ti-lowcode-datasource-box-bg);
border-radius: 4px;
color: var(--ti-lowcode-datasource-dialog-font-color);
.type-icon {
Expand Down
7 changes: 5 additions & 2 deletions packages/plugins/datasource/src/DataSourceList.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ export default {
.datasource-list {
flex-grow: 1;
padding-top: 12px;
border-top: 1px solid var(--ti-lowcode-data-source-border-color);
border-top: 1px solid var(--ti-lowcode-datasource-border-color);
}
.datasource-list-item {
box-shadow: var(--ti-lowcode-datasource-tabs-border-color) 0, -1px;
Expand All @@ -152,7 +152,7 @@ export default {
display: flex;
align-items: center;
justify-content: space-between;
color: var(--ti-lowcode-base-gray-90);
color: var(--te-common-text-primary);
.item-name {
display: flex;
align-items: center;
Expand All @@ -171,6 +171,9 @@ export default {
height: 16px;
margin-top: 6px;
color: var(--ti-lowcode-datasource-toolbar-more-hover-color);
&:hover {
color: var(--ti-lowcode-toolbar-icon-color);
}
}
}
}
Expand Down
5 changes: 2 additions & 3 deletions packages/plugins/datasource/src/DataSourceRecordList.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -615,7 +615,7 @@ export default {
font-size: 12px;
text-align: left;
padding: 0;
color: var(--ti-lowcode-base-text-color);
color: var(--te-common-text-primary);
.icon-download {
margin: 0 1px 4px 0;
font-size: 16px;
Expand All @@ -631,10 +631,9 @@ export default {
.empty-icon {
width: 50px;
height: 50px;
color: var(--ti-lowcode-datasource-common-empty-color);
}
.add-column {
color: var(--ti-lowcode-datasource-json-border-colorr);
color: var(--ti-lowcode-datasource-json-border-color);
cursor: pointer;
}
}
Expand Down
2 changes: 1 addition & 1 deletion packages/plugins/datasource/src/DataSourceRemoteAutoload.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ export default {
margin-top: -10px;

.use-service {
color: var(--ti-lowcode-data-source-color);
color: var(--ti-lowcode-datasource-color);
font-size: 12px;
margin-top: 2px;
padding-left: 8px;
Expand Down
2 changes: 1 addition & 1 deletion packages/plugins/datasource/src/DataSourceRemoteDataResult.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ export default {
.monaco-editor {
height: 120px;
margin-top: 8px;
border: 1px solid var(--ti-lowcode-base-gray-101);
border: 1px solid var(--te-common-border-divider);
border-radius: 4px;
}
}
Expand Down
15 changes: 0 additions & 15 deletions packages/plugins/datasource/src/DataSourceRemoteForm.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,18 +100,6 @@ export default {
width: 100px;
border: none;
}
:deep(.tiny-input-group__prepend) {
background: var(--ti-lowcode-datasource-respones-select-color-bg);
border-color: var(--ti-lowcode-datasource-select-border-color);
.tiny-input-suffix {
.tiny-input-display-only {
.tiny-input__inner {
border-color: var(--ti-lowcode-datasource-select-border-right-color-bg);
border-left: none;
}
}
}
}
:deep(.tiny-input-suffix) {
width: 100px;
.tiny-input__inner {
Expand All @@ -123,9 +111,6 @@ export default {
border: none;
background: var(--ti-lowcode-datasource-respones-color-bg);
}
.requestBtn {
color: var(--ti-lowcode-datasource-respones-border-color-bg);
}
:deep(.border-input) {
input {
border-radius: 0;
Expand Down
13 changes: 0 additions & 13 deletions packages/plugins/datasource/src/DataSourceRemotePanel.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -305,19 +305,6 @@ export default {
:deep(.tiny-tabs__content) {
margin: 12px 0;
}
:deep(.is-active) {
.tiny-tabs__item__title {
color: var(--ti-lowcode-datasource-tabs-bottom-border-color);
}
}
:deep(.tiny-tabs__item__title) {
font-size: 14px;
}
}
:deep(.tiny-tabs__item__title) {
margin-right: 20px;
margin-left: 15px;
color: var(--ti-lowcode-datasource-label-color);
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion packages/plugins/datasource/src/DataSourceRemoteParameter.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ export default {
.monaco-editor {
height: 180px;
margin-top: 8px;
border: 1px solid var(--ti-lowcode-base-gray-101);
border: 1px solid var(--te-common-border-divider);
border-radius: 4px;
}
</style>
4 changes: 2 additions & 2 deletions packages/plugins/datasource/src/DataSourceTemplate.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ export default {
}
}
.blue::before {
border: 1px solid var(--ti-lowcode-datasource-json-border-colorr);
border: 1px solid var(--ti-lowcode-datasource-json-border-color);
}

.green::before {
Expand All @@ -105,7 +105,7 @@ export default {
.tiny-button {
color: var(--ti-lowcode-datasource-toolbar-breadcrumb-color);
&.tiny-button--primary {
border-color: var(--ti-lowcode-datasource-common-primary-color);
border-color: var(--ti-lowcode-datasource-common-border-primary-color);
}

&.tiny-button--success {
Expand Down
2 changes: 1 addition & 1 deletion packages/plugins/datasource/src/DataSourceType.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ export default {
&.is-checked {
color: var(--ti-lowcode-datasource-toolbar-breadcrumb-color);
.svg-icon {
color: var(--ti-lowcode-datasource-common-primary-color);
color: var(--ti-lowcode-datasource-common-border-primary-color);
}
}
.svg-icon {
Expand Down
Loading
Loading