diff --git a/layout/_partial/article.ejs b/layout/_partial/article.ejs index dfc2a76..4781755 100755 --- a/layout/_partial/article.ejs +++ b/layout/_partial/article.ejs @@ -73,11 +73,9 @@ <% } %> <% if (post.comments) { %> - <% if (config.disqus_shortname || config.livere_shortname || config.valine){ %> -

  评论

- <% } %> <% if (config.disqus_shortname) { %> +

  Disqus评论

⚠️ 无法加载评论系统，请确保您的网络能够正常访问 Disqus 。 @@ -86,6 +84,7 @@ <% } %> <% if (config.livere_shortname){ %> +

  LiveRe评论

@@ -95,6 +94,7 @@ <% if (config.valine){ %> <% if (config.valine.enable && config.valine.appId && config.valine.appKey){ %> +

  Valine评论

diff --git a/source/less/_article.less b/source/less/_article.less index 569f362..85f7fec 100755 --- a/source/less/_article.less +++ b/source/less/_article.less @@ -28,7 +28,8 @@ } hr { border: 0; - border-bottom: 1px solid #ddd; + border-radius: 2px; + border-bottom: 2px solid rgba(0,0,0,0.1); } p.small-img, div.small-img { @@ -156,12 +157,27 @@ border-left: 4px solid @theme-bg-quote; border-top-right-radius: 8px; border-bottom-right-radius: 8px; + border-top-left-radius: 4px; + border-bottom-left-radius: 4px; + border-right: 1px solid transparent; + border-top: 1px solid transparent; + border-bottom: 1px solid transparent; + .enable-trans(); + &:hover{ + border-left: 8px solid @theme-bg-quote; + border-top-left-radius: 8px; + border-bottom-left-radius: 8px; + border-right: 1px solid fade(@theme-bg-quote, 50%); + border-top: 1px solid fade(@theme-bg-quote, 50%); + border-bottom: 1px solid fade(@theme-bg-quote, 50%); + } footer { strong { margin-right: 7px; } } + } pre { display: block; @@ -198,7 +214,7 @@ background-color: fade(@theme-bg-header, 90%); padding: .2em 2.4em; color: @theme-text-in-header; - border-radius: 3px; + border-radius: @border-radius-width/2; .enable-trans(); &:hover { background: darken(@theme-bg-header, 10%); @@ -216,7 +232,7 @@ font-size: @small-font-size; line-height: @base-line-height; margin-top: @gap; - background: darken(white, 4%); + background: darken(fade(@theme-bg-main, 50%), 5%); &.article-tags { background: transparent; } diff --git a/source/less/_base.less b/source/less/_base.less index 92e0a95..328fd49 100755 --- a/source/less/_base.less +++ b/source/less/_base.less @@ -299,9 +299,11 @@ li { &:hover { border-left: 4px solid @theme-bg-quote; padding: 8px; + border-radius: 4px; background: fade(@theme-bg-quote, 10%); } &:active { + border-radius: 8px; border-left: 8px solid @theme-bg-quote; } } diff --git a/source/less/_defines.less b/source/less/_defines.less index b9a5506..c0e9f0b 100755 --- a/source/less/_defines.less +++ b/source/less/_defines.less @@ -42,6 +42,7 @@ @material-yellow: #FCEC60; @material-amber: #F6C344; +@ax-light-pink: #E7BED0; @ax-red: #F05153; @ax-blue: #52A1F8; @@ -55,18 +56,17 @@ @black: #444444; @grey-color: #828282; @white: #ffffff; +@light: #eeeeee; @dark: #666666; // 自定义主题色 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> // 网页背景 @theme-bg-main: #EFEFEF; -// @theme-bg-main: #444; // 导航栏背景（主题色） -@theme-bg-header: @xiaowenwen-green; +@theme-bg-header: @ax-red; // 卡片背景 @theme-bg-card: #FFF; -// @theme-bg-card: lighten(@theme-bg-main, 10%); // 代码块的背景色 @theme-bg-code: #F5F5F5; // 引用的颜色 和 分类、归档的 hover 时颜色 @@ -76,11 +76,16 @@ // 链接颜色 @theme-text-link: @ax-blue; // 链接高亮颜色 -@theme-text-highlight: @material-orange; +@theme-text-highlight: @mac-minimize; // 在主题色中显示的文本（白或深灰） @theme-text-in-header: white; @theme-text-main: @dark; -// @theme-text-main: white; + + +// @theme-bg-main: #444; +// @theme-bg-card: lighten(@theme-bg-main, 10%); +// @theme-bg-code: #555555; +// @theme-text-main: @light; // 自定义主题色 <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< diff --git a/source/less/_main.less b/source/less/_main.less index 387a521..89002c7 100755 --- a/source/less/_main.less +++ b/source/less/_main.less @@ -18,6 +18,39 @@ @media(max-width: @on-phone) { // padding-top: @gap; } + #valine_container{ + .info{ + display: none; + } + .vwrap{ + border-radius: @border-radius-width; + border-style: dashed; + .enable-trans(); + &:hover{ + border: 1px solid fade(@theme-bg-quote, 70%); + } + .vcontrol{ + .col.col-80.text-right{ + .vsubmit.vbtn{ + border: none; + padding-left: 2.4em; + padding-right: 2.4em; + background-color: fade(@theme-bg-header, 90%); + color: @theme-text-in-header; + border-radius: @border-radius-width/2; + .enable-trans(); + &:hover { + background: darken(@theme-bg-header, 10%); + } + &:active { + background: lighten(@theme-bg-header, 20%); + } + } + } + } + } + } + } .post-wrapper{ // for firefox @@ -183,6 +216,11 @@ padding-left: @gap; padding-right: @gap; width:~"calc(100% - 0 * @{gap})"; + border: 1px solid transparent; + .enable-trans(); + &:hover{ + border: 1px solid fade(@theme-bg-quote, 50%); + } } img { max-width: 100%; diff --git a/source/less/_toc.less b/source/less/_toc.less index 00c4078..2ea21e3 100755 --- a/source/less/_toc.less +++ b/source/less/_toc.less @@ -54,21 +54,23 @@ background: @theme-bg-card; a { padding-left: 8px; - color: @theme-text-main; + color: fade(@theme-text-main, 60%); font-size: @small-font-size; display: inline-block; - border-left: 2px solid transparent; - + border-left: 4px solid transparent; &:hover{ + color: fade(@theme-text-main, 100%); border-left: 4px solid @theme-bg-quote; } &:active{ border-left: 8px solid @theme-bg-quote; } &.active{ + color: fade(@theme-text-main, 100%); border-left: 4px solid @theme-bg-quote; background: fade(@theme-bg-quote, 10%); } + } ol{ .toc-item.toc-level-1 { diff --git a/source/less/_widget.less b/source/less/_widget.less index 71f81a8..5a77096 100755 --- a/source/less/_widget.less +++ b/source/less/_widget.less @@ -93,7 +93,8 @@ } .m_widget.tagcloud{ .content{ - padding: 10px 20px; + text-align: justify; + padding: @gap/2 @gap; a{ display:inline-block; .enable-trans(.1s); @@ -105,3 +106,8 @@ } } } +.m_widget.music{ + .content{ + padding: @gap/2; + } +}