Merge branch 'master' into docs

4 years ago · 7b95e5b4f0
parent 2ad2d877f1 2d04a0bb0b
commit 7b95e5b4f0
8 changed files with 54 additions and 24 deletions
--- a/README.md
+++ b/README.md
@ -55,13 +55,13 @@ A minimalist card-style Hexo blog theme.
 ### A. Full automatic installation using scripts (currently only macOS is supported)

 1. Open a terminal and enter the following command to install the script, see [# hexo.sh](https://xaoxuu.com/wiki/hexo.sh/) for the script document.
-```bash
+```sh
 curl -s https://xaoxuu.com/install | sh -s hexo.sh
 ```

 2. After successful installation, open a terminal on your blog path and enter the following command to install the theme and dependencies.
-```bash
-hexo.sh i x
+```sh
+hexo.sh i v
 ```


@ -69,12 +69,12 @@ hexo.sh i x
 ### B. Manual installation

 1. Download theme to `themes /` folder
-```bash
+```sh
 git clone https://github.com/xaoxuu/hexo-theme-volantis themes/volantis
 ```

 2. Then install the necessary dependencies
-```bash
+```sh
 npm i -S hexo-generator-search hexo-generator-json-content hexo-renderer-less
 ```

@ -148,13 +148,13 @@ https://xaoxuu.com/wiki/volantis/
 ### A. 使用脚本全自动安装（目前仅支持macOS）

 1. 打开终端输入下面命令安装脚本，脚本文档见[#hexo.sh](https://xaoxuu.com/wiki/hexo.sh/)。
-```bash
+```sh
 curl -s https://xaoxuu.com/install | sh -s hexo.sh
 ```

 2. 安装成功后，在你的博客路径打开终端，输入下面命令即可安装主题和依赖包。
-```bash
-hexo.sh i x
+```sh
+hexo.sh i v
 ```


@ -162,12 +162,12 @@ hexo.sh i x
 ### B. 手动安装

 1. 下载主题到 `themes/` 文件夹
-```bash
+```sh
 git clone https://github.com/xaoxuu/hexo-theme-volantis themes/volantis
 ```

 2. 然后安装必要的依赖包
-```bash
+```sh
 npm i -S hexo-generator-search hexo-generator-json-content hexo-renderer-less
 ```

--- a/_config.yml
+++ b/_config.yml
@ -5,7 +5,7 @@ info:
  docs: https://xaoxuu.com/wiki/volantis/
  cdn: # 要使用CDN，请在根目录的config文件中写上 use_cdn: true
    css:
-      style: https://cdn.jsdelivr.net/gh/xaoxuu/cdn-volantis@20.2.25/css/style.css
+      # style: https://cdn.jsdelivr.net/gh/xaoxuu/cdn-volantis@20.2.25/css/style.css
    js:
      app: https://cdn.jsdelivr.net/gh/xaoxuu/cdn-volantis@20.2.22/js/app.js
      search: https://cdn.jsdelivr.net/gh/xaoxuu/cdn-volantis@20.2.22/js/search.js
@ -48,6 +48,7 @@ backstretch:
  position: background  # cover: 封面背景   background: 整个网页背景
  duration: 6000        # 持续时间（毫秒）
  fade: 2500            # 渐变（毫秒）
+  is_dark: #true         # 图片是否是暗色的（调整文字为白色）
  images:
    - https://i.loli.net/2020/02/08/HNuVoted2mUxILl.jpg
    # - https://i.loli.net/2020/02/08/dNJyR4LHtarTqPu.jpg
@ -63,7 +64,6 @@ cover:
  title: Volantis
  # logo: assets/logo.png    # logo和title只显示一个，若同时设置，则只显示logo
  search: 'for Hexo 4.2+'
-  # color: '#FFF' # 菜单文字颜色
  # 主页封面菜单
  features:
    - name: 公告
--- a/layout/_cover/search.ejs
+++ b/layout/_cover/search.ejs
@ -1,7 +1,7 @@
 <% if (theme.cover.logo) { %>
  <img class='logo' src='<%- url_for(theme.cover.logo) %>'/>
 <% } else { %>
-  <h1 class='title'><%- theme.cover.title ? theme.cover.title : config.title %></h1>
+  <p class="title <%- theme.backstretch && theme.backstretch.is_dark ? 'white' : '' %>"><%- theme.cover.title ? theme.cover.title : config.title %></p>
 <% } %>
 <% if (theme.search.enable === true) { %>
  <div class="m_search">
@ -16,7 +16,7 @@
    <% if (theme.cover.features) { %>
      <% (theme.cover.features || []).forEach(function(value){ %>
        <li>
-          <a class="nav home" style="color: <%- theme.cover && theme.cover.color %>"
+          <a class="nav home <%- theme.backstretch && theme.backstretch.is_dark ? 'white' : '' %>"
            href="<%= url_for(value.url) %>"
            <% if (value.rel) { %>
              rel="<%- value.rel %>"
--- a/layout/_partial/footer.ejs
+++ b/layout/_partial/footer.ejs
@ -1,4 +1,4 @@
-<footer class="clearfix">
+<footer class="clearfix <%- theme.backstretch && theme.backstretch.is_dark ? 'white' : '' %>">
  <br><br>
  <% if (theme.social) { %>
    <div class="social-wrapper">
--- a/source/less/_article.less
+++ b/source/less/_article.less
@ -55,11 +55,14 @@
    }
    max-width: 100%;
    overflow: auto;
-    .mjx-math{
+    &.has-jax{
      font-family: @fontfamily_code;
      background: @color_bg_mathjax;
-      padding: @gap/2;
+      padding: @gap @gap/2;
      border-radius: @border_radius_code_block;
+      .mjx-chtml.MJXc-display{
+        margin: 0;
+      }
    }
  }
  ul,
@ -68,7 +71,8 @@
    list-style: initial;
    padding-left: 8px;
    margin-left: @gap;
-    margin-bottom: .5em;
+    margin-top: .6em;
+    margin-bottom: .6em;
    &.task-list{
      padding-left: 0;
      margin-left: 4px;
@ -443,7 +447,7 @@
      background: @color_text_link;
      color: @color_text_in_header;
      padding: 2px 5px 0px 5px;
-      margin: 2px;
+      // margin: 1px;
      border-radius: 2px;
      .enable-trans();
      &:hover {
@ -458,6 +462,12 @@
        padding: 2px 3px 0px 3px;
      }
    }
+    &.regular {
+      a {
+        line-height: 50px;
+        padding: 9px 16px 8px 16px;
+      }
+    }
  }
  .large, .huge {
    margin: 0;
--- a/source/less/_base.less
+++ b/source/less/_base.less
@ -62,6 +62,7 @@ fancybox{
    align-items: center;
    align-self: center;
    align-content: center;
+    color: fade(@color_text_main, 85%);
    // padding: @gap;
    .title, .logo{
      font-size: @fontsize_h1*2;
@ -76,6 +77,10 @@ fancybox{
      max-height: 100px;
      max-width: ~"calc(100% - 4*@{gap})";
    }
+    .white{
+      color: white;
+      text-shadow: 0 1px 2px rgba(0, 0, 0, 0.1);
+    }
    @media(max-width: @on_phone){
      .title, .logo {
        font-size: @fontsize_h1*2;
@ -164,9 +169,6 @@ fancybox{
        margin-top: @gap;
      }
    }
-    &, a{
-      color: @theme_main;
-    }
    .menu{
      margin-top: @gap;
      ul {
@ -189,10 +191,18 @@ fancybox{
        .enable-trans();
        color: fade(@color_text_main, 85%);
        border-bottom: 1px solid transparent;
-        &:hover, &.active{
+        &:hover, &.active, &:active{
          color: @theme_main;
          border-bottom: 1px solid @theme_main;
        }
+        &.white{
+          color: fade(white, 70%);
+          text-shadow: 0 1px 2px rgba(0, 0, 0, 0.1);
+          &:hover, &.active, &:active{
+            color: white;
+            border-bottom: 1px solid white;
+          }
+        }
      }
    }
    .switcher{
--- a/source/less/_color.less
+++ b/source/less/_color.less
@ -3,7 +3,7 @@
@theme_background: #F4F4F4;
 // @theme_background: #454545; // 暗色主题
 // 主题色
-@theme_main: #1BC3FB;
+@theme_main: @color_md_blue;
 // 卡片背景颜色
@theme_cardbg: white;
 // @theme_cardbg: #555; // 暗色主题
--- a/source/less/_footer.less
+++ b/source/less/_footer.less
@ -8,6 +8,16 @@ footer {
  overflow: hidden;
  text-align: center;
  font-family: @fontfamily_base;
+  &.white, &.white a{
+    text-shadow: 0 1px 2px rgba(0, 0, 0, 0.1);
+  }
+  &.white{
+    color: fade(white, 50%);
+  }
+  &.white a{
+    color: fade(white, 80%);
+    text-shadow: 0 1px 2px rgba(0, 0, 0, 0.1);
+  }
  .licenses {
    color: fade(@color_text_main, 50%);
    text-decoration: underline;