#3724 fix concat css to not mess with paths replaced with regexp

src/definitions/elements/flag.less

@@ -50,4 +50,4 @@ i.flag:not(.icon):before {
   height: @height;
 }
 
-.loadUIOverrides();
+.loadUIOverrides();

tasks/collections/internal.js

@@ -55,7 +55,7 @@ module.exports = function(gulp) {
       .pipe(plumber())
       .pipe(dedupe())
       .pipe(replace(assets.uncompressed, assets.packaged))
-      .pipe(concatCSS(filenames.concatenatedCSS))
+      .pipe(concatCSS(filenames.concatenatedCSS, settings.concatCSS))
         .pipe(gulpif(config.hasPermission, chmod(config.permission)))
         .pipe(header(banner, settings.header))
         .pipe(gulp.dest(output.packaged))
@@ -68,7 +68,7 @@ module.exports = function(gulp) {
       .pipe(plumber())
       .pipe(dedupe())
       .pipe(replace(assets.uncompressed, assets.packaged))
-      .pipe(concatCSS(filenames.concatenatedMinifiedCSS))
+      .pipe(concatCSS(filenames.concatenatedMinifiedCSS, settings.concatCSS))
         .pipe(gulpif(config.hasPermission, chmod(config.permission)))
         .pipe(minifyCSS(settings.concatMinify))
         .pipe(header(banner, settings.header))
@@ -114,7 +114,7 @@ module.exports = function(gulp) {
       return gulp.src(output.uncompressed + '/**/' + globs.components + globs.ignoredRTL + '.rtl.css')
         .pipe(dedupe())
         .pipe(replace(assets.uncompressed, assets.packaged))
-        .pipe(concatCSS(filenames.concatenatedRTLCSS))
+        .pipe(concatCSS(filenames.concatenatedRTLCSS, settings.concatCSS))
           .pipe(gulpif(config.hasPermission, chmod(config.permission)))
           .pipe(header(banner, settings.header))
           .pipe(gulp.dest(output.packaged))
@@ -126,7 +126,7 @@ module.exports = function(gulp) {
       return gulp.src(output.uncompressed + '/**/' + globs.components + globs.ignoredRTL + '.rtl.css')
         .pipe(dedupe())
         .pipe(replace(assets.uncompressed, assets.packaged))
-        .pipe(concatCSS(filenames.concatenatedMinifiedRTLCSS))
+        .pipe(concatCSS(filenames.concatenatedMinifiedRTLCSS, settings.concatCSS))
           .pipe(gulpif(config.hasPermission, chmod(config.permission)))
           .pipe(minifyCSS(settings.concatMinify))
           .pipe(header(banner, settings.header))
@@ -140,7 +140,7 @@ module.exports = function(gulp) {
         .pipe(dedupe())
         .pipe(plumber())
         .pipe(replace(assets.uncompressed, assets.packaged))
-        .pipe(concatCSS(filenames.concatenatedCSS))
+        .pipe(concatCSS(filenames.concatenatedCSS, settings.concatCSS))
           .pipe(gulpif(config.hasPermission, chmod(config.permission)))
           .pipe(gulp.dest(output.packaged))
           .pipe(print(log.created))
@@ -152,7 +152,7 @@ module.exports = function(gulp) {
         .pipe(dedupe())
         .pipe(plumber())
         .pipe(replace(assets.uncompressed, assets.packaged))
-        .pipe(concatCSS(filenames.concatenatedMinifiedCSS))
+        .pipe(concatCSS(filenames.concatenatedMinifiedCSS, settings.concatCSS))
           .pipe(minifyCSS(settings.concatMinify))
           .pipe(header(banner, settings.header))
           .pipe(gulpif(config.hasPermission, chmod(config.permission)))
@@ -176,7 +176,7 @@ module.exports = function(gulp) {
       .pipe(dedupe())
       .pipe(plumber())
       .pipe(replace(assets.uncompressed, assets.packaged))
-      .pipe(concatCSS(filenames.concatenatedCSS))
+      .pipe(concatCSS(filenames.concatenatedCSS, settings.concatCSS))
         .pipe(gulpif(config.hasPermission, chmod(config.permission)))
         .pipe(gulp.dest(docsOutput.packaged))
         .pipe(print(log.created))
@@ -188,7 +188,7 @@ module.exports = function(gulp) {
       .pipe(dedupe())
       .pipe(plumber())
       .pipe(replace(assets.uncompressed, assets.packaged))
-      .pipe(concatCSS(filenames.concatenatedMinifiedCSS))
+      .pipe(concatCSS(filenames.concatenatedMinifiedCSS, settings.concatCSS))
         .pipe(minifyCSS(settings.concatMinify))
         .pipe(header(banner, settings.header))
         .pipe(gulpif(config.hasPermission, chmod(config.permission)))
@@ -224,4 +224,4 @@ module.exports = function(gulp) {
     ;
   });
 
-};
+};

tasks/config/admin/github.js

@@ -19,7 +19,6 @@ var
 ;
 
 if(!oAuth) {
-  console.log('here');
   console.error('Must add oauth token for GitHub in tasks/config/admin/oauth.js');
 }
 
@@ -35,4 +34,4 @@ github.authenticate({
   token: oAuth.token
 });
 
-module.exports = github;
+module.exports = github;

tasks/config/project/config.js

@@ -92,11 +92,12 @@ module.exports = {
 
     config.paths.assets = {
       source       : '../../themes', // source asset path is always the same
-      uncompressed : '.' + path.sep + path.relative(config.paths.output.uncompressed, config.paths.output.themes).replace(/\\/g,'/'),
-      compressed   : '.' + path.sep + path.relative(config.paths.output.compressed, config.paths.output.themes).replace(/\\/g,'/'),
-      packaged     : '.' + path.sep + path.relative(config.paths.output.packaged, config.paths.output.themes).replace(/\\/g,'/')
+      uncompressed : '.' + path.sep + path.relative(config.paths.output.uncompressed, config.paths.output.themes).replace(/\\/g, '/'),
+      compressed   : '.' + path.sep + path.relative(config.paths.output.compressed, config.paths.output.themes).replace(/\\/g, '/'),
+      packaged     : '.' + path.sep + path.relative(config.paths.output.packaged, config.paths.output.themes).replace(/\\/g, '/')
     };
 
+    console.log(config.paths.assets);
 
     /*--------------
        Permission

tasks/config/tasks.js

@@ -69,6 +69,10 @@ module.exports = {
       silent : true
     },
 
+    concatCSS: {
+      rebaseUrls: false
+    },
+
     /* Comment Banners */
     header: {
       title      : release.title,

tasks/watch.js

@@ -228,4 +228,4 @@ module.exports = function(callback) {
     })
   ;
 
-};
+};