Merge remote-tracking branch 'origin/dev' into dev

b5bd60ac · Liang Ding · cf494e8e · dc67b9fc · b5bd60ac · b5bd60ac
Commit b5bd60ac authored May 23, 2020 by Liang Ding
29 changed files
--- a/src/main/resources/scss/_toc.scss
+++ b/src/main/resources/scss/_toc.scss
@@ -48,5 +48,9 @@
    &.toc__h5 a {
      padding-left: 40px;
    }
+
+    &.toc__h6 a {
+      padding-left: 50px;
+    }
  }
-}
\ No newline at end of file
+}
--- a/src/main/resources/skins/9IPHP/css/base.css
+++ b/src/main/resources/skins/9IPHP/css/base.css
--- a/src/main/resources/skins/Andrea/css/base.css
+++ b/src/main/resources/skins/Andrea/css/base.css
--- a/src/main/resources/skins/Bruce/css/base.css
+++ b/src/main/resources/skins/Bruce/css/base.css
--- a/src/main/resources/skins/Bubble/css/base.css
+++ b/src/main/resources/skins/Bubble/css/base.css
--- a/src/main/resources/skins/Casper/css/base.css
+++ b/src/main/resources/skins/Casper/css/base.css
--- a/src/main/resources/skins/Community/css/base.css
+++ b/src/main/resources/skins/Community/css/base.css
--- a/src/main/resources/skins/Finding/css/base.css
+++ b/src/main/resources/skins/Finding/css/base.css
--- a/src/main/resources/skins/Finding/js/common.min.js
+++ b/src/main/resources/skins/Finding/js/common.min.js
--- a/src/main/resources/skins/Jane/css/base.css
+++ b/src/main/resources/skins/Jane/css/base.css
--- a/src/main/resources/skins/Jane/js/common.min.js
+++ b/src/main/resources/skins/Jane/js/common.min.js
--- a/src/main/resources/skins/Medium/css/base.css
+++ b/src/main/resources/skins/Medium/css/base.css
--- a/src/main/resources/skins/Medium/js/common.min.js
+++ b/src/main/resources/skins/Medium/js/common.min.js
--- a/src/main/resources/skins/NeoEase/css/base.css
+++ b/src/main/resources/skins/NeoEase/css/base.css
--- a/src/main/resources/skins/NeoEase/js/common.min.js
+++ b/src/main/resources/skins/NeoEase/js/common.min.js
--- a/src/main/resources/skins/Pinghsu/css/base.css
+++ b/src/main/resources/skins/Pinghsu/css/base.css
--- a/src/main/resources/skins/Pinghsu/js/common.min.js
+++ b/src/main/resources/skins/Pinghsu/js/common.min.js
--- a/src/main/resources/skins/favourite/css/base.css
+++ b/src/main/resources/skins/favourite/css/base.css
--- a/src/main/resources/skins/i-nove/css/base.css
+++ b/src/main/resources/skins/i-nove/css/base.css
--- a/src/main/resources/skins/metro-hot/css/base.css
+++ b/src/main/resources/skins/metro-hot/css/base.css
--- a/src/main/resources/skins/metro-hot/js/common.min.js
+++ b/src/main/resources/skins/metro-hot/js/common.min.js
--- a/src/main/resources/skins/next/css/base.css
+++ b/src/main/resources/skins/next/css/base.css
--- a/src/main/resources/skins/next/js/common.min.js
+++ b/src/main/resources/skins/next/js/common.min.js
--- a/src/main/resources/skins/nijigen/css/base.css
+++ b/src/main/resources/skins/nijigen/css/base.css
--- a/src/main/resources/skins/nijigen/js/common.min.js
+++ b/src/main/resources/skins/nijigen/js/common.min.js
--- a/src/main/resources/skins/owmx-3.0/css/base.css
+++ b/src/main/resources/skins/owmx-3.0/css/base.css
--- a/src/main/resources/skins/timeline/css/base.css
+++ b/src/main/resources/skins/timeline/css/base.css
--- a/src/main/resources/skins/tree-house/css/base.css
+++ b/src/main/resources/skins/tree-house/css/base.css
--- a/src/main/resources/skins/yilia/css/base.css
+++ b/src/main/resources/skins/yilia/css/base.css