Skip to content
Closed
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
2 changes: 1 addition & 1 deletion packages/layout/src/Main.vue
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ export default {
#tiny-engine {
display: flex;
flex-flow: column;
min-width: var(--base-min-width);
min-width: var(--te-base-min-width);
height: 100vh;
overflow: hidden;
.tiny-engine-main {
Expand Down
2 changes: 1 addition & 1 deletion packages/plugins/tree/src/styles/vars.less
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@
--te-tree-icon-color: var(--te-common-icon-secondary);
--te-tree-bg-color-active: var(--te-common-bg-container);
--te-tree-text-color: var(--te-common-text-primary);
--te-tree-block-text-color: var(--te-common-color-prompt-secondary);
--te-tree-block-text-color: var(--te-common-text-purple);
}
11 changes: 5 additions & 6 deletions packages/settings/design/src/App.vue
Original file line number Diff line number Diff line change
Expand Up @@ -97,9 +97,9 @@ export default {

<style lang="less">
:root {
--ti-lowcode-common-secondary-text-color: #adb0b8;
--ti-lowcode-common-hover-bg-color: #f2f5fc;
--ti-lowcode-mask-bg: #fafafa;
--te-setting-design-secondary-text-color: #adb0b8;
--te-setting-design-hover-bg-color: #f2f5fc;
--te-lowcode-mask-bg: #fafafa;
--max-height: calc(65vh - 70px);
}
html {
Expand Down Expand Up @@ -181,9 +181,8 @@ td {
}
.mask {
.source-code {
--ti-lowcode-toolbar-bg: var(--ti-lowcode-mask-bg);
.tiny-button {
--ti-button-info-normal-bg-color: #1476ff;
background-color: #1476ff;
}
}
}
Expand Down Expand Up @@ -212,7 +211,7 @@ td {
}

.canvas {
background: var(--ti-lowcode-common-hover-bg-color);
background: var(--te-setting-design-hover-bg-color);
padding: 20px;
margin: 0 20px;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -209,8 +209,8 @@ export default {
}
.tiny-form-item__content {
.editor-warp {
--ti-lowcode-meta-codeEditor-border-color: #595959;
--ti-lowcode-meta-codeEditor-color: #595959;
border-color: #595959;
color: #595959;
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion packages/settings/design/src/components/PropertyCanvas.vue
Original file line number Diff line number Diff line change
Expand Up @@ -282,7 +282,7 @@ export default {
padding: 3px 10px;
cursor: pointer;
&.active {
background-color: var(--ti-lowcode-common-hover-bg-color);
background-color: var(--te-setting-design-hover-bg-color);
}
.item-input .action-icon {
display: none;
Expand Down
4 changes: 2 additions & 2 deletions packages/settings/design/src/components/PropertyList.vue
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ export default {
}
.property-list-tips {
font-size: 12px;
color: var(--ti-lowcode-common-secondary-text-color);
color: var(--te-setting-design-secondary-text-color);
}
.help-icon {
margin-left: 3px;
Expand All @@ -116,7 +116,7 @@ export default {
border: 1px solid #e6e6e6;

&:hover {
background: var(--ti-lowcode-common-hover-bg-color);
background: var(--te-setting-design-hover-bg-color);
}
}
</style>
3 changes: 0 additions & 3 deletions packages/settings/design/src/components/SettingPanel.vue
Original file line number Diff line number Diff line change
Expand Up @@ -369,9 +369,6 @@ export default {
flex-wrap: wrap;
width: 100%;
}
:deep(.tiny-switch) {
width: var(--ti-switch-width);
}
.setting-radio-group {
&.setting-layout {
width: 100%;
Expand Down
7 changes: 4 additions & 3 deletions packages/settings/styles/src/components/inputs/ModalMask.vue
Original file line number Diff line number Diff line change
Expand Up @@ -107,12 +107,13 @@ export default {
box-sizing: border-box;
}
.modal-padding {
padding: var(--ti-modal-padding-y, 14px) var(--ti-modal-padding-x, 20px);
padding: var(--te-styles-modal-padding-y) var(--te-styles-modal-padding-x);
}
.align-body {
right: var(--modal-right-offset, 280px);
right: var(--te-styles-modal-right-offset-first);
left: calc(
100% - var(--modal-right-offset, 287px) - var(--modal-right-offset, 280px) - var(--modal-spaceing, 16px)
100% - var(--te-styles-modal-right-offset-first) - var(--te-styles-modal-right-offset-second) -
var(--te-styles-modal-spacing)
);
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -687,8 +687,4 @@ export default {
}
}
}

:deep(.tiny-select .tiny-input .tiny-input__inner) {
padding: 0 var(--ti-input-suffix-padding-right) 0 var(--ti-input-suffix-padding-left);
}
</style>
6 changes: 6 additions & 0 deletions packages/settings/styles/src/styles/vars.less
Original file line number Diff line number Diff line change
Expand Up @@ -68,4 +68,10 @@
// 样式面板-文本
--te-styles-typography-bg-color: var(--te-common-bg-container);
--te-styles-typography-bg-color-hover: var(--te-common-bg-gray-hover);

--te-styles-modal-padding-y: var(--te-base-modal-padding-y);
--te-styles-modal-padding-x: var(--te-base-modal-padding-x);
--te-styles-modal-right-offset-first: var(--te-base-modal-offset-1);
--te-styles-modal-right-offset-second: var(--te-base-modal-offset-2);
--te-styles-modal-spacing: var(--te-base-space-16);
}
10 changes: 10 additions & 0 deletions packages/theme/base/src/base.less
Original file line number Diff line number Diff line change
Expand Up @@ -280,6 +280,7 @@
--te-base-space-2: 2px; // 下拉面板距离上部输入框的间距
--te-base-space-6: 6px; // 其他间距-3
--te-base-space-10: 10px; // 其他间距-4
--te-base-space-16: 16px;

/**
* 1.3 字号
Expand Down Expand Up @@ -317,4 +318,13 @@
--te-base-border-radius-2: 6px; // 圆角-2
--te-base-border-radius-3: 8px; // 圆角-3
--te-base-border-radius-4: 50%; // 圆形

/**
* 基础配置
**/
--te-base-min-width: 1280px;
--te-base-modal-offset-1: 287px;
--te-base-modal-offset-2: 280px;
--te-base-modal-padding-y: 14px;
--te-base-modal-padding-x: 20px;
}
19 changes: 0 additions & 19 deletions packages/theme/dark/block.less

This file was deleted.

6 changes: 0 additions & 6 deletions packages/theme/dark/bridge.less

This file was deleted.

27 changes: 0 additions & 27 deletions packages/theme/dark/canvas.less

This file was deleted.

39 changes: 0 additions & 39 deletions packages/theme/dark/datasource.less

This file was deleted.

30 changes: 0 additions & 30 deletions packages/theme/dark/events.less

This file was deleted.

67 changes: 0 additions & 67 deletions packages/theme/dark/gpt-dialog.less

This file was deleted.

12 changes: 0 additions & 12 deletions packages/theme/dark/help.less

This file was deleted.

8 changes: 0 additions & 8 deletions packages/theme/dark/i18n.less

This file was deleted.

19 changes: 0 additions & 19 deletions packages/theme/dark/index.less
Original file line number Diff line number Diff line change
@@ -1,20 +1 @@
// 主题配置优先于公共配置
@import './variable.less';
@import './block.less';
@import './life-cycles.less';
@import './tutorial.less';
@import './help.less';
@import './settings.less';
@import './metaComponent.less';
@import './events.less';
@import './i18n.less';
@import './pageManage.less';
@import './materials.less';
@import './tree.less';
@import './canvas.less';
@import './bridge.less';
@import './toolbar.less';
@import './datasource.less';
@import './plugin-js.less';
@import './gpt-dialog.less';
@import './setting-style';
Loading