Skip to content

Commit

Permalink
Merge pull request #1689 from shenzekun/master
Browse files Browse the repository at this point in the history
feature:Implement the load bar at the top of the page
  • Loading branch information
ivan-nginx committed Jun 1, 2017
2 parents c4651eb + 667d3bf commit 83e32a8
Show file tree
Hide file tree
Showing 16 changed files with 57 additions and 1 deletion.
29 changes: 28 additions & 1 deletion _config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -502,6 +502,26 @@ use_motion: true
# Fancybox
fancybox: true

# Progress bar in the top during page loading.
pace: false
# Themes list:
#pace-theme-big-counter
#pace-theme-bounce
#pace-theme-barber-shop
#pace-theme-center-atom
#pace-theme-center-circle
#pace-theme-center-radar
#pace-theme-center-simple
#pace-theme-corner-indicator
#pace-theme-fill-left
#pace-theme-flash
#pace-theme-loading-bar
#pace-theme-mac-osx
#pace-theme-minimal
# For example
# pace_theme: pace-theme-center-simple
pace_theme: pace-theme-minimal

# Canvas-nest
canvas_nest: false

Expand Down Expand Up @@ -565,6 +585,14 @@ vendors:
algolia_instant_js:
algolia_instant_css:

# Internal version: 1.0.2
# See: https://github.com/HubSpot/pace
# Or use direct links below:
# pace: //cdn.bootcss.com/pace/1.0.2/pace.min.js
# pace_css: //cdn.bootcss.com/pace/1.0.2/themes/blue/pace-theme-flash.min.css
pace:
pace_css:

# Internal version: 1.0.0
# https://github.com/hustcc/canvas-nest.js
canvas_nest:
Expand Down Expand Up @@ -593,7 +621,6 @@ vendors:
han:



# Assets
css: css
js: js
Expand Down
14 changes: 14 additions & 0 deletions layout/_partials/head.swig
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,20 @@
<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/'+ theme.pace_theme +'.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-barber-shop.min.css

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

1 change: 1 addition & 0 deletions source/lib/pace/pace-theme-big-counter.min.css

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

1 change: 1 addition & 0 deletions source/lib/pace/pace-theme-bounce.min.css

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

1 change: 1 addition & 0 deletions source/lib/pace/pace-theme-center-atom.min.css

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

1 change: 1 addition & 0 deletions source/lib/pace/pace-theme-center-circle.min.css

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

1 change: 1 addition & 0 deletions source/lib/pace/pace-theme-center-radar.min.css

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

1 change: 1 addition & 0 deletions source/lib/pace/pace-theme-center-simple.min.css

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

1 change: 1 addition & 0 deletions source/lib/pace/pace-theme-corner-indicator.min.css

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

1 change: 1 addition & 0 deletions source/lib/pace/pace-theme-fill-left.min.css

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

1 change: 1 addition & 0 deletions source/lib/pace/pace-theme-flash.min.css

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

Loading

0 comments on commit 83e32a8

Please sign in to comment.