merged with develop branch

.bowerrc

@@ -0,0 +1,3 @@
+{
+  "directory": "assets/vendor"
+}

.gitignore

@@ -1,3 +1,4 @@
 .DS_Store
 node_modules/
-.sass-cache/
+.sass-cache/
+assets/vendor

Gruntfile.coffee

@@ -6,66 +6,77 @@ module.exports = (grunt) ->
     # =============
     # SETUP
     # =============
-    pkg         : grunt.file.readJSON './package.json'
 
-    meta:
-      banner    : '/* <%= pkg.name %> v<%= pkg.version %>\n' +
-                '   <%= pkg.homepage %>' +
-                '   Copyright (c) <%= grunt.template.today("yyyy") %> <%= pkg.author.name %>' +
-                ' - Licensed <%= pkg.license %> */\n'
+    pkg : grunt.file.readJSON './package.json'
+    meta: banner = [
+      "/**"
+      " * <%= pkg.name %> - <%= pkg.description %>"
+      " * @version  v<%= pkg.version %>"
+      " * @homepage <%= pkg.homepage %>"
+      " * @author   <%= pkg.author.name %> (<%= pkg.author.url %>)"
+      " * @license  <%= pkg.license %>"
+      " */"].join("\n")
+
     src:
       sass:
         main   : 'assets/scss/uno.scss'
         files  : ['assets/scss/**/*.scss']
       js       :
-        main   : ['assets/js/index.js',
-                  'assets/js/ghostHunter.js',
-                  'assets/vendor/js/jquery.ghostHunter.min.js']
+        main   : ['assets/js/init.open.js'
+                  'assets/js/init.ghostHunter.js'
+                  'assets/js/init.readingTime.js']
+        vendor : ['assets/vendor/ghostHunter/jquery.ghostHunter.min.js'
+                  'assets/vendor/pace/pace.min.js'
+                  'assets/vendor/reading-time/build/readingTime.min.js']
       css      :
         main   : 'assets/css/uno.css'
-        vendor : ['assets/vendor/css/**/*.css']
+        vendor : []
+
+    dist       :
+      css      : 'assets/css/uno.css'
+      js       : 'assets/js/uno.js'
 
     # =============
     # TASKS
     # =============
-    sass:
-      main        : files: '<%=src.css.main%>' : '<%=src.sass.main%>'
 
-    concat:
-      options : stripBanners: true
-      css      : src: ['<%=src.css.main%>', '<%= src.css.vendor %>'], dest: 'assets/css/uno.css'
-      js       : src: ['<%=src.js.main%>'], dest: 'assets/js/uno.js'
+    sass       :
+      main     : files: '<%=dist.css%>' : '<%=src.sass.main%>'
+
+    concat     :
+      options  : stripBanners: true
+      css      : src: ['<%=src.css.main%>', '<%=src.css.vendor%>'], dest: '<%=dist.css%>'
+      js       : src: ['<%=src.js.main%>', '<%=src.js.vendor%>'], dest: '<%=dist.js%>'
 
-    autoprefixer:
-      main        : files: '<%=src.css.main%>' : '<%=src.css.main%>'
+    autoprefixer :
+      main       : files: '<%=dist.css%>' : '<%=src.css.main%>'
 
-    cssmin:
-      options     : banner: '<%=meta.banner%>', report: 'gzip'
-      main        : files: 'assets/css/uno.min.css': '<%=src.css.main%>'
+    cssmin     :
+      options  : banner: '<%=meta.banner%>', report: 'gzip'
+      main     : files: '<%=dist.css%>': '<%=dist.css%>'
 
-    uglify:
+    uglify        :
       options     : compress: false, banner: '<%=meta.banner%>', report: 'gzip', preserveComments: false
-      main: files : 'assets/js/uno.min.js': '<%=src.js.main%>'
+      main: files : '<%=dist.js%>': '<%=dist.js%>'
 
-    clean:
-      cache:
-        ['.sass-cache', 'assets/scss/.sass-cache']
-      npm:
-        ['node_modules']
+    clean       :
+      cache     : ['.sass-cache', 'assets/scss/.sass-cache']
+      npm       : ['node_modules']
 
-    watch:
-      sass:
+    watch       :
+      sass      :
         files   : ['<%=src.sass.files%>']
         tasks   : ['css']
         options : livereload: true
-      js:
+      js        :
         files   : ['<%=src.js.main%>']
         tasks   : ['js']
         options : livereload: true
 
   # =============
   # REGISTER
   # =============
+
   grunt.registerTask 'css', ['sass', 'concat:css', 'autoprefixer', 'cssmin']
   grunt.registerTask 'js', ['concat:js','uglify']
   grunt.registerTask 'production', ['css', 'js']

README.md

@@ -6,10 +6,11 @@
 
 **Uno Zen** is a fork of [Uno for Ghost](https://github.com/daleanthony/Uno) that provides some features missing in the original theme:
 
-* Some little improves in the layout grid and in the CSS style.
+* Improve CSS layout and use a main image for each post.
 * Search support by [ghostHunter](https://github.com/i11ume/ghostHunter/).
-* Main post image support.
-* Better development and production with Grunt.
+* Estimate the time of reading a post by [readingTime.js](https://github.com/michael-lynch/reading-time).
+* Added Progress bar with support for different themes by [pace](http://github.hubspot.com/pace/docs/welcome/).
+* Better development and production workflow with Grunt.
 
 ... and more and more features in the future. If you want to help visit TODO section.
 
@@ -27,7 +28,7 @@ You can see a demo in my [blog](http://blog.kikobeats.com).
 
 1) Download the last release tagged version.
 
-2) Execute `npm install` for install the dependencies.
+2) Execute `npm install` and `bower install` for install the dependencies.
 
 3) For development exec `grunt`. This provide you livereload. You need to have [SASS and bourbon](https://github.com/daleanthony/uno#development) as well.