From fedaac2d9f90c051f95b381eb35dfae7270504d2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=BB=93=E5=8F=91=E5=8F=97=E9=95=BF=E7=94=9F?= Date: Sat, 18 May 2019 09:45:55 +0800 Subject: [PATCH] =?UTF-8?q?=E6=90=9C=E7=B4=A2=E6=A1=86bug=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- themes/yilia/layout/_partial/tools.ejs | 4 ++-- themes/yilia/source-src/css/core/_animation.scss | 2 +- themes/yilia/source-src/css/grid.scss | 6 +++--- themes/yilia/source-src/css/tools.scss | 3 ++- themes/yilia/source-src/js/slider.js | 2 +- 5 files changed, 9 insertions(+), 8 deletions(-) diff --git a/themes/yilia/layout/_partial/tools.ejs b/themes/yilia/layout/_partial/tools.ejs index eeb3d29..09cff4e 100644 --- a/themes/yilia/layout/_partial/tools.ejs +++ b/themes/yilia/layout/_partial/tools.ejs @@ -23,14 +23,14 @@
<%if(hasInnerArchive){%>
-
+
{{searchItem.query}} - +
diff --git a/themes/yilia/source-src/css/core/_animation.scss b/themes/yilia/source-src/css/core/_animation.scss index e991f13..9fe54f9 100644 --- a/themes/yilia/source-src/css/core/_animation.scss +++ b/themes/yilia/source-src/css/core/_animation.scss @@ -256,7 +256,7 @@ } %anmCommon { - animation-duration: .3s; + animation-duration: .5s; animation-fill-mode: both; animation-timing-function: ease-in-out; } diff --git a/themes/yilia/source-src/css/grid.scss b/themes/yilia/source-src/css/grid.scss index a08568c..87dd9ac 100644 --- a/themes/yilia/source-src/css/grid.scss +++ b/themes/yilia/source-src/css/grid.scss @@ -40,15 +40,15 @@ html, body, #container { min-height:100%; background:$colorBodyBg; left: 300px; - width: auto; + width: auto; @extend %trans; &.show { background: none; opacity: .9; @extend %anmLeftIn; .article { - @extend %trans; - background: rgba(255,255,255,.3); + transition: opacity .5s ease-in, background-color .2s ease-in; + opacity: 0.6; } } &.hide { diff --git a/themes/yilia/source-src/css/tools.scss b/themes/yilia/source-src/css/tools.scss index 456c603..54e622a 100644 --- a/themes/yilia/source-src/css/tools.scss +++ b/themes/yilia/source-src/css/tools.scss @@ -38,7 +38,6 @@ border-bottom: 2px solid $colorF; display: flex; flex-wrap: wrap; - cursor: text; .search-ipt { color: $colorF; background: none; @@ -64,6 +63,8 @@ border-radius: 20px; background-color: #076773; white-space: nowrap; + font-size: 14px; + line-height: 25px; >.icon-close { color: darken($colorF, 15%); font-size: 12px; diff --git a/themes/yilia/source-src/js/slider.js b/themes/yilia/source-src/js/slider.js index 4f1a511..bfaba8b 100644 --- a/themes/yilia/source-src/js/slider.js +++ b/themes/yilia/source-src/js/slider.js @@ -77,7 +77,7 @@ new Vue({ console.log(event.keyCode) if(event.keyCode == 13){ // 回车键 this.addSearchItem(this.search) - } else if(event.keyCode == 8) { // 退格键 + } else if(event.keyCode == 8 && !this.search) { // 退格键 this.searchItems.pop() } },