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(alert): [alert] updata alert xdesign #2083

Merged
merged 3 commits into from
Sep 9, 2024
Merged

fix(alert): [alert] updata alert xdesign #2083

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
828264b
fix(alert): [alert] updata alert xdesign
wuyiping0628 Sep 9, 2024
0c0606d
Merge branch 'dev' of github.com:opentiny/tiny-vue into wyp/tag-xdesi…
wuyiping0628 Sep 9, 2024
efb1cab
fix(tag): [tag] updata tag xdesign
wuyiping0628 Sep 9, 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
6 changes: 6 additions & 0 deletions examples/sites/demos/pc/app/tag/slot-default-composition-api.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,9 @@
<tiny-tag size="medium" :disabled="disabled" closable>
<tiny-icon-time class="tiny-svg-size medium" />标签
</tiny-tag>
<tiny-tag size="small" type="success" class="tiny-only-iocn">
<tiny-icon-fileupload />
</tiny-tag>
</div>
</template>

Expand Down Expand Up @@ -41,4 +44,7 @@ const TinyIconChevronRight = iconChevronRight()
.medium {
font-size: 20px;
}
.tiny-only-iocn {
border-radius: 0px 6px;
}
</style>
6 changes: 6 additions & 0 deletions examples/sites/demos/pc/app/tag/slot-default.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@
<tiny-tag size="small" :disabled="disabled" closable> <icon-time class="tiny-svg-size" />标签 </tiny-tag>
<tiny-tag :disabled="disabled" closable> <icon-time class="tiny-svg-size" />标签 </tiny-tag>
<tiny-tag size="medium" :disabled="disabled" closable> <icon-time class="tiny-svg-size medium" />标签 </tiny-tag>
<tiny-tag size="small" type="success" class="tiny-only-iocn">
<icon-fileupload />
</tiny-tag>
</div>
</template>

Expand Down Expand Up @@ -49,4 +52,7 @@ export default {
.medium {
font-size: 20px;
}
.tiny-only-iocn {
border-radius: 0px 6px;
}
</style>
5 changes: 2 additions & 3 deletions packages/design/smb/src/alert/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
import { iconWarningTriangle, iconPromptExclamation } from '@opentiny/vue-icon'
import { iconWarningTriangle } from '@opentiny/vue-icon'

export default {
icons: {
warning: iconWarningTriangle(),
info: iconPromptExclamation()
warning: iconWarningTriangle()
},
renderless: (props, hooks, { emit }, api) => {
const state = api.state
Expand Down
2 changes: 1 addition & 1 deletion packages/theme/src/tag/index.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -258,7 +258,7 @@
&.is-disabled:hover {
cursor: not-allowed;
color: #c2c2c2;
background-color: rgba(0, 0, 0, 0.05);
background-color: var(--ti-tag-disabled-background-color);
svg,
svg:hover,
.@{tag-prefix-cls}__close {
Expand Down
3 changes: 2 additions & 1 deletion packages/theme/src/tag/smb-theme.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,13 @@ export const tinyTagSMBTheme = {
'ti-tag-medium-padding-horizontal': 'var(--ti-common-space-3x)',
'ti-tag-small-padding-horizontal': 'var(--ti-common-space-base)',
'ti-tag-small-border-radius': 'var(--ti-common-border-radius-1)',
'ti-tag-primary-background-color': 'var(--ti-common-color-bg-light-normal)',
'ti-tag-primary-background-color': 'var(--ti-common-color-bg-6)',
'ti-tag-info-background-color': 'var(--ti-common-color-bg-light-normal)',
'ti-tag-border-weight': '0',
'ti-tag-border-radius': 'var(--ti-common-border-radius-2)',
'ti-tag-close-font-size': 'var(--ti-common-font-size-2)',
'ti-tag-close-margin-left': 'var(--ti-common-space-base)',
'ti-tag-disabled-background-color': 'var(--ti-common-color-bg-disabled)',
'ti-tag-close-margin-right': 'calc(var(--ti-common-space-base) * -1)',
'ti-tag-close-medium-margin-left': 'var(--ti-common-space-2x)',
'ti-tag-close-medium-margin-right': 'calc(var(--ti-common-space-base) * -1)',
Expand Down
2 changes: 2 additions & 0 deletions packages/theme/src/tag/vars.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,4 +156,6 @@
--ti-tag-grey-text-color: var(--ti-common-color-text-gray);
// grey标签背景色
--ti-tag-grey-bg-color: #e6e6e6;
// 禁用背景色
--ti-tag-disabled-background-color: rgba(0, 0, 0, 0.05);
}
Loading