Merge pull request #8 from jpsirois/assets-folder

Add `assets` folder for a cleanier `app` folder hierarchy
toddmotto · Sep 20, 2013 · 183d33b · 183d33b
2 parents b1d00eb + 91d7f2c
commit 183d33b
Show file tree

Hide file tree

Showing 8 changed files with 13 additions and 12 deletions.
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -40,6 +40,7 @@ module.exports = function (grunt) {
     project: {
       src: 'src',
       app: 'app',
+      assets: '<%= project.app %>/assets',
       css: [
         '<%= project.src %>/scss/style.scss'
       ],
@@ -104,7 +105,7 @@ module.exports = function (grunt) {
     concat: {
       dev: {
         files: {
-          '<%= project.app %>/js/scripts.min.js': '<%= project.js %>'
+          '<%= project.assets %>/js/scripts.min.js': '<%= project.js %>'
         }
       },
       options: {
@@ -125,7 +126,7 @@ module.exports = function (grunt) {
       },
       dist: {
         files: {
-          '<%= project.app %>/js/scripts.min.js': '<%= project.js %>'
+          '<%= project.assets %>/js/scripts.min.js': '<%= project.js %>'
         }
       }
     },
@@ -142,7 +143,7 @@ module.exports = function (grunt) {
           banner: '<%= tag.banner %>'
         },
         files: {
-          '<%= project.app %>/css/style.min.css': '<%= project.css %>'
+          '<%= project.assets %>/css/style.min.css': '<%= project.css %>'
         }
       },
       dist: {
@@ -151,7 +152,7 @@ module.exports = function (grunt) {
           banner: '<%= tag.banner %>'
         },
         files: {
-          '<%= project.app %>/css/style.min.css': '<%= project.css %>'
+          '<%= project.assets %>/css/style.min.css': '<%= project.css %>'
         }
       }
     },
@@ -187,9 +188,9 @@ module.exports = function (grunt) {
         },
         files: [
           '<%= project.app %>/index.html',
-          '<%= project.app %>/css/*.css',
-          '<%= project.app %>/js/{,*/}*.js',
-          '<%= project.app %>/{,*/}*.{png,jpg,jpeg,gif,webp,svg}'
+          '<%= project.assets %>/css/*.css',
+          '<%= project.assets %>/js/{,*/}*.js',
+          '<%= project.assets %>/{,*/}*.{png,jpg,jpeg,gif,webp,svg}'
         ]
       }
     }

diff --git a/app/css/.gitignore → app/assets/css/.gitignore b/app/css/.gitignore → app/assets/css/.gitignore
diff --git a/app/fonts/.gitignore → app/assets/fonts/.gitignore b/app/fonts/.gitignore → app/assets/fonts/.gitignore
diff --git a/app/img/logo.svg → app/assets/img/logo.svg b/app/img/logo.svg → app/assets/img/logo.svg
diff --git a/app/js/.gitignore → app/assets/js/.gitignore b/app/js/.gitignore → app/assets/js/.gitignore
diff --git a/app/js/vendor/jquery-1.10.2.min.js → app/assets/js/vendor/jquery-1.10.2.min.js b/app/js/vendor/jquery-1.10.2.min.js → app/assets/js/vendor/jquery-1.10.2.min.js
diff --git a/app/js/vendor/modernizr-2.6.2.min.js → app/assets/js/vendor/modernizr-2.6.2.min.js b/app/js/vendor/modernizr-2.6.2.min.js → app/assets/js/vendor/modernizr-2.6.2.min.js
diff --git a/app/index.html b/app/index.html
@@ -10,17 +10,17 @@
 
     <link href="//www.google-analytics.com" rel="dns-prefetch">
     <link href="//ajax.googleapis.com" rel="dns-prefetch">
-    <link href="css/style.min.css" rel="stylesheet">
+    <link href="assets/css/style.min.css" rel="stylesheet">
 
-    <script src="js/vendor/modernizr-2.6.2.min.js"></script>
+    <script src="assets/js/vendor/modernizr-2.6.2.min.js"></script>
 
   </head>
   <body>
 
     <header class="header" role="banner">
       <div class="logo">
         <a href="/">
-          <img src="img/logo.svg" alt="Logo">
+          <img src="assets/img/logo.svg" alt="Logo">
         </a>
       </div>
       <nav class="nav" role="navigation">
@@ -45,8 +45,8 @@
     </footer>
 
     <script src="//ajax.googleapis.com/ajax/libs/jquery/1.10.2/jquery.min.js"></script>
-    <script>window.jQuery || document.write('<script src="js/vendor/jquery-1.10.2.min.js"><\/script>');</script>
-    <script src="js/scripts.min.js"></script>
+    <script>window.jQuery || document.write('<script src="assets/js/vendor/jquery-1.10.2.min.js"><\/script>');</script>
+    <script src="assets/js/scripts.min.js"></script>
 
     <script>
     (function(f,i,r,e,s,h,l){i['GoogleAnalyticsObject']=s;f[s]=f[s]||function(){