fix: 修复modal关闭按钮图标丢失问题和颜色问题

Yoshino-UI · Nov 8, 2018 · 7ad76ac · 7ad76ac
1 parent 9e1d5cd
commit 7ad76ac
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 4 deletions.
diff --git a/components/DatePicker/style/index.less b/components/DatePicker/style/index.less
@@ -47,7 +47,7 @@
 
       &:hover {
         transition: @transition-base;
-        color: rgba(0, 0, 0, 0.45);
+        color: @font-color-second;
       }
     }
   }

diff --git a/components/Modal/Modal.tsx b/components/Modal/Modal.tsx
@@ -145,7 +145,7 @@ class Modal extends Component<IModalComponentProps, IModalComponentState> {
             className={`${preCls}-close`}
             onClick={this.onClose}
           >
-            {closeText || <Icon type='close-round'/>}
+            {closeText || <Icon type='md-close'/>}
           </div> : null}
           <div className={`${preCls}-body`}>
             {

diff --git a/components/Modal/style/index.less b/components/Modal/style/index.less
@@ -44,7 +44,7 @@
     top: 0;
     padding: @close-icon-padding;
     cursor: pointer;
-    color: @color-unactive;
+    color: @font-color-second;
     transition: @transition-quick;
 
     :hover {

diff --git a/components/TimePicker/style/index.less b/components/TimePicker/style/index.less
@@ -51,7 +51,7 @@
 
       &:hover {
         transition: @transition-base;
-        color: rgba(0, 0, 0, 0.45);
+        color: @font-color-second;
       }
     }
   }

diff --git a/components/styles/var.less b/components/styles/var.less
@@ -20,6 +20,7 @@
 @font-size-default: 14px;
 @font-size-large: 16px;
 @font-color-base: rgba(0, 0, 0, 0.65);
+@font-color-second: rgba(0, 0, 0, 0.45);
 @font-color-unactive: rgba(0, 0, 0, 0.25);
 
 @font-weight-base: 500;