Merge branch 'master' into develop

yanm1ng · Sep 4, 2017 · 0bdd328 · 0bdd328
2 parents 1e9f81c + 1365215
commit 0bdd328
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 4 deletions.
diff --git a/layout/_partial/head.ejs b/layout/_partial/head.ejs
@@ -23,4 +23,7 @@
   <script src="//cdn.bootcss.com/geopattern/1.2.3/js/geopattern.min.js"></script>
   <script src="//cdn.bootcss.com/nprogress/0.2.0/nprogress.min.js"></script>
   <%- js(['js/qrious', 'js/gitment']) %>
-</head>
+</head>
+<div class="wechat-share">
+  <img src="/css/images/logo.png" />
+</div>
diff --git a/layout/about.ejs b/layout/about.ejs
@@ -38,6 +38,14 @@
         </span>
       </a>
     <% } %>
+    <% if (config.douban_username) { %>
+        <a class="icon-douban" href="https://www.douban.com/people/<%- config.douban_username %>" target="_blank">
+            <span class="fa-stack fa-lg">
+                <i class="fa fa-circle fa-stack-2x"></i>
+                <i class="fa fa-stack-1x fa-inverse">豆</i>
+            </span>
+        </a>
+    <% } %>
   </section>
 </div>
 
@@ -53,4 +61,4 @@
       })
     }
   })();
-</script>
+</script>
diff --git a/layout/page.ejs b/layout/page.ejs
@@ -49,7 +49,7 @@
   (function () {
     var url = '<%= config.url %>/<%= page.path %>';
     var banner = '<%= page.banner %>'
-    if (banner) {
+    if (banner !== 'undefined') {
       $('#article-banner').css({
         'background-image': 'url(' + banner + ')'
       })

diff --git a/source/css/_partial/about.styl b/source/css/_partial/about.styl
@@ -72,4 +72,6 @@
     .icon-zhihu
       color: #0767c8
     .icon-twitter
-      color: #2aa9e0
+      color: #2aa9e0
+    .icon-douban
+      color: #00B51D
diff --git a/source/css/style.styl b/source/css/style.styl
@@ -37,6 +37,14 @@ p
 pre
   overflow-x: auto
 
+.wechat-share
+  width: 0
+  height: 0
+  overflow: hidden
+  img
+    width: 400px
+    height 400px
+
 .app-body
   padding: 1em
   margin: 0 auto