Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Reorganize #576, using macro #582

Merged
merged 4 commits into from
Jan 13, 2019
Merged

Reorganize #576, using macro #582

merged 4 commits into from
Jan 13, 2019

Conversation

stevenjoezhang
Copy link
Contributor

PR Checklist

Please check if your PR fulfills the following requirements:

  • The commit message follows our guidelines.
  • Tests for the changes was maked (for bug fixes / features).
    • Muse | Mist have been tested.
    • Pisces | Gemini have been tested.
  • Docs in NexT website have been added / updated (for new features).

PR Type

What kind of change does this PR introduce?

  • Bugfix.
  • Feature.
  • Code style update (formatting, local variables).
  • Refactoring (no functional changes, no api changes).
  • Build related changes.
  • CI related changes.
  • Documentation content changes.
  • Other... Please describe:

What is the current behavior?

Issue resolved #576

What is the new behavior?

Description about this pull, in several words...

  • Screens with this changes: N/A
  • Link to demo site with this changes: N/A

How to use?

In NexT _config.yml:

...

Does this PR introduce a breaking change?

  • Yes.
  • No.

Copy link
Member

@ivan-nginx ivan-nginx left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

So, no need to merge #576 pull, if we will merge this pull? Only this pull enought, right?

@stevenjoezhang
Copy link
Contributor Author

Yes, only this one.

@ivan-nginx ivan-nginx mentioned this pull request Jan 13, 2019
15 tasks
@stevenjoezhang stevenjoezhang added this to the v7.0.0 milestone Jan 13, 2019
@stevenjoezhang stevenjoezhang merged commit 5cb7444 into theme-next:master Jan 13, 2019
ivan-nginx added a commit that referenced this pull request Jan 14, 2019
* Reorganize #576
* update _config.yml
invkrh added a commit to invkrh/hexo-theme-next that referenced this pull request Jan 30, 2019
* upstream/master:
  add: details of configuration (theme-next#588)
  Revert using template literals in client side scripts. (theme-next#590)
  bugfix: make request time of leancloud saved and let concurrent requests pass (theme-next#519)
  Reorganize theme-next#576, using macro (theme-next#582)
anthqiu pushed a commit to anthqiu/hexo-theme-next that referenced this pull request Aug 1, 2019
# By Mimi (4) and others
# Via Ivan.Nginx
* 'v6.x' of [email protected]:AntSYau/hexo-theme-next.git:
  add: details of configuration (theme-next#588)
  bugfix: make request time of leancloud saved and let concurrent requests pass (theme-next#519)
  Reorganize theme-next#576, using macro (theme-next#582)
  Edit Google Analytics reference file address (theme-next#580)
  Fix theme-next#573: [Muse & Mist] Footer is not at the bottom of the page (theme-next#574)
  Update Gitment URL to use jsDelivr CDN (theme-next#572)
  Fix theme-next#569 Valine Comment Count (theme-next#570)
  Improve styles of Gitalk & Gitment  (theme-next#568)
  Optimize the loading of comment systems (theme-next#566)

# Conflicts:
#	.github/PULL_REQUEST_TEMPLATE.md
#	_config.yml
#	layout/_macro/post.swig
#	layout/_partials/comments.swig
#	layout/_partials/github-banner.swig
#	layout/_scripts/schemes/muse.swig
#	layout/_third-party/analytics/google-analytics.swig
#	layout/_third-party/comments/disqus.swig
#	layout/_third-party/comments/gitalk.swig
#	layout/_third-party/comments/gitment.swig
#	layout/_third-party/comments/index.swig
#	layout/_third-party/comments/valine.swig
#	layout/_third-party/copy-code.swig
#	source/css/_common/components/header/github-banner.styl
#	source/css/_common/components/pages/schedule.styl
#	source/css/_common/components/post/post-reward.styl
#	source/css/_common/components/sidebar/sidebar.styl
#	source/css/_common/components/tags/note-modern.styl
#	source/css/_common/scaffolding/tables.styl

Signed-off-by: Anthony Yau <[email protected]>
tongluyang pushed a commit to tongluyang/hexo-theme-next that referenced this pull request Nov 19, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants