Now using Stylus instead of SASS, to work around node-sass issue (sas…

…s/node-sass#301)

Gruntfile.js

@@ -11,7 +11,7 @@
         test: 'test',
         bower: 'public/bower_components',
         src: {
-          sass: 'public/src/sass',
+          stylus: 'public/src/stylus',
           js: 'public/src/js'
         },
         build: {
@@ -25,9 +25,9 @@
           files: ['<%= config.src.js %>/{,*/}{,*/}*.js'],
           tasks: ['js']          
         },
-        sass: {
-          files: ['<%= config.src.sass %>/{,*/}{,*/}*.scss'],
-          tasks: ['sass']
+        stylus: {
+          files: ['<%= config.src.stylus %>/{,*/}{,*/}*.styl'],
+          tasks: ['stylus']
         }
       },
       jshint: {
@@ -39,14 +39,13 @@
           '<%= config.backend %>/{,*/}{,*/}{,*/}*.js'
         ]
       },
-      sass: {
+      stylus: {
         build: {
           options: {
-            noLineComments: true,
-            outputStyle: 'compressed'
+            compress: true,
           },
           files: {
-            '<%= config.build.css %>/style.css': '<%= config.src.sass %>/style.scss'
+            '<%= config.build.css %>/style.css': '<%= config.src.stylus %>/style.styl'
           }
         }
       },
@@ -57,10 +56,10 @@
           },
           src: [
             '<%= config.bower %>/jquery/dist/jquery.js',
-            '<%= config.bower %>/sass-bootstrap/js/transition.js',
-            '<%= config.bower %>/sass-bootstrap/js/dropdown.js',
-            '<%= config.bower %>/sass-bootstrap/js/collapse.js',
-            '<%= config.bower %>/sass-bootstrap/js/modal.js',
+            '<%= config.bower %>/bootstrap-stylus/js/transition.js',
+            '<%= config.bower %>/bootstrap-stylus/js/dropdown.js',
+            '<%= config.bower %>/bootstrap-stylus/js/collapse.js',
+            '<%= config.bower %>/bootstrap-stylus/js/modal.js',
           ],
           dest: '<%= config.build.js %>/base.js'
         },
@@ -95,7 +94,7 @@
             {
               expand: true,
               flatten: true,
-              src: '<%= config.bower %>/font-awesome/fonts/*',
+              src: '<%= config.bower %>/font-awesome-stylus/fonts/*',
               dest: '<%= config.build.fonts %>/',
               filter: 'isFile'
             }
@@ -145,7 +144,7 @@
 
     grunt.registerTask('build', [
       'jshint',
-      'sass',
+      'stylus',
       'copy',
       'js',
       'test'

bower.json

@@ -6,13 +6,10 @@
   ],
   "license": "MIT",
   "private": true,
-  "dependencies": {
-    "history.js": "~1.8.0",
-    "jquery-form": "~3.46.0"
-  },
   "devDependencies": {
-    "font-awesome": "~4.0.3",
-    "bootstrap": "~3.1.1",
-    "sass-bootstrap": "~3.0.2"
+    "history.js": "~1.8.0",
+    "jquery-form": "~3.46.0",
+    "font-awesome-stylus": "*",
+    "bootstrap-stylus": "~3.1.1"
   }
 }

package.json

