evui 2.1.0 → 2.1.1

package/src/components/label/label.vue

@@ -9,10 +9,10 @@
 </template>
 <script>
   const prefixCls = 'ev-label';
-  export default{
+  export default {
     props: {
       value: {
-        type: String,
+        type: [String, Number],
         default: '',
       },
       size: {

package/src/components/loadingmask/loadingmask.vue

@@ -95,16 +95,12 @@
             const parentPaddingLeft = getComputedParent.getPropertyValue('padding-left');
             const parentBorder = getComputedParent.getPropertyValue('border-width');
             const parentElRect = parentEl.getBoundingClientRect();
-            const parentWidth =
-              parentElRect.width - (parseInt(parentBorder, 10) * 2);
-            const parentHeight =
-              parentElRect.height - (parseInt(parentBorder, 10) * 2);
-            const wrapperTransform =
-              `translate(-${parentPaddingLeft}, -${parentPaddingTop})`;
+            const parentWidth = parentElRect.width - (parseInt(parentBorder, 10) * 2);
+            const parentHeight = parentElRect.height - (parseInt(parentBorder, 10) * 2);
+            const wrapperTransform = `translate(-${parentPaddingLeft}, -${parentPaddingTop})`;
             this.$el.setAttribute('style',
               `width: ${parentWidth}px; height: ${parentHeight}px; transform: ${wrapperTransform}`);
-            const centerTransform =
-              `translate(-${(this.barWidth / 2)}px, -${(this.barHeight / 2)}px)`;
+            const centerTransform = `translate(-${(this.barWidth / 2)}px, -${(this.barHeight / 2)}px)`;
             this.$refs.loadingCenter.setAttribute('style',
               `top: ${parentHeight / 2}px; left: ${parentWidth / 2}px; transform: ${centerTransform}`);
           }
@@ -117,21 +113,18 @@
 <style>
   .ev-loadingmask {
     position: absolute;
-    /*background: #EEEEEE;*/
-    /*opacity: 0.2;*/
     overflow: hidden;
-    z-index: 20000;
+    z-index: 300;
   }
   .ev-loadingmask-center {
     position: relative;
   }
+
   @keyframes ev-loadingmask-fadedelay {
     80% {
-      -webkit-opacity: 0.2;
       opacity: 0.2;
     }
     100% {
-      -webkit-opacity: 0.9;
       opacity: 0.9;
     }
   }

package/src/components/loginfield/loginfield.vue

@@ -61,7 +61,6 @@
 
 <script>
   import { getQuantity, getSize } from '@/common/utils';
-  import '@/styles/evui.css';
 
   const prefixCls = 'ev-login';
 
@@ -265,9 +264,12 @@
     },
   };
 </script>
-<style>
+
+<style lang="scss">
+  @import '~@/styles/default';
+
   .ev-login {
-    font-family:'NanumGothic';
+    font-family: 'NanumGothic';
     display: inline-block;
     position: relative;
     vertical-align: middle;
@@ -276,55 +278,62 @@
     width: 100%;
     height: 100%;
     border-radius: 4px;
-    color: #495060;
+    color: $color-gray75;
     font-size: 12px;
     line-height: 2;
     cursor: text;
     background-image: none;
   }
-  .ev-login.focus, .ev-login.focus:hover {
-    border-color : #2d8cf0;
+
+  .ev-login.focus,
+  .ev-login.focus:hover {
     opacity: 1;
+
+    @include evThemify() {
+      background-color: evThemed('color-primary');
+    }
   }
-  .ev-login-text, .ev-login-password {
+
+  .ev-login-text,
+  .ev-login-password {
     width: 100%;
     height: 100%;
-    font-size:18px;
-    padding:10px 10px 10px 12px;
-    display:block;
-    border: 1px solid #dadce0;
-    border-radius: 3px;
+    font-size: 18px;
+    padding: 10px 10px 10px 12px;
+    display: block;
+    border: 1px solid #DCE1E5;
+    border-radius: 1px;
+    transition: border $animate-fast;
   }
-  .ev-login-text:focus, .ev-login-password:focus {
-    outline:none;
-    border: 2px solid #2d8cf0;
-    border-radius: 3px;
+
+  .ev-login-text:focus,
+  .ev-login-password:focus {
+    outline: none;
+
+    @include evThemify() {
+      border-bottom: 3px solid evThemed('color-primary');
+    }
   }
 
   /* LABEL ======================================= */
   .loginLabel {
-    color:#999;
-    font-size:18px;
-    font-weight:normal;
-    position:absolute;
-    pointer-events:none;
-    left:12px;
-    top:10px;
-    transition:0.1s ease all;
-    -moz-transition:0.1s ease all;
-    -webkit-transition:0.1s ease all;
+    color: $color-gray80;
+    font-size: 12px;
+    position: absolute;
+    pointer-events: none;
+    height: 22px;
+    top: -22px;
+    font-family: Roboto;
+    font-weight: 600;
+    transition: color $animate-fast;
   }
   /* active state */
-  .ev-login-text:focus ~ .loginLabel, .ev-login-text:valid ~ .loginLabel,
-  .ev-login-password:focus ~ .loginLabel, .ev-login-password:valid ~ .loginLabel {
-    top:-13px;
-    left:7px;
-    font-size:14px;
-    padding: 0 5px 0 5px;
-    color:#2d8cf0;
-    background-color: #ffffff;
-    font-weight:600;
+  .ev-login-text:focus ~ .loginLabel,
+  .ev-login-text:valid ~ .loginLabel,
+  .ev-login-password:focus ~ .loginLabel,
+  .ev-login-password:valid ~ .loginLabel {
+    @include evThemify() {
+      color: evThemed('color-primary');
+    }
   }
-
 </style>
-

package/src/components/markdown/index.js

@@ -0,0 +1,3 @@
+import markdown from './markdown';
+
+export default markdown;