drip-public/iview
6
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

update Modal style

Browse source
This commit is contained in:
梁灏 2019-09-16 15:55:18 +08:00
parent b3f6b6c8fc
commit 4507c9a6a2
4 changed files with 10 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/components/modal/confirm.js
View file

@ -31,8 +31,7 @@ Modal.newInstance = properties => {
if (this.showCancel) { if (this.showCancel) {
footerVNodes.push(h(Button, { footerVNodes.push(h(Button, {
props: { props: {
type: 'text', type: 'text'
size: 'large'
}, },
on: { on: {
click: this.cancel click: this.cancel
@ -42,7 +41,6 @@ Modal.newInstance = properties => {
footerVNodes.push(h(Button, { footerVNodes.push(h(Button, {
props: { props: {
type: 'primary', type: 'primary',
size: 'large',
loading: this.buttonLoading loading: this.buttonLoading
}, },
on: { on: {

4
src/components/modal/modal.vue
View file

@ -19,8 +19,8 @@
<div :class="[prefixCls + '-body']"><slot></slot></div> <div :class="[prefixCls + '-body']"><slot></slot></div>
<div :class="[prefixCls + '-footer']" v-if="!footerHide"> <div :class="[prefixCls + '-footer']" v-if="!footerHide">
<slot name="footer"> <slot name="footer">
<i-button type="text" size="large" @click.native="cancel">{{ localeCancelText }}</i-button> <i-button type="text" @click.native="cancel">{{ localeCancelText }}</i-button>
<i-button type="primary" size="large" :loading="buttonLoading" @click.native="ok">{{ localeOkText }}</i-button> <i-button type="primary" :loading="buttonLoading" @click.native="ok">{{ localeOkText }}</i-button>
</slot> </slot>
</div> </div>
</div> </div>

8
src/styles/components/modal.less
View file

@ -68,7 +68,7 @@
&-body { &-body {
padding: 16px; padding: 16px;
font-size: 12px; font-size: @font-size-base;
line-height: 1.5; line-height: 1.5;
} }
@ -140,7 +140,7 @@
} }
.@{confirm-prefix-cls} { .@{confirm-prefix-cls} {
padding: 0 4px; padding: 6px 16px 8px;
&-head { &-head {
padding: 0 12px 0 0; padding: 0 12px 0 0;
&-icon { &-icon {
@ -173,7 +173,7 @@
margin-left: 12px; margin-left: 12px;
font-size: @font-size-large; font-size: @font-size-large;
color: @title-color; color: @title-color;
font-weight: 700; font-weight: 500;
} }
} }
@ -198,4 +198,4 @@
margin-bottom: 0; margin-bottom: 0;
} }
} }
} }

6
src/styles/mixins/content.less
View file

@ -12,9 +12,9 @@
width: 100%; width: 100%;
height: 20px; height: 20px;
line-height: 20px; line-height: 20px;
font-size: @font-size-base; font-size: @font-size-large;
color: @title-color; color: @title-color;
font-weight: bold; font-weight: 500;
overflow: hidden; overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;
white-space: nowrap; white-space: nowrap;
@ -35,4 +35,4 @@
.@{icon-prefix-cls}-ios-close { .@{icon-prefix-cls}-ios-close {
.close-base(@top, @icon-font-size); .close-base(@top, @icon-font-size);
} }
} }