From f0a4adf4463677c73826feded2167e43c789b055 Mon Sep 17 00:00:00 2001 From: Oswaldo Acauan Date: Mon, 26 May 2014 23:53:50 -0300 Subject: [PATCH] feat(js): Replace NProgress with Pace. Closes #42 --- bower.json | 6 +++--- src/assets/_scss/partials/_main.scss | 8 ++++++-- src/assets/_scss/style.scss | 2 +- src/assets/_scss/vendor/_pace.scss | 3 +++ src/assets/js/scripts.js | 5 +---- src/default.hbs | 24 ++++++++++++++++++------ 6 files changed, 32 insertions(+), 16 deletions(-) create mode 100644 src/assets/_scss/vendor/_pace.scss diff --git a/bower.json b/bower.json index 5a0a9238..ee0934a6 100644 --- a/bower.json +++ b/bower.json @@ -20,8 +20,8 @@ "devDependencies": { "fastclick": "~0.6.10", "font-awesome": "~4.1.0", - "jquery-pjax": "~1.7.3", - "nprogress": "~0.1.2", - "prism": "gh-pages" + "prism": "gh-pages", + "pace": "~0.5.1", + "jquery-pjax": "master" } } diff --git a/src/assets/_scss/partials/_main.scss b/src/assets/_scss/partials/_main.scss index 2d042bd8..aecab8a6 100644 --- a/src/assets/_scss/partials/_main.scss +++ b/src/assets/_scss/partials/_main.scss @@ -16,9 +16,13 @@ body { backface-visibility: hidden; opacity: 1; - .nprogress-busy & { + .pace-running & { transition-delay: .1s; - opacity: 0; + //opacity: 0; + } + + .pace-done & { + //opacity: 1; } .drawer-transition & { diff --git a/src/assets/_scss/style.scss b/src/assets/_scss/style.scss index d197226e..6b5a224a 100644 --- a/src/assets/_scss/style.scss +++ b/src/assets/_scss/style.scss @@ -47,7 +47,7 @@ // VENDOR //----------------------------------*/ -@import "vendor/_nprogress.scss"; +@import "vendor/_pace.scss"; @import "vendor/_prism.scss"; // External diff --git a/src/assets/_scss/vendor/_pace.scss b/src/assets/_scss/vendor/_pace.scss new file mode 100644 index 00000000..f097ec1c --- /dev/null +++ b/src/assets/_scss/vendor/_pace.scss @@ -0,0 +1,3 @@ +.pace .pace-progress { + background: $primary-color; +} diff --git a/src/assets/js/scripts.js b/src/assets/js/scripts.js index e04d9252..f769580a 100644 --- a/src/assets/js/scripts.js +++ b/src/assets/js/scripts.js @@ -1,4 +1,4 @@ -/* global FastClick: false, DISQUS: false, DISQUSWIDGETS: true, disqus_identifier:false, ga:false, Drawer: false, ImageLoader: false, NProgress: false, Prism: false */ +/* global FastClick: false, DISQUS: false, DISQUSWIDGETS: true, disqus_identifier:false, ga:false, Drawer: false, ImageLoader: false, Prism: false */ (function ($, window, document, undefined) { 'use strict'; @@ -100,7 +100,6 @@ // ================= if ($.support.pjax) { $document.on('pjax:start', function() { - NProgress.start(); $surface.scrollTop(0); }); @@ -113,8 +112,6 @@ $('[data-load-image]', $content).each(function() { ImageLoader.load($(this)); }); - - NProgress.done(); }); var _pjaxOptions = { diff --git a/src/default.hbs b/src/default.hbs index c600f074..1d4b6861 100644 --- a/src/default.hbs +++ b/src/default.hbs @@ -33,24 +33,37 @@ - + - - - - + + + + + {{ghost_head}} @@ -72,7 +85,6 @@ -