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.

Sign up for GitHub

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

Jump to bottom

feature:Implement the load bar at the top of the page #1689

Merged
merged 14 commits into from Jun 1, 2017
Merged

feature:Implement the load bar at the top of the page #1689

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
476fa43
feature:Implement the load bar at the top of the page
shenzekun May 28, 2017
b8ed86a
Revert "feature:Implement the load bar at the top of the page"
shenzekun May 28, 2017
7f1c27d
ok
shenzekun May 28, 2017
498bad8
like this?
shenzekun May 28, 2017
13de305
this way？
shenzekun May 28, 2017
9d51fb7
this way?
shenzekun May 28, 2017
07e86fd
modify
shenzekun May 28, 2017
5b7c911
modify color blue
shenzekun May 28, 2017
8258e46
Update _config.yml
ivan-nginx May 28, 2017
ed23a2c
Update head.swig
ivan-nginx May 28, 2017
99bdd1d
thank you very much,and I've added several different styles of loading
shenzekun May 28, 2017
49ccbc3
modify
shenzekun May 28, 2017
de7e90d
Update _config.yml
ivan-nginx May 31, 2017
667d3bf
Update _config.yml
ivan-nginx May 31, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 6 additions & 0 deletions _config.yml
View file
Open in desktop
Expand Up @@ -581,6 +581,10 @@ vendors:
# https://github.com/ethantw/Han
han:

# Internal version: 1.0.2
# https://github.com/HubSpot/pace/
Copy link
Collaborator

Choose a reason for hiding this comment

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

Yes, and 2 direct links in comment on 1 and 2 CDN please.
For example:

# https://github.com/HubSpot/pace/
# pace: https://pace.min.js
# pace_css: https://pace-theme-flash.min.css

pace:
pace_css:


# Assets
Expand All @@ -590,3 +594,5 @@ images: images

# Theme version
version: 5.1.1

pace: true
18 changes: 18 additions & 0 deletions layout/_partials/head.swig
View file
Open in desktop
Expand Up @@ -3,6 +3,24 @@
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1"/>


{% if theme.pace %}
{% set pace_css_uri = url_for(theme.vendors._internal + '/pace/pace-theme-flash.min.css?v=1.0.2') %}

{% set pace_js_uri = url_for(theme.vendors._internal + '/pace/pace.min.js?v=1.0.2') %}
{% if theme.vendors.pace %}
{% set pace_js_uri = theme.vendors.pace %}
{% endif %}
{% if theme.vendors.pace_css %}
{% set pace_css_uri = theme.vendors.pace_css %}
{% endif %}

<script src="{{ pace_js_uri }}"></script>

<link href="{{ pace_css_uri }}" rel="stylesheet">

{% endif %}


{% if theme.han %}
{% set Han_uri = url_for(theme.vendors._internal + '/Han/dist/han.min.css?v=3.3') %}
{% if theme.vendors.Han %}
Expand Down
1 change: 1 addition & 0 deletions source/lib/pace/pace-theme-flash.min.css
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions source/lib/pace/pace.min.js
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.