Merge pull request #944 from Leopoldthecoder/master

Loading: update style

build/cooking.demo.js

@@ -18,7 +18,13 @@ cooking.set({
     'element-ui': './src/index.js'
   } : './examples/entry.js',
   dist: './examples/element-ui/',
-  template: './examples/index.tpl',
+  template: [
+    {
+      template: './examples/index.tpl',
+      filename: './index.html',
+      favicon: './examples/favicon.ico'
+    }
+  ],
   publicPath: process.env.CI_ENV || '/',
   hash: true,
   devServer: {

packages/loading/src/spinner.vue

@@ -3,7 +3,7 @@
     class="el-loading-spinner"
     :class="{ 'is-full-screen': fullScreen }">
     <svg class="circular" viewBox="25 25 50 50">
-      <circle class="path" cx="50" cy="50" r="20" fill="none" stroke-miterlimit="10"/>
+      <circle class="path" cx="50" cy="50" r="20" fill="none"/>
     </svg>
     <p v-if="text" class="el-loading-text">{{ text }}</p>
   </div>

packages/theme-default/src/common/var.css

@@ -543,5 +543,5 @@
   /* Loading
   --------------------------*/
   --loading-spinner-size: 42px;
-  --loading-fullscreen-spinner-size: 64px;
+  --loading-fullscreen-spinner-size: 50px;
 }

packages/theme-default/src/input.css

@@ -19,6 +19,7 @@
       border-radius: 4px;
       transition: var(--border-transition-base);
       outline: none;
+      font-size: inherit;
       line-height: normal;
 
       &::placeholder {

packages/theme-default/src/loading.css

@@ -10,7 +10,7 @@
   .el-loading-text {
     color: var(--color-primary);
     margin: 3px 0;
-    font-size: 16px;
+    font-size: 14px;
   }
 
   .circular {
@@ -23,7 +23,7 @@
     stroke-dashoffset: 0;
     stroke-width: 2;
     stroke: var(--color-primary);
-    animation: dash 1.5s ease-in-out infinite, color 6s ease-in-out infinite;
+    animation: dash 1.5s ease-in-out infinite;
     stroke-linecap: round;
   }
 
@@ -33,10 +33,6 @@
     .circular {
       width: var(--loading-fullscreen-spinner-size);
     }
-
-    .path {
-      stroke-width: 3;
-    }
   }
 }
 

packages/theme-default/src/select.css

@@ -25,6 +25,14 @@
       }
     }
 
+    & .el-input__inner {
+      cursor: pointer;
+
+      &:focus {
+        border-color: var(--select-input-focus-background);
+      }
+    }
+
     & .el-input {
       & .el-input__icon {
         color: var(--select-input-color);
@@ -55,14 +63,6 @@
         }
       }
 
-      & .el-input__inner {
-        cursor: pointer;
-
-        &:focus {
-          border-color: var(--select-input-focus-background);
-        }
-      }
-
       &.is-disabled {
         & .el-input__inner {
           cursor: not-allowed;