fix(client:css): fix vanilla CSS, remove deprecated inject:css task

Author: Awk34

templates/app/client/app/app(css).css

@@ -1,4 +1,8 @@
-<% if (filters.bootstrap) { %>
+<%_ if (filters.bootstrap) { -%>
+@import '~bootstrap/dist/css/bootstrap.css';
+<%_ if(filters.oauth) { -%>
+@import '~bootstrap-social/bootstrap-social.css';
+<%_ }} -%>
 /**
  * Bootstrap Fonts
  */
@@ -10,7 +14,10 @@
   url('/assets/fonts/bootstrap/glyphicons-halflings-regular.woff') format('woff'),
   url('/assets/fonts/bootstrap/glyphicons-halflings-regular.ttf') format('truetype'),
   url('/assets/fonts/bootstrap/glyphicons-halflings-regular.svg#glyphicons_halflingsregular') format('svg');
-}<% } %>
+}
+
+<%_ } -%>
+@import '~font-awesome/css/font-awesome.css';
 
 /**
  *Font Awesome Fonts
@@ -44,3 +51,12 @@
     max-width: 730px;
   }
 }<% } %>
+
+/* Component styles are injected through gulp */
+/* inject:css */
+@import 'admin/admin.css';
+@import 'main/main.css';
+@import '../components/footer/footer.css';
+@import '../components/modal/modal.css';
+@import '../components/oauth-buttons/oauth-buttons.css';
+/* endinject */

templates/app/gulpfile.babel.js

@@ -199,32 +199,19 @@ gulp.task('env:prod', () => {
  ********************/
 
 gulp.task('inject', cb => {
-    runSequence(['inject:css'<% if(!filters.css) { %>, 'inject:<%= styleExt %>'<% } %>], cb);
+    runSequence(['inject:<%= styleExt %>'], cb);
 });
 
-gulp.task('inject:css', () => {
-    return gulp.src(paths.client.mainView)
-        .pipe(plugins.inject(
-            gulp.src(`${clientPath}/{app,components}/**/*.css`, {read: false})
-                .pipe(plugins.sort()),
-            {
-                starttag: '<!-- injector:css -->',
-                endtag: '<!-- endinjector -->',
-                transform: (filepath) => '<link rel="stylesheet" href="' + filepath.replace(`/${clientPath}/`, '').replace('/.tmp/', '') + '">'
-            }))
-        .pipe(gulp.dest(clientPath));
-});<% if(!filters.css) { %>
-
 gulp.task('inject:<%= styleExt %>', () => {
     return gulp.src(paths.client.mainStyle)
         .pipe(plugins.inject(
             gulp.src(_.union(paths.client.styles, ['!' + paths.client.mainStyle]), {read: false})
                 .pipe(plugins.sort()),
             {
-                <%_ if(filters.stylus) { _%>
-                starttag: '/* inject:styl */',
+                <%_ if(filters.stylus || filters.css) { -%>
+                starttag: '/* inject:<%= styleExt %> */',
                 endtag: '/* endinject */',
-                <%_ } _%>
+                <%_ } -%>
                 transform: (filepath) => {
                     let newPath = filepath
                         .replace(`/${clientPath}/app/`, '')
@@ -235,7 +222,7 @@ gulp.task('inject:<%= styleExt %>', () => {
                 }
             }))
         .pipe(gulp.dest(`${clientPath}/app`));
-});<% } %>
+});
 
 gulp.task('webpack:dev', function() {
     const webpackDevConfig = makeWebpackConfig({ DEV: true });