From 84dd201dafe1f728e02893e02ffde70d496a7ac2 Mon Sep 17 00:00:00 2001 From: xaoxuu Date: Thu, 4 Apr 2019 00:01:37 +0800 Subject: [PATCH] update --- _config.yml | 4 ++-- layout/_cover/search.ejs | 2 +- layout/index.ejs | 26 ++++---------------------- layout/layout.ejs | 27 ++++++++++++++++----------- source/less/_base.less | 2 +- 5 files changed, 24 insertions(+), 37 deletions(-) diff --git a/_config.yml b/_config.yml index 670b507..03a6051 100755 --- a/_config.yml +++ b/_config.yml @@ -49,9 +49,9 @@ updated_date_format: 'llll' # 文章更新日期的格式 # 主页封面 home_cover: scheme: search # 后期将会提供多种封面方案 - # height: half # full: 封面占据整个第一屏幕， half: 封面只占半个屏幕高度 + # height: half # full（默认值）: 首页封面占据整个第一屏幕，其他页面占半个屏幕高度， half: 所有页面都封面都只占半个屏幕高度 title: "xaoxuu" - # logo: assets/logo.png + # logo: assets/logo.png # logo和title只显示一个，若同时设置，则只显示logo # search_placeholder: '搜索' # 主页封面菜单 features: diff --git a/layout/_cover/search.ejs b/layout/_cover/search.ejs index 3404a26..06daa51 100755 --- a/layout/_cover/search.ejs +++ b/layout/_cover/search.ejs @@ -12,7 +12,7 @@ <% } %> -
+
    <% if (theme.home_cover.features) { %> <% (theme.home_cover.features || []).forEach(function(value){ %> diff --git a/layout/index.ejs b/layout/index.ejs index 4009c48..dd5a1ec 100755 --- a/layout/index.ejs +++ b/layout/index.ejs @@ -1,23 +1,5 @@ -<% if (page.prev == 0 && theme.home_cover) { %> -
    -
    - <% if (theme.home_cover.scheme == 'search') { %> - <%- partial('_cover/search') %> - <% } %> -
    - <%- partial('_partial/header', null, {cache: !config.relative_link, path: path}) %> -
    -<% } else { %> - <%- partial('_partial/header', null, {cache: !config.relative_link, path: path}) %> -<% } %> -
    -
    -
    - <%- partial('_partial/archive') %> -
    - <%- partial('_partial/side') %> - <%- partial('_partial/footer', null, {cache: !config.relative_link}) %> - -
    - +
    + <%- partial('_partial/archive') %>
    +<%- partial('_partial/side') %> +<%- partial('_partial/footer', null, {cache: !config.relative_link}) %> diff --git a/layout/layout.ejs b/layout/layout.ejs index daa1a7b..6532d0a 100755 --- a/layout/layout.ejs +++ b/layout/layout.ejs @@ -2,20 +2,25 @@ <%- partial('_partial/head') %> - <% if (is_home()) { %> - <%- body %> - <% } else { %> - <%- partial('_partial/header', null, {cache: !config.relative_link, path: path}) %> -
    -
    - <%- body %> - + <% if (!page.prev && theme.home_cover) { %> +
    +
    + <% if (theme.home_cover.scheme == 'search') { %> + <%- partial('_cover/search') %> + <% } %>
    - + <%- partial('_partial/header', null, {cache: !config.relative_link, path: path}) %>
    + <% } else { %> + <%- partial('_partial/header', null, {cache: !config.relative_link, path: path}) %> <% } %> - - +
    +
    + <%- body %> + +
    + +
    <%- partial('_partial/scripts') %> diff --git a/source/less/_base.less b/source/less/_base.less index fc9a8cf..6ab20e8 100755 --- a/source/less/_base.less +++ b/source/less/_base.less @@ -180,7 +180,7 @@ fancybox{ .enable-trans(); color: fade(@color_text_main, 70%); border-bottom: 1px solid transparent; - &:hover{ + &:hover, &.active{ color: @theme_main; border-bottom: 1px solid @theme_main; }