diff --git a/themes/yilia/source-src/css/article-main.scss b/themes/yilia/source-src/css/article-main.scss index 631e71f..e2eae3e 100644 --- a/themes/yilia/source-src/css/article-main.scss +++ b/themes/yilia/source-src/css/article-main.scss @@ -23,7 +23,7 @@ border-style: solid; border-color: #fff #ddd; background: $colorBg; - transition: all 0.2s ease-in; + @extend %trans; img{ max-width: 100%; } diff --git a/themes/yilia/source-src/css/core/_mixin.scss b/themes/yilia/source-src/css/core/_mixin.scss index 9f06e6d..fadc982 100644 --- a/themes/yilia/source-src/css/core/_mixin.scss +++ b/themes/yilia/source-src/css/core/_mixin.scss @@ -645,8 +645,7 @@ @if $colorBorder { border-color: nth($colorBorder, 1); } - &:hover, - &:active { + &:hover,&:active { @if length($colorText) == 2 { color: nth($colorText, 2); } @@ -686,12 +685,10 @@ %trans { transition: all 0.2s ease-in; - -ms-transition: all 0.2s ease-in; } %trans8 { transition: all 0.8s ease-in; - -ms-transition: all 0.8s ease-in; } %paper-bg { diff --git a/themes/yilia/source-src/css/left.scss b/themes/yilia/source-src/css/left.scss index 2d43eab..806c174 100644 --- a/themes/yilia/source-src/css/left.scss +++ b/themes/yilia/source-src/css/left.scss @@ -3,7 +3,7 @@ width: 300px; position:fixed; opacity:1; - transition:all .2s ease-in; + @extend %trans; height:100%; z-index: 999; &.show { @@ -13,7 +13,8 @@ width: 100%; height: 150px; position: absolute; - background: #4d4d4d; + background: #4d4d4d; + @extend %trans; } .intrude-less { @@ -93,7 +94,7 @@ position: relative; overflow: hidden; background: #88acdb; - -webkit-transition: all 0.2s ease-in; + @extend %trans; display: -webkit-box; -webkit-box-orient: horizontal; -webkit-box-pack: center; @@ -107,7 +108,7 @@ width: 100%; height: 100%; opacity: 1; - -webkit-transition: all 0.2s ease-in; + @extend %trans; &.show{ width: 100%; height: 100%; diff --git a/themes/yilia/source-src/css/mobile-slider.scss b/themes/yilia/source-src/css/mobile-slider.scss index 1ec058c..83f3f4d 100644 --- a/themes/yilia/source-src/css/mobile-slider.scss +++ b/themes/yilia/source-src/css/mobile-slider.scss @@ -1,34 +1,34 @@ .profilepic { - text-align: center; - display: block; - border: 5px solid $colorF; - border-radius: 300px; - width: 128px; - height: 128px; - margin: 0 auto; - position: relative; - overflow: hidden; - background: #88acdb; - transition: all 0.2s ease-in; - text-align: center; + text-align: center; + display: block; + border: 5px solid $colorF; + border-radius: 300px; + width: 128px; + height: 128px; + margin: 0 auto; + position: relative; + overflow: hidden; + background: #88acdb; + transition: all 0.2s ease-in; + text-align: center; } .header-author { - text-align: center; - margin: 0.67em 0; - font-size: 30px; - transition: 0.3s; + text-align: center; + margin: 0.67em 0; + font-size: 30px; + transition: all 0.2s ease-in; } .header-subtitle { - text-align: center; - color: $color9; - font-size: 14px; - line-height: 25px; - overflow: hidden; - text-overflow: ellipsis; - display: -webkit-box; - -webkit-line-clamp: 2; - -webkit-box-orient: vertical; + text-align: center; + color: $color9; + font-size: 14px; + line-height: 25px; + overflow: hidden; + text-overflow: ellipsis; + display: -webkit-box; + -webkit-line-clamp: 2; + -webkit-box-orient: vertical; } .header-subtitle { - padding: 0 24px; + padding: 0 24px; } \ No newline at end of file diff --git a/themes/yilia/source-src/css/mobile.scss b/themes/yilia/source-src/css/mobile.scss index 9136054..fee28f8 100644 --- a/themes/yilia/source-src/css/mobile.scss +++ b/themes/yilia/source-src/css/mobile.scss @@ -115,7 +115,6 @@ html, body, #container { min-height: 40px; padding-top: 10px; margin: 0; - border-top: 1px solid #ddd; } .article-info-post.article-info{ margin: 0; diff --git a/themes/yilia/source-src/css/night.scss b/themes/yilia/source-src/css/night.scss index 6b51cb0..a6b2a8c 100644 --- a/themes/yilia/source-src/css/night.scss +++ b/themes/yilia/source-src/css/night.scss @@ -28,7 +28,8 @@ body.night { background: #2c2c2c; } h1,h2,h3,h4,h5,h6 { // 章节标题 - color: #b8a7a7; + color: $colorC; + border-bottom-color: $borderColor_night; } } // 归档列表 @@ -52,15 +53,24 @@ body.night { .overlay { background: none; } - // 头像 看板娘 - .profilepic, .waifu { + // 头像 看板娘 图标 -> 降低亮度滤镜 + .profilepic, .waifu, #header .header-nav .social a { filter: brightness(30%); } // 评论 #comments { background: none; } + // 文章信息栏 + .article-info-index.article-info { + border-top-color: $borderColor_night; + } #footer { color: $textColor_night; } + // 高亮关键字 + .article-entry p code, .article-entry li code { + background: $mainBg_night; + color: #bf7676; + } } \ No newline at end of file diff --git a/themes/yilia/source-src/css/reward.scss b/themes/yilia/source-src/css/reward.scss index 9baebcb..ed02266 100644 --- a/themes/yilia/source-src/css/reward.scss +++ b/themes/yilia/source-src/css/reward.scss @@ -12,7 +12,6 @@ background: #f44336; border-radius: 50%; box-shadow: 0 2px 5px 0 rgba(0,0,0,0.16),0 2px 10px 0 rgba(0,0,0,0.12); - -webkit-transition: .4s ease-in-out; transition: .4s ease-in-out; &:hover, &:active { box-shadow: 0 6px 12px rgba(0,0,0,0.2),0 4px 15px rgba(0,0,0,0.2); diff --git a/themes/yilia/source-src/css/share.scss b/themes/yilia/source-src/css/share.scss index 90d69eb..91aa753 100644 --- a/themes/yilia/source-src/css/share.scss +++ b/themes/yilia/source-src/css/share.scss @@ -18,7 +18,6 @@ vertical-align: middle; zoom: 1; margin: 10px; - -webkit-transition: 0.3s; transition: 0.3s; text-align: center; color: $colorF; @@ -97,7 +96,6 @@ opacity: 0; filter: alpha(opacity=0); pointer-events: none; - -webkit-transition: .3s ease-in-out; transition: .3s ease-in-out; &.in { visibility: visible; diff --git a/themes/yilia/source-src/css/tools.scss b/themes/yilia/source-src/css/tools.scss index 577fe9d..2f149e2 100644 --- a/themes/yilia/source-src/css/tools.scss +++ b/themes/yilia/source-src/css/tools.scss @@ -213,19 +213,15 @@ label.bui-switch-label { } } &.bui-switch-animbg { - -webkit-transition: background-color ease $duration; transition: background-color ease $duration; .bui-switch:before { - -webkit-transition: left 0.3s; transition: left 0.3s; } input:checked + .bui-switch { box-shadow: #dfdfdf 0 0 0 0 inset; background-color: $checkedColor; - -webkit-transition: border-color $duration, background-color ease $duration; transition: border-color $duration, background-color ease $duration; &:before { - -webkit-transition: left 0.3s; transition: left 0.3s; } } diff --git a/themes/yilia/source-src/css/tooltip.scss b/themes/yilia/source-src/css/tooltip.scss index 704eee7..fde540b 100644 --- a/themes/yilia/source-src/css/tooltip.scss +++ b/themes/yilia/source-src/css/tooltip.scss @@ -16,14 +16,9 @@ /* Trigger item */ - @-webkit-keyframes pulse { - from { -webkit-transform: scale3d(0.5,0.5,1); } - to { -webkit-transform: scale3d(1,1,1); } - } - @keyframes pulse { - from { -webkit-transform: scale3d(0.5,0.5,1); transform: scale3d(0.5,0.5,1); } - to { -webkit-transform: scale3d(1,1,1); transform: scale3d(1,1,1); } + from { transform: scale3d(0.5,0.5,1); } + to { transform: scale3d(1,1,1); } } /* Tooltip */ @@ -43,29 +38,23 @@ cursor: default; pointer-events: none; -webkit-font-smoothing: antialiased; - -webkit-transition: opacity 0.3s, -webkit-transform 0.3s; transition: opacity 0.3s, transform 0.3s; } .tooltip-west .tooltip-content { left: 3.5em; - -webkit-transform-origin: -2em 50%; transform-origin: -2em 50%; - -webkit-transform: translate3d(0,50%,0) rotate3d(1,1,1,30deg); transform: translate3d(0,50%,0) rotate3d(1,1,1,30deg); } .tooltip-east .tooltip-content { right: 3.5em; - -webkit-transform-origin: calc(100% + 2em) 50%; transform-origin: calc(100% + 2em) 50%; - -webkit-transform: translate3d(0,50%,0) rotate3d(1,1,1,-30deg); transform: translate3d(0,50%,0) rotate3d(1,1,1,-30deg); } .tooltip:hover .tooltip-content { opacity: 1; - -webkit-transform: translate3d(0,50%,0) rotate3d(0,0,0,0); transform: translate3d(0,50%,0) rotate3d(0,0,0,0); pointer-events: auto; } @@ -103,7 +92,6 @@ } .tooltip-east .tooltip-content::after { - -webkit-transform: scale3d(-1,1,1); transform: scale3d(-1,1,1); } } @@ -152,15 +140,13 @@ pointer-events: none; font-family: 'Satisfy', cursive; -webkit-font-smoothing: antialiased; - -webkit-transition: opacity 0.3s 0.3s; - transition: opacity 0.3s 0.3s; + transition: opacity 0.3s ease-in; padding-bottom: 80px; } .tooltip:hover .tooltip-content { opacity: 1; pointer-events: auto; - -webkit-transition-delay: 0s; transition-delay: 0s; } @@ -171,32 +157,24 @@ .tooltip-text { border-bottom: 10px solid #4d4d4d; overflow: hidden; - -webkit-transform: scale3d(0,1,1); transform: scale3d(0,1,1); - -webkit-transition: -webkit-transform 0.3s 0.3s; - transition: transform 0.3s 0.3s; + transition: transform 0.3s ease-in; } .tooltip:hover .tooltip-text { - -webkit-transition-delay: 0s; transition-delay: 0s; - -webkit-transform: scale3d(1,1,1); transform: scale3d(1,1,1); } .tooltip-inner { background: rgba(36,193,246,0.9); padding: 40px; - -webkit-transform: translate3d(0,100%,0); transform: translate3d(0,100%,0); - -webkit-transition: -webkit-transform 0.3s; - transition: transform 0.3s; + transition: transform 0.3s ease-in; } .tooltip:hover .tooltip-inner { - -webkit-transition-delay: 0.3s; transition-delay: 0.3s; - -webkit-transform: translate3d(0,0,0); transform: translate3d(0,0,0); } diff --git a/themes/yilia/source-src/css/waifu.scss b/themes/yilia/source-src/css/waifu.scss index a28157f..47b8d5a 100644 --- a/themes/yilia/source-src/css/waifu.scss +++ b/themes/yilia/source-src/css/waifu.scss @@ -70,7 +70,7 @@ padding: 0 4px; margin-bottom: 4px; line-height: 20px; - transition: 0.2s; + @extend %trans; animation-duration: 30s; animation-iteration-count: infinite; animation-name: shake;