Skip to content

Commit

Permalink
Merge branch 'dev' of github.com:opentiny/tiny-vue into dev
Browse files Browse the repository at this point in the history
  • Loading branch information
zzcr committed Oct 23, 2024
2 parents fab996f + 4418bf6 commit 317064f
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 8 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
</template>
</tiny-button-group>
</div>
<p>插槽引用tag角标</p>
<p>插槽引用 tag 角标</p>
<div class="tag">
<tiny-button-group :data="groupDataTag" v-model="checkedVal">
<template #btn="{ sup }">
Expand Down Expand Up @@ -136,7 +136,10 @@ const groupDataTag = ref([
.demo-button .tag li:first-child button {
width: 100px;
}
.tiny-only-icon {
.demo-button .tag .tiny-group-item__sup {
line-height: 12px;
}
.demo-button .tag .tiny-only-icon {
border-radius: 0px 6px;
}
</style>
7 changes: 5 additions & 2 deletions examples/sites/demos/pc/app/button-group/sup.vue
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
</template>
</tiny-button-group>
</div>
<p>插槽引用tag角标</p>
<p>插槽引用 tag 角标</p>
<div class="tag">
<tiny-button-group :data="groupData2" v-model="checkedVal">
<template #btn="{ sup }">
Expand Down Expand Up @@ -146,7 +146,10 @@ export default {
.demo-button .tag li:first-child button {
width: 100px;
}
.tiny-only-icon {
.demo-button .tag .tiny-group-item__sup {
line-height: 12px;
}
.demo-button .tag .tiny-only-icon {
border-radius: 0px 6px;
}
</style>
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ export default {
{
demoId: 'size',
name: {
'zh-CN': '组件尺寸大小',
'en-US': 'Set Component Size'
'zh-CN': '组件尺寸',
'en-US': 'Component Size'
},
desc: {
'zh-CN':
Expand Down Expand Up @@ -131,8 +131,7 @@ export default {
'en-US': ''
},
desc: {
'zh-CN':
'<p>通过 <code>data</code> 的 <code>sup</code> 属性配置选块角标,详见 <a href="IButtonGroupData">IButtonGroupData</a> 。</p>',
'zh-CN': '<p>通过 <code>data</code> 的 <code>sup</code> 属性配置选块角标。</p>',
'en-US': ''
},
codeFiles: ['sup.vue']
Expand Down

0 comments on commit 317064f

Please sign in to comment.