bonethug 0.0.30 → 0.0.31

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
data/config/cnf.yml CHANGED
@@ -159,13 +159,17 @@ vendor:
159
159
  watch:
160
160
  sass:
161
161
  -
162
- src: public/assets/scss
163
- dest: public/assets/css
164
- filter: !ruby/regexp '/^.+\.scss$/'
162
+ src: public/themes/project/scss
163
+ dest: public/themes/project/css
164
+ filter: !ruby/regexp '/main\.scss$/'
165
+ -
166
+ src: public/themes/project/scss
167
+ dest: public/themes/project/css
168
+ filter: !ruby/regexp '/typography\.scss$/'
165
169
  coffee:
166
170
  -
167
- src: public/assets/coffee
168
- dest: public/assets/js
169
- filter: !ruby/regexp '/^.+\.coffee$/'
171
+ src: public/project/coffee
172
+ dest: public/project/javascript
173
+ filter: !ruby/regexp '/main\.coffee$/'
170
174
  log_dirs:
171
175
  - log
@@ -1,3 +1,3 @@
1
1
  module Bonethug
2
- VERSION = "0.0.30"
2
+ VERSION = "0.0.31"
3
3
  end
@@ -117,3 +117,31 @@ if (!defined('SS_SITE_DATABASE_NAME')) define('SS_SITE_DATABASE_NAME', $database
117
117
 
118
118
  //jpeg quality
119
119
  Config::inst()->update('GDBackend', 'default_quality', 80);
120
+
121
+
122
+ // JS Assets
123
+ // ---------------------------
124
+
125
+ Config::inst()->update('Requirements', 'write_js_to_body', false);
126
+ Requirements::combine_files(
127
+ 'application.js',
128
+ array(
129
+ 'vendor/jquery/jquery.min.js',
130
+ 'project/javascript/main.js',
131
+ 'vendor/selectivizr/selectivizr.min.js',
132
+ 'vendor/respond/respond.min.js',
133
+ 'vendor/modernizr/modernizr.js'
134
+ )
135
+ );
136
+
137
+
138
+ // CSS Assets
139
+ // ---------------------------
140
+
141
+ Requirements::combine_files(
142
+ 'application.css',
143
+ array(
144
+ 'themes/project/main.css',
145
+ 'themes/project/typography.css'
146
+ )
147
+ );
@@ -23,10 +23,8 @@
23
23
  <script src="//html5shiv.googlecode.com/svn/trunk/html5.js"></script>
24
24
  <![endif]-->
25
25
 
26
- <% require themedCSS('reset') %>
26
+ <% require themedCSS('application') %>
27
27
  <% require themedCSS('typography') %>
28
- <% require themedCSS('form') %>
29
- <% require themedCSS('layout') %>
30
28
 
31
29
  <link rel="shortcut icon" href="themes/project/images/favicon.ico" type="image/x-icon" />
32
30
  <link rel="apple-touch-icon" href="themes/project/images/apple-touch-icon.png" />
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: bonethug
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.0.30
4
+ version: 0.0.31
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -384,8 +384,8 @@ files:
384
384
  - skel/project_types/silverstripe3/public/themes/project/images/favicons/apple-touch-icon.png
385
385
  - skel/project_types/silverstripe3/public/themes/project/images/favicons/favicon.ico
386
386
  - skel/project_types/silverstripe3/public/themes/project/images/favicons/iconifier-readme.txt
387
- - skel/project_types/silverstripe3/public/themes/project/scss/application.css.scss
388
- - skel/project_types/silverstripe3/public/themes/project/scss/typography.css.scss
387
+ - skel/project_types/silverstripe3/public/themes/project/scss/main.scss
388
+ - skel/project_types/silverstripe3/public/themes/project/scss/typography.scss
389
389
  - skel/project_types/silverstripe3/public/themes/project/templates/Includes/.gitkeep
390
390
  - skel/project_types/silverstripe3/public/themes/project/templates/Layout/Page.ss
391
391
  - skel/project_types/silverstripe3/public/themes/project/templates/Layout/Security.ss