Update dist/ to keep assets/** folder and exclude assets/sass from it

okTurtles · Jun 1, 2018 · e021676 · e021676
1 parent af2d845
commit e021676
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/.Gruntfile.babel.js b/.Gruntfile.babel.js
@@ -80,7 +80,7 @@ module.exports = (grunt) => {
           expand: true,
           cwd: 'frontend/simple/assets/sass',
           src: ['*.{sass,scss}', '!_*/**'],
-          dest: 'dist/simple/css/',
+          dest: 'dist/simple/assets/css/',
           ext: '.css'
         }]
       }
@@ -95,8 +95,8 @@ module.exports = (grunt) => {
       },
       assets: {
         cwd: 'frontend/simple/assets',
-        src: ['**/*'],
-        dest: 'dist/simple',
+        src: ['**/*', '!sass/**'],
+        dest: 'dist/simple/assets',
         expand: true
       }
     },

diff --git a/frontend/index.html b/frontend/index.html
@@ -6,7 +6,7 @@
         <title>Group Income Simple</title>
         <meta name="description" content="">
         <meta name="viewport" content="width=device-width, initial-scale=1">
-        <link rel="stylesheet" href="simple/css/main.css">
+        <link rel="stylesheet" href="simple/assets/css/main.css">
         <link rel="icon" href="/simple/images/group-income-icon-transparent.png" sizes="32x32">
     </head>
     <body class="hero is-fullheight">

diff --git a/frontend/simple/assets/sass/page-specific-example.sass b/frontend/simple/assets/sass/page-specific-example.sass
@@ -1,7 +1,7 @@
 // page specific
 // this will create:
-// - dist/simple/css/page-specific-example.css
-// - dist/simple/css/page-specific-example.css.map (during development only)
+// - dist/simple/assets/css/page-specific-example.css
+// - dist/simple/assets/css/page-specific-example.css.map (during development only)
 //
 // TODO: verify that injecting CSS works
 // TODO: figure out the best way to integrate this with browserify

diff --git a/frontend/simple/index.html b/frontend/simple/index.html
@@ -6,7 +6,7 @@
     <title>Group Income Simple</title>
     <meta name="description" content="">
     <meta name="viewport" content="width=device-width, initial-scale=1">
-    <link rel="stylesheet" href="/simple/css/main.css">
+    <link rel="stylesheet" href="/simple/assets/css/main.css">
     <link rel="icon" href="/simple/images/group-income-icon-transparent.png" sizes="32x32">
   </head>
   <body>