bonethug 0.0.30 → 0.0.31

data/config/cnf.yml

@@ -159,13 +159,17 @@ vendor:
 watch:
   sass:
     -
-      src: public/assets/scss
-      dest: public/assets/css
-      filter: !ruby/regexp '/^.+\.scss$/'
+      src: public/themes/project/scss
+      dest: public/themes/project/css
+      filter: !ruby/regexp '/main\.scss$/'
+    -
+      src: public/themes/project/scss
+      dest: public/themes/project/css
+      filter: !ruby/regexp '/typography\.scss$/'      
   coffee:
     -
-      src: public/assets/coffee
-      dest: public/assets/js
-      filter: !ruby/regexp '/^.+\.coffee$/'
+      src: public/project/coffee
+      dest: public/project/javascript
+      filter: !ruby/regexp '/main\.coffee$/'
 log_dirs:
   - log

data/lib/bonethug/version.rb

@@ -1,3 +1,3 @@
 module Bonethug
-  VERSION = "0.0.30"
+  VERSION = "0.0.31"
 end

data/skel/project_types/silverstripe3/public/project/_config.php

@@ -117,3 +117,31 @@ if (!defined('SS_SITE_DATABASE_NAME'))	define('SS_SITE_DATABASE_NAME', $database
 
 //jpeg quality
 Config::inst()->update('GDBackend', 'default_quality', 80);
+
+
+// JS Assets
+// ---------------------------
+
+Config::inst()->update('Requirements', 'write_js_to_body', false);
+Requirements::combine_files(
+    'application.js',
+    array(
+    	'vendor/jquery/jquery.min.js',
+    	'project/javascript/main.js',
+    	'vendor/selectivizr/selectivizr.min.js',
+    	'vendor/respond/respond.min.js',
+    	'vendor/modernizr/modernizr.js'      
+    )
+);
+
+
+// CSS Assets
+// ---------------------------
+
+Requirements::combine_files(
+    'application.css',
+    array(
+    	'themes/project/main.css',
+    	'themes/project/typography.css'   
+    )
+);

data/skel/project_types/silverstripe3/public/themes/project/templates/Page.ss

@@ -23,10 +23,8 @@
       <script src="//html5shiv.googlecode.com/svn/trunk/html5.js"></script>
     <![endif]-->
 
-    <% require themedCSS('reset') %>
+    <% require themedCSS('application') %>
     <% require themedCSS('typography') %>
-    <% require themedCSS('form') %>
-    <% require themedCSS('layout') %>
 
     <link rel="shortcut icon" href="themes/project/images/favicon.ico" type="image/x-icon" />
     <link rel="apple-touch-icon" href="themes/project/images/apple-touch-icon.png" />

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bonethug
 version: !ruby/object:Gem::Version
-  version: 0.0.30
+  version: 0.0.31
   prerelease: 
 platform: ruby
 authors:
@@ -384,8 +384,8 @@ files:
 - skel/project_types/silverstripe3/public/themes/project/images/favicons/apple-touch-icon.png
 - skel/project_types/silverstripe3/public/themes/project/images/favicons/favicon.ico
 - skel/project_types/silverstripe3/public/themes/project/images/favicons/iconifier-readme.txt
-- skel/project_types/silverstripe3/public/themes/project/scss/application.css.scss
-- skel/project_types/silverstripe3/public/themes/project/scss/typography.css.scss
+- skel/project_types/silverstripe3/public/themes/project/scss/main.scss
+- skel/project_types/silverstripe3/public/themes/project/scss/typography.scss
 - skel/project_types/silverstripe3/public/themes/project/templates/Includes/.gitkeep
 - skel/project_types/silverstripe3/public/themes/project/templates/Layout/Page.ss
 - skel/project_types/silverstripe3/public/themes/project/templates/Layout/Security.ss