From d4bbfd5494607ee446b8b763ea1a3b221f5d1cdc 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: Mon, 6 May 2019 09:43:49 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=BB=E9=A2=98CSS=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- themes/yilia/postcss.config.js | 4 +- themes/yilia/source-src/css/archive.scss | 1 - themes/yilia/source-src/css/article-main.scss | 6 +-- themes/yilia/source-src/css/aside.scss | 37 ++++++++----------- themes/yilia/source-src/css/global.scss | 1 - themes/yilia/source-src/css/grid.scss | 16 ++++---- themes/yilia/source-src/css/left.scss | 4 +- themes/yilia/source-src/css/main.scss | 2 +- .../yilia/source-src/css/mobile-slider.scss | 2 +- themes/yilia/source-src/css/mobile.scss | 14 +++---- themes/yilia/source-src/css/page.scss | 6 +-- themes/yilia/source-src/css/scroll.scss | 2 +- themes/yilia/source-src/css/social.scss | 1 - themes/yilia/webpack.config.js | 1 - 14 files changed, 41 insertions(+), 56 deletions(-) delete mode 100644 themes/yilia/source-src/css/global.scss diff --git a/themes/yilia/postcss.config.js b/themes/yilia/postcss.config.js index 71d77df..c526643 100644 --- a/themes/yilia/postcss.config.js +++ b/themes/yilia/postcss.config.js @@ -2,6 +2,8 @@ module.exports = { plugins: [ // require('postcss-smart-import')({ /* ...options */ }), // require('precss')({ /* ...options */ }), - require('autoprefixer')({ /* ...options */ }) + require('autoprefixer')({ + browsers:['last 2 versions', '> 1%', 'iOS >= 7', 'Android >= 4', 'not ie <= 8'] + }) ] } diff --git a/themes/yilia/source-src/css/archive.scss b/themes/yilia/source-src/css/archive.scss index da75568..adcdbd2 100644 --- a/themes/yilia/source-src/css/archive.scss +++ b/themes/yilia/source-src/css/archive.scss @@ -93,7 +93,6 @@ } .archive-article-date, .article-tag-list{ margin-right: 30px; - display: -moz-inline-stack; display: inline-block; vertical-align: middle; zoom: 1; diff --git a/themes/yilia/source-src/css/article-main.scss b/themes/yilia/source-src/css/article-main.scss index fbc8a5c..a46bc14 100644 --- a/themes/yilia/source-src/css/article-main.scss +++ b/themes/yilia/source-src/css/article-main.scss @@ -112,15 +112,13 @@ text-align: left; float: right; a{ - background: #4d4d4d; + background-color: #4d4d4d; color: $colorF; font-size: 12px; padding: 5px 8px 5px; line-height: 16px; - -webkit-border-radius: 2px; - -moz-border-radius: 2px; border-radius: 2px; - transition: background 0.3s; + transition: background-color 0.3s; &:hover{ background: #3c3c3c; } diff --git a/themes/yilia/source-src/css/aside.scss b/themes/yilia/source-src/css/aside.scss index 6d9e480..fa67358 100644 --- a/themes/yilia/source-src/css/aside.scss +++ b/themes/yilia/source-src/css/aside.scss @@ -19,13 +19,10 @@ width: 40px; text-align: center; } -.jump-container { - &:hover { - .icon-back { - background: rgba(36, 193, 246, 0.9); - } - } +.jump-container:hover .icon-back { + background: rgba(36, 193, 246, 0.9); } + .jump-container, .toc-container { position: relative; cursor: pointer; @@ -49,21 +46,19 @@ left: -2px; } } -.mod-side-operation__jump-to-top { - .icon-back { - transition: 0.3s; - color: $colorF; - background: #ccc; - transform: rotate(90deg); - font-size: 32px; - line-height: 40px; - width: 40px; - text-align: center; - display: block; - &:hover { - background: #24c1f6; - color: #24c1f6; - } +.mod-side-operation__jump-to-top .icon-back { + transition: 0.3s; + color: $colorF; + background: #ccc; + transform: rotate(90deg); + font-size: 32px; + line-height: 40px; + width: 40px; + text-align: center; + display: block; + &:hover { + background: #24c1f6; + color: #24c1f6; } } diff --git a/themes/yilia/source-src/css/global.scss b/themes/yilia/source-src/css/global.scss deleted file mode 100644 index a7b2f67..0000000 --- a/themes/yilia/source-src/css/global.scss +++ /dev/null @@ -1 +0,0 @@ -@import "core"; \ No newline at end of file diff --git a/themes/yilia/source-src/css/grid.scss b/themes/yilia/source-src/css/grid.scss index dc6c070..a600d6e 100644 --- a/themes/yilia/source-src/css/grid.scss +++ b/themes/yilia/source-src/css/grid.scss @@ -1,18 +1,18 @@ body, button, input, select, textarea { - color: #1a1a1a; - font-family: "lucida grande", "lucida sans unicode", lucida, helvetica, "Hiragino Sans GB", "Microsoft YaHei", "WenQuanYi Micro Hei", sans-serif; - font-size: 16px; - font-size: 1rem; - line-height: 1.75; + color: #1a1a1a; + font-family: "lucida grande", "lucida sans unicode", lucida, helvetica, "Hiragino Sans GB", "Microsoft YaHei", "WenQuanYi Micro Hei", sans-serif; + font-size: 16px; + font-size: 1rem; + line-height: 1.75; } body { overflow-y: hidden; background:#eaeaea; } html, body, #container { - height: 100%; - overflow-x: hidden; - overflow-y: auto; + height: 100%; + overflow-x: hidden; + overflow-y: auto; } #mobile-nav { display: none; diff --git a/themes/yilia/source-src/css/left.scss b/themes/yilia/source-src/css/left.scss index af089f6..f2ba9d8 100644 --- a/themes/yilia/source-src/css/left.scss +++ b/themes/yilia/source-src/css/left.scss @@ -1,5 +1,5 @@ .left-col { - background: #fff; + background: $colorBg; width: 300px; position:fixed; opacity:1; @@ -85,7 +85,7 @@ .profilepic{ text-align: center; display: block; - border: 5px solid #fff; + border: 5px solid $colorF; border-radius: 300px; width: 128px; height: 128px; diff --git a/themes/yilia/source-src/css/main.scss b/themes/yilia/source-src/css/main.scss index 92cf982..dc8100f 100644 --- a/themes/yilia/source-src/css/main.scss +++ b/themes/yilia/source-src/css/main.scss @@ -1,4 +1,4 @@ -@import "./global"; +@import "core"; @import "./fonts"; @import "./grid"; @import "./left"; diff --git a/themes/yilia/source-src/css/mobile-slider.scss b/themes/yilia/source-src/css/mobile-slider.scss index f6aa2aa..ea192fd 100644 --- a/themes/yilia/source-src/css/mobile-slider.scss +++ b/themes/yilia/source-src/css/mobile-slider.scss @@ -1,7 +1,7 @@ .profilepic { text-align: center; display: block; - border: 5px solid #fff; + border: 5px solid $colorF; border-radius: 300px; width: 128px; height: 128px; diff --git a/themes/yilia/source-src/css/mobile.scss b/themes/yilia/source-src/css/mobile.scss index 4fec143..fb8e048 100644 --- a/themes/yilia/source-src/css/mobile.scss +++ b/themes/yilia/source-src/css/mobile.scss @@ -16,10 +16,8 @@ html, body, #container { left: 0; position: relative; } -#header{ - .header-nav{ - position: relative; - } +#header .header-nav{ + position: relative; } .wrap-side-operation { display: none; @@ -275,11 +273,9 @@ html, body, #container { } } } -.archives{ - .archive-article{ - padding: 10px 0; - margin-left: 0; - } +.archives .archive-article{ + padding: 10px 0; + margin-left: 0; } #footer { diff --git a/themes/yilia/source-src/css/page.scss b/themes/yilia/source-src/css/page.scss index e8be54d..84a2047 100644 --- a/themes/yilia/source-src/css/page.scss +++ b/themes/yilia/source-src/css/page.scss @@ -33,9 +33,7 @@ .prev.disabled,.next.disabled { visibility: hidden; } - &:hover{ - .extend{ - opacity: 1; - } + &:hover .extend { + opacity: 1; } } \ No newline at end of file diff --git a/themes/yilia/source-src/css/scroll.scss b/themes/yilia/source-src/css/scroll.scss index 65954d7..60f034b 100644 --- a/themes/yilia/source-src/css/scroll.scss +++ b/themes/yilia/source-src/css/scroll.scss @@ -1,6 +1,6 @@ /* 设置滚动条的样式 */ ::-webkit-scrollbar { - width: 10px; + width: 10px; height: 10px; } diff --git a/themes/yilia/source-src/css/social.scss b/themes/yilia/source-src/css/social.scss index 1a88b35..447d3f3 100644 --- a/themes/yilia/source-src/css/social.scss +++ b/themes/yilia/source-src/css/social.scss @@ -10,7 +10,6 @@ justify-content: center; a { border-radius:50%; - display:-moz-inline-stack; display:inline-block; vertical-align:middle; *vertical-align:auto; diff --git a/themes/yilia/webpack.config.js b/themes/yilia/webpack.config.js index 8d737fc..3665ca9 100644 --- a/themes/yilia/webpack.config.js +++ b/themes/yilia/webpack.config.js @@ -15,7 +15,6 @@ module.exports = { main: "./source-src/js/main.js", slider: "./source-src/js/slider.js", mobile: ["babel-polyfill", "./source-src/js/mobile.js"], - // comment: "./source-src/js/comment.js", viewer: "./source-src/js/viewer.js", waifu: "./source-src/js/waifu.js" },