From 1d247d20997948ea837361952647e9d42db3e6e1 Mon Sep 17 00:00:00 2001
From: 梁灏 <admin@aresn.com>
Date: Sun, 1 Jul 2018 14:43:25 +0800
Subject: [PATCH] update Modal & Notice style

---
 examples/routers/modal.vue        | 53 +++++++++++++++++++++++++++++++++--------------------
 src/styles/components/modal.less  |  2 +-
 src/styles/components/notice.less | 13 +++----------
 3 files changed, 37 insertions(+), 31 deletions(-)

diff --git a/examples/routers/modal.vue b/examples/routers/modal.vue
index 58a893b..94c328a 100644
--- a/examples/routers/modal.vue
+++ b/examples/routers/modal.vue
@@ -1,30 +1,43 @@
 <template>
     <div>
-        <Button type="primary" @click="modal1 = true">Display dialog box</Button>
-        <Modal
-                v-model="modal1"
-                title="Common Modal dialog box title"
-                @on-ok="ok"
-                @on-cancel="cancel">
-            <p>Content of dialog</p>
-            <p>Content of dialog</p>
-            <p>Content of dialog</p>
-        </Modal>
+        <Button @click="instance('info')">Info</Button>
+        <Button @click="instance('success')">Success</Button>
+        <Button @click="instance('warning')">Warning</Button>
+        <Button @click="instance('error')">Error</Button>
     </div>
 </template>
 <script>
     export default {
-        data () {
-            return {
-                modal1: false
-            }
-        },
         methods: {
-            ok () {
-                this.$Message.info('Clicked ok');
-            },
-            cancel () {
-                this.$Message.info('Clicked cancel');
+            instance (type) {
+                const title = 'Title';
+                const content = '<p>Content of dialog</p><p>Content of dialog</p>';
+                switch (type) {
+                    case 'info':
+                        this.$Modal.info({
+                            title: title,
+                            content: content
+                        });
+                        break;
+                    case 'success':
+                        this.$Modal.success({
+                            title: title,
+                            content: content
+                        });
+                        break;
+                    case 'warning':
+                        this.$Modal.warning({
+                            title: title,
+                            content: content
+                        });
+                        break;
+                    case 'error':
+                        this.$Modal.error({
+                            title: title,
+                            content: content
+                        });
+                        break;
+                }
             }
         }
     }
diff --git a/src/styles/components/modal.less b/src/styles/components/modal.less
index 49777cb..1f22de4 100644
--- a/src/styles/components/modal.less
+++ b/src/styles/components/modal.less
@@ -144,7 +144,7 @@
             font-size: 28px;
             vertical-align: middle;
             position: relative;
-            top: 3px;
+            top: -2px;
 
             &-info {
                 color: @primary-color;
diff --git a/src/styles/components/notice.less b/src/styles/components/notice.less
index 094cd50..0334cec 100644
--- a/src/styles/components/notice.less
+++ b/src/styles/components/notice.less
@@ -89,7 +89,7 @@
 
     &-icon {
         position: absolute;
-        left: 16px;
+        top: -2px;
         font-size: @font-size-large;
 
         &-success {
@@ -107,17 +107,10 @@
     }
     &-with-desc &-icon{
         font-size: 36px;
+        top: -6px;
     }
 
     &-custom-content{
-        &:after{
-            content: "";
-            display: block;
-            width: 4px;
-            position: absolute;
-            top: 0;
-            bottom: 0;
-            left: 0;
-        }
+        position: relative;
     }
 }
\ No newline at end of file
--
libgit2 0.21.4