Refactor the share tools within post-widgets by sli1989 · Pull Request #357 · theme-next/hexo-theme-next

sli1989 · 2018-07-17T14:42:42Z

PR Checklist

Please check if your PR fulfills the following requirements:

The commit message follows our guidelines.
Tests for the changes have been added (for bug fixes / features).
- Muse | Mist have been tested.
- Pisces | Gemini have been tested.
Docs have been added / updated (for bug fixes / features).

PR Type

What kind of change does this PR introduce?

What is the current behavior?

hexo-theme-next/source/css/_schemes/Gemini/index.styl

Lines 80 to 82 in b378211

    
           .post-spread { 
        
             hide(); 
        
           }

Issue Number(s): #356

What is the new behavior?

Remove the baidushare to the post-widgets like rating, like, needmoreshare2.

Remove the addthis share to container_class in _layout.swig.
Delete the jiathis share for officially closed on April 30, 2018.

Screens with this changes: N/A
Link to demo site with this changes: https://test.saili.science/posts/post-meta-test/

How to use?

In NexT _config.yml:

...

Does this PR introduce a breaking change?

Yes.
No.

ivan-nginx

Em.. Can we add baidu share not to .post-spread but to .post-widgets? Here all social widgets like FB / VK / Raiting.

hexo-theme-next/source/css/_common/components/post/post-widgets.styl

Line 1 in a0590fd

