tdreyno-staticmatic 2.9.6 → 2.9.7

Sign up to get free protection for your applications and to get access to all the features.
Files changed (2) hide show
  1. data/lib/merb/init.rb +4 -6
  2. metadata +1 -1
data/lib/merb/init.rb CHANGED
@@ -14,11 +14,6 @@ Merb::Config.use do |c|
14
14
  c[:log_level] = :error
15
15
  c[:log_stream] = STDOUT
16
16
  c[:log_file] = nil
17
-
18
- c[:sass] = {
19
- :template_location => Merb.root / 'stylesheets',
20
- :css_location => Merb.root / 'public' / 'stylesheets',
21
- }
22
17
  end
23
18
 
24
19
  Merb.push_path(:controller, File.dirname(__FILE__))
@@ -28,4 +23,7 @@ Merb.push_path(:stylesheet, Merb.dir_for(:public) / "stylesheets", nil)
28
23
  Merb.push_path(:javascript, Merb.dir_for(:public) / "javascripts", nil)
29
24
  Merb.push_path(:image, Merb.dir_for(:public) / "images", nil)
30
25
  Merb.push_path(:view, Merb.root / "pages")
31
- Merb.push_path(:helper, Merb.root / "helpers")
26
+ Merb.push_path(:helper, Merb.root / "helpers")
27
+
28
+ Merb::Plugins.config[:sass][:template_location] = Merb.root / "stylesheets"
29
+ Merb::Plugins.config[:sass][:css_location] = Merb.dir_for(:stylesheet)
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: tdreyno-staticmatic
3
3
  version: !ruby/object:Gem::Version
4
- version: 2.9.6
4
+ version: 2.9.7
5
5
  platform: ruby
6
6
  authors:
7
7
  - Stephen Bartholomew