From 813dc78c519ceefe7a129a049ffc9097f81d6385 Mon Sep 17 00:00:00 2001 From: Leopoldthecoder Date: Wed, 9 Nov 2016 17:57:00 +0800 Subject: [PATCH] Loading: update style/Add favicon --- build/cooking.demo.js | 8 +++++++- examples/assets/images/element-logo.svg | 8 ++++---- packages/loading/src/spinner.vue | 2 +- packages/theme-default/src/common/var.css | 2 +- packages/theme-default/src/input.css | 1 + packages/theme-default/src/loading.css | 8 ++------ packages/theme-default/src/select.css | 16 ++++++++-------- 7 files changed, 24 insertions(+), 21 deletions(-) mode change 100644 => 100755 examples/assets/images/element-logo.svg diff --git a/build/cooking.demo.js b/build/cooking.demo.js index bf2253499..2f085036c 100644 --- a/build/cooking.demo.js +++ b/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: { diff --git a/examples/assets/images/element-logo.svg b/examples/assets/images/element-logo.svg old mode 100644 new mode 100755 index 76be99f14..825acba02 --- a/examples/assets/images/element-logo.svg +++ b/examples/assets/images/element-logo.svg @@ -1,12 +1,12 @@ - + - Shape + Shape Copy Created with Sketch. - - + + \ No newline at end of file diff --git a/packages/loading/src/spinner.vue b/packages/loading/src/spinner.vue index 3362fd928..215c1121f 100644 --- a/packages/loading/src/spinner.vue +++ b/packages/loading/src/spinner.vue @@ -3,7 +3,7 @@ class="el-loading-spinner" :class="{ 'is-full-screen': fullScreen }"> - +

{{ text }}

diff --git a/packages/theme-default/src/common/var.css b/packages/theme-default/src/common/var.css index 7754b8361..dcdf08f89 100644 --- a/packages/theme-default/src/common/var.css +++ b/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; } diff --git a/packages/theme-default/src/input.css b/packages/theme-default/src/input.css index 8089b3080..43816afec 100644 --- a/packages/theme-default/src/input.css +++ b/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 { diff --git a/packages/theme-default/src/loading.css b/packages/theme-default/src/loading.css index c3dd552de..41d0b856d 100644 --- a/packages/theme-default/src/loading.css +++ b/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; - } } } diff --git a/packages/theme-default/src/select.css b/packages/theme-default/src/select.css index f42d20968..0641678f5 100644 --- a/packages/theme-default/src/select.css +++ b/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;