.post-widgets {

sli1989 · 2018-07-17T14:52:10Z

There seems strange, the bottom line of post-block first displayed and then vanished.

ok, tomorrow look around.

hexo-theme-next/source/css/_common/components/third-party/baidushare.styl

Lines 1 to 4 in e12bb0b

    
           .post-spread { 
        
             margin-top: 20px; 
        
             text-align: center; 
        
           }

ivan-nginx

Please, test with all other widgets if it's possible.

ivan-nginx · 2018-07-18T07:14:46Z

layout/_macro/post.swig

        {% endif %}

+        {% if theme.baidushare and theme.baidushare.type === "button" %}
+           {% include 'baidushare.swig' %}


No need to rename from partials to macro here. Macro use {% macro render(name) %} (example), partials just included in other templates without any variables.

ivan-nginx · 2018-07-18T07:19:08Z

layout/_macro/post.swig

+        {% endif %}
+
        {% if theme.needmoreshare2.enable and theme.needmoreshare2.postbottom.enable %}
          {% if (theme.vkontakte_api.enable and theme.vkontakte_api.like) or (theme.facebook_sdk.enable and theme.facebook_sdk.like_button) %}


Need divider here?

baidushare.swig provides the <div class="bdsharebuttonbox">, still need?

hexo-theme-next/layout/_partials/share/baidushare.swig

Lines 2 to 13 in e12bb0b

<div class="bdsharebuttonbox">

<a href="#" class="bds_tsina" data-cmd="tsina" title="分享到新浪微博"></a>

<a href="#" class="bds_douban" data-cmd="douban" title="分享到豆瓣网"></a>

<a href="#" class="bds_sqq" data-cmd="sqq" title="分享到QQ好友"></a>

<a href="#" class="bds_qzone" data-cmd="qzone" title="分享到QQ空间"></a>

<a href="#" class="bds_weixin" data-cmd="weixin" title="分享到微信"></a>

<a href="#" class="bds_tieba" data-cmd="tieba" title="分享到百度贴吧"></a>

<a href="#" class="bds_twi" data-cmd="twi" title="分享到Twitter"></a>

<a href="#" class="bds_fbook" data-cmd="fbook" title="分享到Facebook"></a>

<a href="#" class="bds_more" data-cmd="more"></a>

<a class="bds_count" data-cmd="count"></a>

</div>

ivan-nginx · 2018-07-18T07:22:02Z

source/css/_common/components/third-party/baidushare.styl

 .bdsharebuttonbox {
-  display: inline-block;
-
+  margin-top: 20px;


Move this styles to .post-widgets maybe?

ivan-nginx · 2018-07-18T07:23:00Z

layout/post.swig

@@ -16,8 +16,6 @@
    <div class="post-spread">
      {% if theme.jiathis %}


Need to do same with jiathis?

ivan-nginx · 2018-07-18T07:23:20Z

layout/post.swig

        {% include '_partials/share/jiathis.swig' %}
-      {% elseif theme.baidushare %}
-        {% include '_partials/share/baidushare.swig' %}
      {% elseif theme.add_this_id %}


Need to do same with add-this?

yes, to be continued. ING

jiathis and add-this will do in other pr.
How this looks now?

* Fix post-spread invisible in Gemini * Refactor the baidushare within post-widgets * Remove baidushare.swig * Add slide mode support * Fix widgets position * Fix bdshare slide display logic * Fix bdshare slide display logic * Move add-this to _layout * Delete jiathis share because of closed officially * Update divider position

Fix post-spread invisible in Gemini

0f6b527

ivan-nginx requested changes Jul 17, 2018

View reviewed changes

sli1989 added 2 commits July 18, 2018 15:05

Refactor the baidushare within post-widgets

04fe6cd

Remove baidushare.swig

f937114

sli1989 changed the title ~~Fix post-spread invisible in Gemini~~ Refactor the baidushare within post-widgets Jul 18, 2018

ivan-nginx requested changes Jul 18, 2018

View reviewed changes

sli1989 added 6 commits July 19, 2018 16:22

Add slide mode support

c9ecf2a

Fix widgets position

ed602af

Fix bdshare slide display logic

fd0c111

Fix bdshare slide display logic

4e22736

Move add-this to _layout

b68406b

Delete jiathis share because of closed officially

cfdd0c0

sli1989 changed the title ~~Refactor the baidushare within post-widgets~~ Refactor the share tools within post-widgets Jul 19, 2018

sli1989 added 🛠 Improvement 🐞 Bug Fix labels Jul 19, 2018

sli1989 added this to the v6.4.0 milestone Jul 19, 2018

ivan-nginx approved these changes Jul 19, 2018

View reviewed changes

Update divider position

a6e4ef3

sli1989 merged commit 62f69af into theme-next:master Jul 20, 2018

sli1989 deleted the Gemini-post-spread branch July 20, 2018 07:48

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Refactor the share tools within post-widgets#357

Refactor the share tools within post-widgets#357
sli1989 merged 10 commits intotheme-next:masterfrom
sli1989:Gemini-post-spread

sli1989 commented Jul 17, 2018 •

edited

Loading

Uh oh!

ivan-nginx left a comment •

edited

Loading

Uh oh!

sli1989 commented Jul 17, 2018

Uh oh!

ivan-nginx left a comment

Uh oh!

ivan-nginx Jul 18, 2018

Uh oh!

ivan-nginx Jul 18, 2018

Uh oh!

sli1989 Jul 18, 2018

Uh oh!

ivan-nginx Jul 18, 2018

Uh oh!

ivan-nginx Jul 18, 2018

Uh oh!

ivan-nginx Jul 18, 2018

Uh oh!

sli1989 Jul 18, 2018

Uh oh!

sli1989 Jul 19, 2018

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

	<div class="bdsharebuttonbox">
	<a href="#" class="bds_tsina" data-cmd="tsina" title="分享到新浪微博"></a>
	<a href="#" class="bds_douban" data-cmd="douban" title="分享到豆瓣网"></a>
	<a href="#" class="bds_sqq" data-cmd="sqq" title="分享到QQ好友"></a>
	<a href="#" class="bds_qzone" data-cmd="qzone" title="分享到QQ空间"></a>
	<a href="#" class="bds_weixin" data-cmd="weixin" title="分享到微信"></a>
	<a href="#" class="bds_tieba" data-cmd="tieba" title="分享到百度贴吧"></a>
	<a href="#" class="bds_twi" data-cmd="twi" title="分享到Twitter"></a>
	<a href="#" class="bds_fbook" data-cmd="fbook" title="分享到Facebook"></a>
	<a href="#" class="bds_more" data-cmd="more"></a>
	<a class="bds_count" data-cmd="count"></a>
	</div>

		@@ -16,8 +16,6 @@
		<div class="post-spread">
		{% if theme.jiathis %}

Conversation

sli1989 commented Jul 17, 2018 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

PR Checklist

PR Type

What is the current behavior?

What is the new behavior?

How to use?

Does this PR introduce a breaking change?

Uh oh!

ivan-nginx left a comment • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

sli1989 commented Jul 17, 2018

Uh oh!

ivan-nginx left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

sli1989 commented Jul 17, 2018 •

edited

Loading

ivan-nginx left a comment •

edited

Loading