From cc94bbba9fc00966af3dab0f3af632e59e2605ef Mon Sep 17 00:00:00 2001 From: XPoet Date: Wed, 1 Apr 2020 23:03:38 +0800 Subject: [PATCH] =?UTF-8?q?style:=20CSS=20=E6=A0=B7=E5=BC=8F=E4=BC=98?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../layout/_partial/article-meta-info.styl | 9 ++-- source/css/layout/_partial/footer.styl | 17 +++++-- source/css/layout/archive-content.styl | 8 ++-- source/css/layout/article-content.styl | 11 ++--- source/css/layout/common/variables.styl | 48 +++++++++---------- source/css/layout/home-content.styl | 8 ---- source/css/layout/page.styl | 4 +- 7 files changed, 50 insertions(+), 55 deletions(-) diff --git a/source/css/layout/_partial/article-meta-info.styl b/source/css/layout/_partial/article-meta-info.styl index 069f064..c53662d 100644 --- a/source/css/layout/_partial/article-meta-info.styl +++ b/source/css/layout/_partial/article-meta-info.styl @@ -1,15 +1,18 @@ @require '../common/variables.styl' -$article-meta-info-color = #aaa; $article-meta-info-font-size = 12px; .article-meta-info { - color: $article-meta-info-color; + color: $third-text-color; font-size: $article-meta-info-font-size; .article-meta-item { margin-right: 10px; + + &:last-child { + margin-right: 0; + } } .article-tags, .article-categories { @@ -20,7 +23,7 @@ $article-meta-info-font-size = 12px; } a { - color: $article-meta-info-color; + color: $third-text-color; &:hover { color: $primary-color; diff --git a/source/css/layout/_partial/footer.styl b/source/css/layout/_partial/footer.styl index d189123..013f704 100644 --- a/source/css/layout/_partial/footer.styl +++ b/source/css/layout/_partial/footer.styl @@ -1,12 +1,23 @@ +@require '../common/variables.styl' .footer { + color: $third-text-color; + + a { + color: $third-text-color; + + &:hover { + color: $primary-color; + } + } + .info-container { - padding-bottom 10px - text-align center + padding-bottom: 10px; + text-align: center; } .info-item { - margin 5px 0 + margin: 5px 0; } } \ No newline at end of file diff --git a/source/css/layout/archive-content.styl b/source/css/layout/archive-content.styl index 401f42a..6cf38bb 100644 --- a/source/css/layout/archive-content.styl +++ b/source/css/layout/archive-content.styl @@ -1,8 +1,8 @@ @require 'common/variables.styl' $archive-year-font-size = 24px; -$archive-article-item-title-font-size = 16px; -$archive-article-date-font-size = 14px; +$article-title-font-size = 16px; +$article-date-font-size = 14px; .archive-container { @@ -25,7 +25,7 @@ $archive-article-date-font-size = 14px; .article-item { margin: 20px 0; - font-size: $archive-article-item-title-font-size; + font-size: $article-title-font-size; a.article-title { color: $normal-text-color; @@ -36,7 +36,7 @@ $archive-article-date-font-size = 14px; } .article-date { - font-size: $archive-article-date-font-size; + font-size: $article-date-font-size; float: right; } } diff --git a/source/css/layout/article-content.styl b/source/css/layout/article-content.styl index b407911..effc3bf 100644 --- a/source/css/layout/article-content.styl +++ b/source/css/layout/article-content.styl @@ -5,9 +5,7 @@ .article-title { h3 { - text-transform: uppercase; font-weight: 600; - color: $second-text-color; font-size: 22px; margin: 0; } @@ -23,17 +21,14 @@ } .article-content { - - padding-bottom: 10px; - border-bottom: 1px solid #f2f2f2; - + padding-bottom: 20px; + border-bottom: 1px solid $border-color; } .article-nav { - height 40px - margin 30px 0 + margin 40px 0 .article-prev { float left diff --git a/source/css/layout/common/variables.styl b/source/css/layout/common/variables.styl index f06e07a..77b379d 100644 --- a/source/css/layout/common/variables.styl +++ b/source/css/layout/common/variables.styl @@ -1,5 +1,25 @@ +// ================================== +// ils-x variables +// ================================== + +// 头部默认高度 +$header-height = 100px + +// 头部收缩高度 +$header-shrink-height = 60px + +// 中间内容区域宽度 +$main-content-width = 70% + +// z-index +$z-index-1 = 1001 +$z-index-2 = 1002 +$z-index-3 = 1003 +$z-index-4 = 1004 +$z-index-5 = 1005 + // 主题颜色 -$primary-color = #5ace11 +$primary-color = #ce3e29 // 第一文本颜色 $first-text-color = #2c3e50 @@ -30,28 +50,4 @@ $default-font-size = 14px $default-font-line-height = 20px // 默认字体加粗程度 -$default-font-weight = 400 - -// 超链接a标签颜色 -$a-color = #666 - - - -// ================================== -// ils-x variables -// ================================== - -// 头部默认高度 -$header-height = 100px - -// 头部收缩高度 -$header-shrink-height = 60px - -// 中间内容区域宽度 -$main-content-width = 70% - -$z-index-1 = 1001 -$z-index-2 = 1002 -$z-index-3 = 1003 -$z-index-4 = 1004 -$z-index-5 = 1005 \ No newline at end of file +$default-font-weight = 400 \ No newline at end of file diff --git a/source/css/layout/home-content.styl b/source/css/layout/home-content.styl index cad80e6..5f9d7be 100644 --- a/source/css/layout/home-content.styl +++ b/source/css/layout/home-content.styl @@ -24,14 +24,6 @@ transition: all 0.5s ease; } - - &:hover { - &::before { - opacity: 0; - } - } - - font-weight: 600; color: $second-text-color; font-size: 22px; diff --git a/source/css/layout/page.styl b/source/css/layout/page.styl index 9fc8787..a4e3c55 100644 --- a/source/css/layout/page.styl +++ b/source/css/layout/page.styl @@ -8,7 +8,7 @@ top: 0; width: 100%; height: $header-height; - z-index: 999; + z-index: $z-index-5; transition: all 0.5s ease; } @@ -24,8 +24,6 @@ position: relative; padding: 40px 0; } - - } .page-bottom {