@@ -1,7 +1,7 @@
 {
   "name": "melkor",
   "description": "Simple, fast wiki powered by Node.js and Git",
-  "version": "1.2.3",
+  "version": "1.2.4",
   "author": {
     "name": "Ramesh Nair",
     "email": "ram@hiddentao.com"
@@ -34,7 +34,6 @@
     "grunt-contrib-jshint": "~0.10.0",
     "grunt-contrib-copy": "~0.5.0",
     "grunt-contrib-watch": "~0.6.1",
-    "grunt-sass": "~0.12.1",
     "grunt-contrib-concat": "~0.4.0",
     "grunt-contrib-uglify": "~0.4.0",
     "shelljs": "~0.2.6",
@@ -43,7 +42,8 @@
     "supertest": "~0.10.0",
     "lodash": "~2.4.1",
     "cheerio": "~0.15.0",
-    "grunt-mocha": "~0.4.10"
+    "grunt-mocha": "~0.4.10",
+    "grunt-contrib-stylus": "~0.16.0"
   },
   "repository": {
     "type": "git",

public/src/stylus/_bootstrap.styl

@@ -0,0 +1,32 @@
+// Core variables and mixins
+@import "../../bower_components/bootstrap-stylus/stylus/variables";
+@import "../../bower_components/bootstrap-stylus/stylus/mixins";
+
+// Reset
+@import "../../bower_components/bootstrap-stylus/stylus/normalize";
+@import "../../bower_components/bootstrap-stylus/stylus/print";
+
+// Core CSS
+@import "../../bower_components/bootstrap-stylus/stylus/scaffolding";
+@import "../../bower_components/bootstrap-stylus/stylus/type";
+@import "../../bower_components/bootstrap-stylus/stylus/code";
+@import "../../bower_components/bootstrap-stylus/stylus/grid";
+@import "../../bower_components/bootstrap-stylus/stylus/tables";
+@import "../../bower_components/bootstrap-stylus/stylus/forms";
+@import "../../bower_components/bootstrap-stylus/stylus/buttons";
+
+// Components
+@import "../../bower_components/bootstrap-stylus/stylus/component-animations";
+@import "../../bower_components/bootstrap-stylus/stylus/dropdowns";
+@import "../../bower_components/bootstrap-stylus/stylus/button-groups";
+@import "../../bower_components/bootstrap-stylus/stylus/modals";
+@import "../../bower_components/bootstrap-stylus/stylus/navs";
+@import "../../bower_components/bootstrap-stylus/stylus/navbar";
+@import "../../bower_components/bootstrap-stylus/stylus/labels";
+@import "../../bower_components/bootstrap-stylus/stylus/alerts";
+@import "../../bower_components/bootstrap-stylus/stylus/close";
+@import "../../bower_components/bootstrap-stylus/stylus/wells";
+
+// Utility classes
+@import "../../bower_components/bootstrap-stylus/stylus/utilities";
+@import "../../bower_components/bootstrap-stylus/stylus/responsive-utilities";

public/src/stylus/_fonts.styl

@@ -0,0 +1,12 @@
+@import "../../bower_components/font-awesome-stylus/stylus/variables"
+@import "../../bower_components/font-awesome-stylus/stylus/mixins"
+@import "../../bower_components/font-awesome-stylus/stylus/path"
+@import "../../bower_components/font-awesome-stylus/stylus/core"
+@import "../../bower_components/font-awesome-stylus/stylus/larger"
+@import "../../bower_components/font-awesome-stylus/stylus/fixed-width"
+@import "../../bower_components/font-awesome-stylus/stylus/list"
+@import "../../bower_components/font-awesome-stylus/stylus/bordered-pulled"
+@import "../../bower_components/font-awesome-stylus/stylus/spinning"
+// @import "../../bower_components/font-awesome-stylus/stylus/rotated-flipped"
+@import "../../bower_components/font-awesome-stylus/stylus/stacked"
+@import "../../bower_components/font-awesome-stylus/stylus/icons"

public/src/sass/_highlight.scss → public/src/stylus/_highlight.styl

@@ -3,7 +3,8 @@ Copied from highlight.js zenburn theme
 */
 
 pre code {
-  display: block; padding: 0.5em;
+  display: block; 
+  padding: 0.5em;
   background: #3F3F3F;
   color: #DCDCDC;
 }

public/src/stylus/_variables.styl

@@ -0,0 +1,12 @@
+// font-awesome
+
+$fa-font-path =        "../fonts" !default;
+
+// bootstrap
+
+$brand-primary =         #428bca;
+$brand-success =         #5cb85c;
+$brand-warning =         #f0ad4e;
+$brand-danger =         #d9534f;
+$brand-info =            #5bc0de;
+

public/src/sass/style.scss → public/src/stylus/style.styl

@@ -1,7 +1,7 @@
 @import "_variables";
 @import "_bootstrap";
 @import "_highlight";
-@import "../../bower_components/font-awesome/scss/font-awesome";
+@import "_fonts";
 
 
 a i span {
@@ -27,7 +27,7 @@ main {
   }
 
   .pageHeader {
-    @include clearfix();
+    clearfix();
 
     .actions {
       float: right;