Skip to content

Commit 636a57f

Browse files
committed
feat(resources): use color variable
1 parent a4c6c45 commit 636a57f

5 files changed

Lines changed: 10 additions & 10 deletions

File tree

packages/configurator/src/source-select-configurator/SourceSelectConfigurator.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@
7676
<script lang="ts">
7777
import { ref, watch } from 'vue'
7878
import type { Component } from 'vue'
79-
import { Popover as TinyPopover, Button as TinyButton, Input, Search, Select, Divider, Radio } from '@opentiny/vue'
79+
import { Popover as TinyPopover, TinyButton, Input, Search, Select, Divider, Radio } from '@opentiny/vue'
8080
import { iconClose, iconSearch } from '@opentiny/vue-icon'
8181
import { SearchEmpty } from '@opentiny/tiny-engine-common'
8282
import { useNotify } from '@opentiny/tiny-engine-meta-register'
@@ -99,7 +99,7 @@ export default {
9999
TinyInput: Input,
100100
TinySearch: Search,
101101
TinySelect: Select,
102-
TinyDivider: Divider,
102+
TinyDivider: Divider as Component,
103103
TinyRadio: Radio,
104104
SearchEmpty,
105105
TinyIconClose: iconClose(),

packages/plugins/resource/src/Main.vue

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,6 @@ import ResourceSetting, { openResourceSettingPanel, closeResourceSettingPanel }
4848
import ResourceList, { openResourceListPanel, closeResourceListPanel } from './ResourceList.vue'
4949
import { fetchResourceGroupByAppId } from './js/http'
5050
51-
/* metaComponent: engine.plugins.resource */
5251
export default {
5352
components: {
5453
PluginPanel,

packages/plugins/resource/src/ResourceList.vue

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ import { ref, reactive, computed, watch } from 'vue'
147147
import type { Component } from 'vue'
148148
import useClipboard from 'vue-clipboard3'
149149
import {
150-
Button as TinyButton,
150+
TinyButton,
151151
Divider,
152152
Grid,
153153
GridColumn,
@@ -187,7 +187,7 @@ export default {
187187
PluginSetting,
188188
SvgButton,
189189
TinyButton: TinyButton as Component,
190-
TinyDivider: Divider,
190+
TinyDivider: Divider as Component,
191191
TinyGrid: Grid,
192192
TinyGridColumn: GridColumn,
193193
TinyInput: Input,
@@ -496,7 +496,7 @@ export default {
496496
align-items: start;
497497
.resource-description {
498498
padding: 8px 0;
499-
color: #808080;
499+
color: var(--te-resource-manage-tip-text-color);
500500
}
501501
502502
.action-wrap {
@@ -536,7 +536,7 @@ export default {
536536
.source-image-wrap {
537537
width: 185px;
538538
height: 120px;
539-
background-color: #f5f5f5;
539+
background-color: var(--te-resource-manage-draggable-row-bg-color-hover);
540540
transition: unset;
541541
position: relative;
542542
@@ -563,7 +563,7 @@ export default {
563563
text-align: left;
564564
line-height: 28px;
565565
width: 185px;
566-
color: #fff;
566+
color: var(--te-resource-manage-button-text-color);
567567
white-space: nowrap;
568568
overflow: hidden;
569569
text-overflow: ellipsis;
@@ -589,7 +589,7 @@ export default {
589589
background-color: rgba(0, 0, 0, 0.2);
590590
591591
svg {
592-
fill: #fff;
592+
fill: var(--te-resource-manage-button-text-color);
593593
}
594594
}
595595
}

packages/plugins/resource/src/ResourceSetting.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
/* metaService: engine.plugins.resource.ResourceSetting */
3737
import { ref, reactive, computed } from 'vue'
3838
import type { Component } from 'vue'
39-
import { Button as TinyButton, Collapse, CollapseItem, Form, FormItem, Input } from '@opentiny/vue'
39+
import { TinyButton, Collapse, CollapseItem, Form, FormItem, Input } from '@opentiny/vue'
4040
import { useLayout, useNotify } from '@opentiny/tiny-engine-meta-register'
4141
import { PluginSetting, ButtonGroup, SvgButton } from '@opentiny/tiny-engine-common'
4242
import { createResourceGroup, updateResourceGroup } from './js/http'

packages/plugins/resource/src/styles/vars.less

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
.plugin-resource {
22
--te-resource-manage-title-text-color: var(--te-common-text-primary);
3+
--te-resource-manage-button-text-color: var(--te-common-text-inverse);
34
--te-resource-manage-input-bg-color: var(--te-common-bg-default);
45
--te-resource-manage-input-border-color: var(--te-common-border-default);
56
--te-resource-manage-tip-color: var(--te-common-text-primary);

0 commit comments

Comments
 (0)