broken checkpoint while trying to fix image-url

QutEcoacoustics · Aug 11, 2015 · 6019f64 · 6019f64
1 parent f8ef3d0
commit 6019f64
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 7 deletions.
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -5,7 +5,8 @@ module.exports = function (grunt) {
         gzipStatic = require("connect-gzip-static"),
         path = require("path"),
         slash = require("slash"),
-        _ = require("lodash");
+        _ = require("lodash"),
+        sass = require("./node_modules/grunt-sass/node_modules/node-sass");
 
 
     /**
@@ -370,10 +371,21 @@ module.exports = function (grunt) {
          * This task is run after the sass file template has been processed.
          */
         sassReal: {
-            options: {},
+            options: {
+                //functions: {
+                //    "image-url($img)": function(img, done) {
+                //        var imgPath = img.getValue(),
+                //            // equivalent to "<%= build_configs.current.siteDir %>assets/img"
+                //            fullPath = path.join(userConfig.build_configs.current.siteDir, imgPath);
+                //
+                //        var newPath = new sass.types.String(fullPath);
+                //
+                //        return newPath;
+                //    }
+                //}
+            },
             build: {
                 options: {
-                    imagePath: "<%= build_configs.current.siteDir %>assets/img",
                     outputStyle: "expanded",
                     sourceComments: "normal" /*'map',
                      sourceMap: '<%= sassDestName %>.map'*/
@@ -383,7 +395,6 @@ module.exports = function (grunt) {
             },
             compile: {
                 options: {
-                    imagePath: "<%= build_configs.current.siteDir %>assets/img",
                     outputStyle: "compressed",
                     sourceComments: "none"
                 },

diff --git a/bower.json b/bower.json
@@ -26,7 +26,7 @@
     "sass-bootstrap": "3.0.2",
     "angular-loading-bar": "~0.7.1",
     "ng-form-group": "~1.2.11",
-    "bootstrap-sass": "~3.3.5"
+    "bootstrap-sass": "3.3-stable"
   },
   "dependencies": {},
   "private": true,

diff --git a/buildConfig/build.config.js b/buildConfig/build.config.js
@@ -154,7 +154,13 @@ module.exports = {
 
                 return template;
             },
-            "vendor/bootstrap-sass/assets/fonts/bootstrap/**"
+            function (template) {
+                template.src = "vendor/bootstrap-sass/assets/fonts/bootstrap/**";
+                template.dest += "fonts/bootstrap/";
+
+
+                return template;
+            }
         ]
     }
 };
diff --git a/src/components/directives/auth.js b/src/components/directives/auth.js
@@ -18,7 +18,7 @@ angular.module("angular-auth", ["http-auth-interceptor"])
                 login.hide();
 
                 var isLoginBoxOpen = function(){
-                    throw new Error("Dependent on jQuery!");
+                    return false;
                     /*var loginHolderElm = $("#login-holder");
                     var mainElm = $("#content");