nav tabs on admin dashboard

node_modules/css-loader/lib/loader.js

@@ -6,18 +6,14 @@ var loaderUtils = require("loader-utils");
 var processCss = require("./processCss");
 var getImportPrefix = require("./getImportPrefix");
 var compileExports = require("./compile-exports");
-var createResolver = require("./createResolver");
 
 
 module.exports = function(content, map) {
-	if(this.cacheable) this.cacheable();
 	var callback = this.async();
 	var query = loaderUtils.getOptions(this) || {};
-	var root = query.root;
-	var moduleMode = query.modules || query.module;
-	var camelCaseKeys = query.camelCase || query.camelcase;
+	var moduleMode = query.modules;
+	var camelCaseKeys = query.camelCase;
 	var sourceMap = query.sourceMap || false;
-	var resolve = createResolver(query.alias);
 
 	if(sourceMap) {
 		if (map) {
@@ -42,8 +38,6 @@ module.exports = function(content, map) {
 		from: loaderUtils.getRemainingRequest(this).split("!").pop(),
 		to: loaderUtils.getCurrentRequest(this).split("!").pop(),
 		query: query,
-		resolve: resolve,
-		minimize: this.minimize,
 		loaderContext: this,
 		sourceMap: sourceMap
 	}, function(err, result) {
@@ -55,7 +49,11 @@ module.exports = function(content, map) {
 		var importUrlPrefix = getImportPrefix(this, query);
 
 		var alreadyImported = {};
-		var importJs = result.importItems.filter(function(imp) {
+		var importJs = result.importItems.map(function(imp) {
+			// fixes #781 when importing `url(filename.css )`
+			imp.url = imp.url.trim();
+			return imp;
+		}).filter(function(imp) {
 			if(!imp.mediaQuery) {
 				if(alreadyImported[imp.url])
 					return false;
@@ -63,7 +61,7 @@ module.exports = function(content, map) {
 			}
 			return true;
 		}).map(function(imp) {
-			if(!loaderUtils.isUrlRequest(imp.url, root)) {
+			if(!loaderUtils.isUrlRequest(imp.url)) {
 				return "exports.push([module.id, " +
 					JSON.stringify("@import url(" + imp.url + ");") + ", " +
 					JSON.stringify(imp.mediaQuery) + "]);";
@@ -94,7 +92,7 @@ module.exports = function(content, map) {
 				var match = result.urlItemRegExp.exec(item);
 				var idx = +match[1];
 				var urlItem = result.urlItems[idx];
-				var url = resolve(urlItem.url);
+				var url = urlItem.url;
 				idx = url.indexOf("?#");
 				if(idx < 0) idx = url.indexOf("#");
 				var urlRequest;
@@ -108,7 +106,7 @@ module.exports = function(content, map) {
 				return "\" + escape(require(" + loaderUtils.stringifyRequest(this, urlRequest) + ")) + \"";
 			}.bind(this));
 		}
-		
+
 		var exportJs = compileExports(result, importItemMatcher.bind(this), camelCaseKeys);
 		if (exportJs) {
 			exportJs = "exports.locals = " + exportJs + ";";