Merge branch '2.x' into dev
This commit is contained in:
@@ -33,10 +33,10 @@
|
||||
|
||||
<demo-block :title="t('customColor')">
|
||||
<van-radio-group v-model="radio3" class="demo-radio-group">
|
||||
<van-radio name="1" checked-color="#07c160">
|
||||
<van-radio name="1" checked-color="#ee0a24">
|
||||
{{ t('radio') }} 1
|
||||
</van-radio>
|
||||
<van-radio name="2" checked-color="#07c160">
|
||||
<van-radio name="2" checked-color="#ee0a24">
|
||||
{{ t('radio') }} 2
|
||||
</van-radio>
|
||||
</van-radio-group>
|
||||
@@ -44,12 +44,8 @@
|
||||
|
||||
<demo-block :title="t('customIconSize')">
|
||||
<van-radio-group v-model="radioIconSize" class="demo-radio-group">
|
||||
<van-radio name="1" checked-color="#07c160" icon-size="24px">
|
||||
{{ t('radio') }} 1
|
||||
</van-radio>
|
||||
<van-radio name="2" checked-color="#07c160" icon-size="24px">
|
||||
{{ t('radio') }} 2
|
||||
</van-radio>
|
||||
<van-radio name="1" icon-size="24px"> {{ t('radio') }} 1 </van-radio>
|
||||
<van-radio name="2" icon-size="24px"> {{ t('radio') }} 2 </van-radio>
|
||||
</van-radio-group>
|
||||
</demo-block>
|
||||
|
||||
|
||||
Reference in New Issue
Block a user