From 4507c9a6a22a875b6d3f4dbcb8251d64cf132090 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=A2=81=E7=81=8F?= Date: Mon, 16 Sep 2019 15:55:18 +0800 Subject: [PATCH] update Modal style --- src/components/modal/confirm.js | 4 +--- src/components/modal/modal.vue | 4 ++-- src/styles/components/modal.less | 8 ++++---- src/styles/mixins/content.less | 6 +++--- 4 files changed, 10 insertions(+), 12 deletions(-) diff --git a/src/components/modal/confirm.js b/src/components/modal/confirm.js index 379e2d6d..193069b3 100644 --- a/src/components/modal/confirm.js +++ b/src/components/modal/confirm.js @@ -31,8 +31,7 @@ Modal.newInstance = properties => { if (this.showCancel) { footerVNodes.push(h(Button, { props: { - type: 'text', - size: 'large' + type: 'text' }, on: { click: this.cancel @@ -42,7 +41,6 @@ Modal.newInstance = properties => { footerVNodes.push(h(Button, { props: { type: 'primary', - size: 'large', loading: this.buttonLoading }, on: { diff --git a/src/components/modal/modal.vue b/src/components/modal/modal.vue index 61308669..ce7a8d3d 100644 --- a/src/components/modal/modal.vue +++ b/src/components/modal/modal.vue @@ -19,8 +19,8 @@
- {{ localeCancelText }} - {{ localeOkText }} + {{ localeCancelText }} + {{ localeOkText }}
diff --git a/src/styles/components/modal.less b/src/styles/components/modal.less index 7ecb1aec..149f5fd7 100644 --- a/src/styles/components/modal.less +++ b/src/styles/components/modal.less @@ -68,7 +68,7 @@ &-body { padding: 16px; - font-size: 12px; + font-size: @font-size-base; line-height: 1.5; } @@ -140,7 +140,7 @@ } .@{confirm-prefix-cls} { - padding: 0 4px; + padding: 6px 16px 8px; &-head { padding: 0 12px 0 0; &-icon { @@ -173,7 +173,7 @@ margin-left: 12px; font-size: @font-size-large; color: @title-color; - font-weight: 700; + font-weight: 500; } } @@ -198,4 +198,4 @@ margin-bottom: 0; } } -} \ No newline at end of file +} diff --git a/src/styles/mixins/content.less b/src/styles/mixins/content.less index c9d65cdf..08465aca 100644 --- a/src/styles/mixins/content.less +++ b/src/styles/mixins/content.less @@ -12,9 +12,9 @@ width: 100%; height: 20px; line-height: 20px; - font-size: @font-size-base; + font-size: @font-size-large; color: @title-color; - font-weight: bold; + font-weight: 500; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; @@ -35,4 +35,4 @@ .@{icon-prefix-cls}-ios-close { .close-base(@top, @icon-font-size); } -} \ No newline at end of file +}