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

fix(theme-base): update theme-base package and add common file #650

Closed
wants to merge 19 commits into from
Closed

fix(theme-base): update theme-base package and add common file #650

Show file tree
Hide file tree
Changes from 14 commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
d6763c6
feat: add package of opentiny/tiny-engine-theme-base
James-9696 Jul 3, 2024
0d43dcb
feat(theme-base): add common style
James-9696 Jul 9, 2024
95e22e8
fix: resolve code conflict
James-9696 Jul 10, 2024
edbd0da
fix: update theme-base common
James-9696 Jul 11, 2024
15846a6
update theme-base file
James-9696 Jul 15, 2024
e747cd9
delete invalid code
James-9696 Jul 15, 2024
371c89c
fix: engine component light color theme variable replacement
James-9696 Jul 18, 2024
5ee33e4
fix: engine component dark color theme variable replacement
James-9696 Jul 22, 2024
fb5cb5c
fix: update light variable
James-9696 Jul 22, 2024
4aefa76
Merge branch 'refactor/develop' into feat-tiny-theme-develop
James-9696 Jul 24, 2024
fda7c56
fix: update tree component variable
James-9696 Jul 24, 2024
3a8524e
fix: update comment and format
James-9696 Jul 25, 2024
698e505
update theme-base package
James-9696 Jul 26, 2024
6d25ea4
fix(theme-base): update theme-base package file
James-9696 Aug 1, 2024
5527b43
fix: modify theme-base
James-9696 Aug 23, 2024
ec507c3
fix: modify theme-base
James-9696 Aug 23, 2024
54e6842
fix: modify code of conflict
James-9696 Aug 26, 2024
5f2785b
Merge remote-tracking branch 'origin/refactor/develop' into feat-tiny…
James-9696 Sep 2, 2024
52b4b8a
fix: resolve conflict of code
James-9696 Sep 24, 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
10 changes: 5 additions & 5 deletions packages/common/component/CloseIcon.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ export default {
.icon-wrap {
width: 24px;
height: 24px;
color: var(--ti-lowcode-component-svg-button-color);
color: var(--ti-lowcode-common-svg-button-color);
font-size: 16px;
border-radius: 4px;
cursor: pointer;
Expand All @@ -39,12 +39,12 @@ export default {
transition: 0.3s;

&:hover {
color: var(--ti-lowcode-component-svg-button-hover-color);
background-color: var(--ti-lowcode-component-svg-button-hover-bg-color);
color: var(--ti-lowcode-common-svg-button-hover-color);
background-color: var(--ti-lowcode-common-svg-button-hover-bg-color);
}
&.active {
color: var(--ti-lowcode-component-svg-button-active-color);
background-color: var(--ti-lowcode-component-svg-button-active-bg-color);
color: var(--ti-lowcode-common-svg-button-active-color);
background-color: var(--ti-lowcode-common-svg-button-active-bg-color);
}
}
</style>
4 changes: 2 additions & 2 deletions packages/common/component/MonacoEditor.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,10 +152,10 @@ export default {
.buttons {
display: flex;
gap: 8px;
color: var(--ti-lowcode-component-svg-button-color);
color: var(--ti-lowcode-common-svg-button-color);
cursor: pointer;
:hover {
color: var(--ti-lowcode-component-svg-button-hover-color);
color: var(--ti-lowcode-common-svg-button-hover-color);
}
}
}
Expand Down
4 changes: 2 additions & 2 deletions packages/common/component/PluginBlockList.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -506,12 +506,12 @@ export default {
align-items: center;
.tiny-svg {
font-size: 24px;
color: var(--ti-lowcode-component-svg-button-color);
color: var(--ti-lowcode-common-svg-button-color);
}

&:hover {
cursor: pointer;
color: var(--ti-lowcode-component-svg-button-hover-color);
color: var(--ti-lowcode-common-svg-button-hover-color);
}
}

Expand Down
10 changes: 5 additions & 5 deletions packages/common/component/SvgButton.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,20 +45,20 @@ export default {
width: 24px;
height: 24px;
font-size: 16px;
color: var(--ti-lowcode-component-svg-button-color);
color: var(--ti-lowcode-common-svg-button-color);
border: 1px solid transparent;
border-radius: 4px;
display: inline-flex;
justify-content: center;
align-items: center;
cursor: pointer;
&:hover {
color: var(--ti-lowcode-component-svg-button-hover-color);
background-color: var(--ti-lowcode-component-svg-button-hover-bg-color);
color: var(--ti-lowcode-common-svg-button-hover-color);
background-color: var(--ti-lowcode-common-svg-button-hover-bg-color);
}
&.active {
color: var(--ti-lowcode-component-svg-button-active-color);
background-color: var(--ti-lowcode-component-svg-button-active-bg-color);
color: var(--ti-lowcode-common-svg-button-active-color);
background-color: var(--ti-lowcode-common-svg-button-active-bg-color);
}

& + .svg-button {
Expand Down
5 changes: 3 additions & 2 deletions packages/design-core/src/init.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,8 @@ import { initMonitor } from '@opentiny/tiny-engine-common/js/monitor'
import { injectGlobalComponents, setGlobalMonacoEditorTheme, Modal, Notify } from '@opentiny/tiny-engine-common'
import { initHttp } from '@opentiny/tiny-engine-http'
import TinyThemeTool from '@opentiny/vue-theme/theme-tool'
import { tinyEngineThemeLight } from '@opentiny/tiny-engine-theme-base'
import { tinyThemeLightVars } from '@opentiny/tiny-engine-theme-base'

import {
defineEntry,
mergeRegistry,
Expand Down Expand Up @@ -52,7 +53,7 @@ const defaultLifeCycles = {
initHttp({ env: import.meta.env })

// eslint-disable-next-line no-new
new TinyThemeTool(tinyEngineThemeLight, 'tinyEngineTheme') // 初始化主题
new TinyThemeTool(tinyThemeLightVars, 'tinyThemeLightVars')

if (import.meta.env.VITE_ERROR_MONITOR === 'true' && import.meta.env.VITE_ERROR_MONITOR_URL) {
initMonitor(import.meta.env.VITE_ERROR_MONITOR_URL)
Expand Down
2 changes: 1 addition & 1 deletion packages/layout/src/Main.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ export default {
#tiny-engine {
display: flex;
flex-flow: column;
min-width: var(--base-min-width);
min-width: var(--ti-common-min-width);
height: 100vh;
overflow: hidden;
.tiny-engine-main {
Expand Down
4 changes: 2 additions & 2 deletions packages/plugins/block/src/Main.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -467,7 +467,7 @@ export default {
left: -6px;
right: 0;
padding: 10px 16px;
background-color: var(--ti-lowcode-component-search-bg);
background-color: var(--ti-lowcode-common-search-bg);
color: var(--ti-lowcode-component-block-list-item-color);
display: flex;
justify-content: space-between;
Expand Down Expand Up @@ -519,7 +519,7 @@ export default {
font-size: 12px;
color: var(--ti-lowcode-materials-block-group-delete-popover-title-color);
.icon {
color: var(--ti-lowcode-warning-color);
color: var(--ti-lowcode-common-warning-color);
width: 16px;
height: 16px;
}
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,9 +186,9 @@ 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
2 changes: 1 addition & 1 deletion packages/plugins/datasource/src/DataSourceRecordList.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -650,7 +650,7 @@ export default {
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/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 Down
2 changes: 1 addition & 1 deletion packages/plugins/i18n/src/Main.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -585,7 +585,7 @@ export default {
padding: 20px;
svg {
font-size: 20px;
color: var(--ti-lowcode-warning-color);
color: var(--ti-lowcode-common-warning-color);
}
.delete-tip {
margin-left: 5px;
Expand Down
4 changes: 2 additions & 2 deletions packages/plugins/materials/src/meta/block/src/BlockGroup.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -458,7 +458,7 @@ export default {
margin-left: 0;
}
:deep(svg) {
color: var(--ti-lowcode-component-svg-button-color);
color: var(--ti-lowcode-common-svg-button-color);
}
}
&.show-underline {
Expand Down Expand Up @@ -512,7 +512,7 @@ export default {
font-size: 12px;
color: var(--ti-lowcode-materials-block-group-delete-popover-title-color);
.icon {
color: var(--ti-lowcode-warning-color);
color: var(--ti-lowcode-common-warning-color);
width: 16px;
height: 16px;
}
Expand Down
2 changes: 1 addition & 1 deletion packages/plugins/script/src/Main.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ export default {
.dots {
width: 10px;
height: 10px;
background: var(--ti-lowcode-warning-color-1);
background: var(--ti-lowcode-common-warning-color-1);
border-radius: 50%;
position: absolute;
top: -4px;
Expand Down
Loading