Merge pull request #1328 from ivan-nginx/master

Fixes and enhancements. [6]
iissnan · Jan 5, 2017 · 66c5f24 · 66c5f24
2 parents 849ecb7 + d1c6771
commit 66c5f24
Show file tree

Hide file tree

Showing 10 changed files with 52 additions and 15 deletions.
diff --git a/layout/_macro/post.swig b/layout/_macro/post.swig
@@ -234,7 +234,7 @@
         {% if post.description and theme.excerpt_description %}
           {{ post.description }}
           <!--noindex-->
-          <div class="post-more-link text-center">
+          <div class="post-button text-center">
             <a class="btn" href="{{ url_for(post.path) }}">
               {{ __('post.read_more') }} &raquo;
             </a>
@@ -243,7 +243,7 @@
         {% elif post.excerpt  %}
           {{ post.excerpt }}
           <!--noindex-->
-          <div class="post-more-link text-center">
+          <div class="post-button text-center">
             <a class="btn" href="{{ url_for(post.path) }}{% if theme.scroll_to_more %}#more{% endif %}" rel="contents">
               {{ __('post.read_more') }} &raquo;
             </a>
@@ -254,7 +254,7 @@
           {{ content.substring(0, theme.auto_excerpt.length) }}
           {% if content.length > theme.auto_excerpt.length %}...{% endif %}
           <!--noindex-->
-          <div class="post-more-link text-center">
+          <div class="post-button text-center">
             <a class="btn" href="{{ url_for(post.path) }}{% if theme.scroll_to_more %}#more{% endif %}" rel="contents">
               {{ __('post.read_more') }} &raquo;
             </a>

diff --git a/scripts/tags/button.js b/scripts/tags/button.js
@@ -0,0 +1,31 @@
+/* global hexo */
+// Usage: {% button /path/to/url/, text, icon [class], title %}
+// Alias: {% btn /path/to/url/, text, icon [class], title %}
+
+function postButton(args) {
+  args = args.join(' ').split(',');
+  var url = args[0];
+  var text = args[1] || '';
+  var icon = args[2] || '';
+  var title = args[3] || '';
+
+  if (!url) {
+    hexo.log.warn('URL can NOT be empty');
+  }
+
+  text = text.trim();
+  icon = icon.trim();
+  title = title.trim();
+
+  var result = ['<span class="post-button text-center"><a class="btn" href="' + url + '"'];
+  title.length > 0 && result.push(' title="' + title + '"');
+  result.push('>');
+  icon.length > 0 && result.push('<i class="fa fa-' + icon + '"></i>');
+  text.length > 0 && result.push(text);
+  result.push('</a></span>');
+
+  return result.join('');
+}
+
+hexo.extend.tag.register('button', postButton);
+hexo.extend.tag.register('btn', postButton);
diff --git a/...ommon/components/post/post-more-link.styl → .../_common/components/post/post-button.styl b/...ommon/components/post/post-more-link.styl → .../_common/components/post/post-button.styl
@@ -7,8 +7,13 @@
     background: $read-more-bg-color;
     border-radius: $read-more-border-radius;
     line-height: 2;
+    margin: 0 4px 8px 4px;
   }
   .btn:hover {
     @extend .btn:hover;
   }
+  .fa-fw {
+    width: (18em / 14);
+    text-align: left;
+  }
 }
diff --git a/source/css/_common/components/post/post.styl b/source/css/_common/components/post/post.styl
@@ -38,7 +38,7 @@
 @import "post-type";
 @import "post-title";
 @import "post-meta";
-@import "post-more-link";
+@import "post-button";
 @import "post-tags";
 @import "post-nav";
 @import "post-eof";

diff --git a/source/css/_common/components/tags/full-image.styl b/source/css/_common/components/tags/full-image.styl
@@ -6,7 +6,7 @@
   margin: 20px auto;
   +desktop() {
     max-width: none;
-    width: 126%;
-    margin: 0 -13%;
+    width: $full-image-width;
+    margin: $full-image-margin-vertical $full-image-margin-horizontal;
   }
 }
diff --git a/source/css/_schemes/Mist/_posts-expanded.styl b/source/css/_schemes/Mist/_posts-expanded.styl
@@ -41,11 +41,12 @@
   .post-nav { margin-top: 40px; }
 }
 
-.post-more-link {
+.post-button {
   margin-top: 20px;
   text-align: left;
 
   a {
+    margin: 0 8px 8px 0 !important;
     padding: 0;
     font-size: $font-size-base;
     color: $grey-dim;

diff --git a/source/css/_schemes/Pisces/_full-image.styl b/source/css/_schemes/Pisces/_full-image.styl
diff --git a/source/css/_schemes/Pisces/index.styl b/source/css/_schemes/Pisces/index.styl
@@ -1,4 +1,3 @@
-@import "_full-image";
 @import "_layout";
 @import "_brand";
 @import "_menu";

diff --git a/source/css/_variables/Pisces.styl b/source/css/_variables/Pisces.styl
@@ -62,6 +62,10 @@ $btn-default-border-color     = $text-color
 $btn-default-hover-color      = white
 $btn-default-hover-bg         = $black-deep
 
+// Full Image Tag
+$full-image-width             = 118%
+$full-image-margin-horizontal = -9%
+$full-image-margin-vertical   = 0
 
 // Back to top
 $b2t-opacity                  = .6

diff --git a/source/css/_variables/base.styl b/source/css/_variables/base.styl
@@ -304,6 +304,10 @@ $b2t-font-size                = 12px
 $b2t-color                    = white
 $b2t-bg-color                 = $black-deep
 
+// full-image
+$full-image-width             = 110%
+$full-image-margin-horizontal = -5%
+$full-image-margin-vertical   = 25px
 
 //  .post-expand .post-eof
 //  In Muse scheme, margin above and below the post separator