Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Already on GitHub? Sign in to your account

Getting working with Rails 3.2 and a rails mountable engine #4

Merged
merged 7 commits into from Jul 30, 2012
View
@@ -9,3 +9,4 @@ gem "sprockets"
gem "compass"
gem "sass"
gem "i18n"
+gem "tilt"
View
@@ -1,60 +1,60 @@
PATH
remote: .
specs:
- sencha-touch-rails (1.0.1)
+ sencha-touch-rails (1.1.0)
railties (>= 3.2.1, < 5.0)
thor (~> 0.14)
GEM
remote: http://rubygems.org/
specs:
- actionpack (3.2.1)
- activemodel (= 3.2.1)
- activesupport (= 3.2.1)
+ actionpack (3.2.3)
+ activemodel (= 3.2.3)
+ activesupport (= 3.2.3)
builder (~> 3.0.0)
erubis (~> 2.7.0)
journey (~> 1.0.1)
rack (~> 1.4.0)
- rack-cache (~> 1.1)
+ rack-cache (~> 1.2)
rack-test (~> 0.6.1)
sprockets (~> 2.1.2)
- activemodel (3.2.1)
- activesupport (= 3.2.1)
+ activemodel (3.2.3)
+ activesupport (= 3.2.3)
builder (~> 3.0.0)
- activesupport (3.2.1)
+ activesupport (3.2.3)
i18n (~> 0.6)
multi_json (~> 1.0)
builder (3.0.0)
chunky_png (1.2.5)
- compass (0.11.7)
+ compass (0.12.2)
chunky_png (~> 1.2)
fssm (>= 0.2.7)
sass (~> 3.1)
erubis (2.7.0)
- fssm (0.2.8.1)
+ fssm (0.2.9)
hike (1.2.1)
i18n (0.6.0)
- journey (1.0.1)
- json (1.6.5)
- multi_json (1.0.4)
+ journey (1.0.4)
+ json (1.7.3)
+ multi_json (1.3.6)
rack (1.4.1)
- rack-cache (1.1)
+ rack-cache (1.2)
rack (>= 0.4)
rack-ssl (1.3.2)
rack
rack-test (0.6.1)
rack (>= 1.0)
- railties (3.2.1)
- actionpack (= 3.2.1)
- activesupport (= 3.2.1)
+ railties (3.2.3)
+ actionpack (= 3.2.3)
+ activesupport (= 3.2.3)
rack-ssl (~> 1.3.2)
rake (>= 0.8.7)
rdoc (~> 3.4)
thor (~> 0.14.6)
rake (0.9.2.2)
rdoc (3.12)
json (~> 1.4)
- sass (3.1.15)
+ sass (3.1.20)
sprockets (2.1.2)
hike (~> 1.2)
rack (~> 1.0)
@@ -72,3 +72,4 @@ DEPENDENCIES
sass
sencha-touch-rails!
sprockets
+ tilt
View
@@ -1,10 +1,14 @@
-module Sass::Rails
- class SassTemplate
+require 'tilt'
+
+module Sass
+ module Rails
+ class SassTemplate < Tilt::SassTemplate
def sass_options_from_rails(scope)
options = scope.environment.context_class.sass_config
options.load_paths << "#{Gem.loaded_specs['compass'].full_gem_path}/frameworks/compass/stylesheets"
- options.load_paths << "#{Gem.loaded_specs['compass'].full_gem_path}/frameworks/blueprint/stylesheets"
+ options.load_paths << "#{Gem.loaded_specs['compass'].full_gem_path}/frameworks/blueprint/stylesheets"
return options
end
end
-end
+ end
+end
View
@@ -13,6 +13,10 @@ def theme_image(theme, path, mime_type = nil)
end
end
-module Sass::Script::Functions
- include SenchaTouch::SassExtensions::Functions::ThemeImages
+module Sass
+ module Script
+ module Functions
+ include SenchaTouch::SassExtensions::Functions::ThemeImages
+ end
+ end
end
@@ -1,18 +1,18 @@
@import 'sencha-touch/default/all';
-//
-// @include sencha-panel;
-// @include sencha-buttons;
-// @include sencha-sheet;
-// @include sencha-picker;
-// @include sencha-tabs;
-// @include sencha-toolbar;
-// @include sencha-toolbar-forms;
-// @include sencha-indexbar;
-// @include sencha-list;
-// @include sencha-list-paging;
-// @include sencha-list-pullrefresh;
-// @include sencha-layout;
-// @include sencha-carousel;
-// @include sencha-form;
-// @include sencha-msgbox;
-// @include sencha-loading-spinner;
+//
+@include sencha-panel;
+@include sencha-buttons;
+@include sencha-sheet;
+@include sencha-picker;
+@include sencha-tabs;
+@include sencha-toolbar;
+@include sencha-toolbar-forms;
+@include sencha-indexbar;
+@include sencha-list;
+@include sencha-list-paging;
+@include sencha-list-pullrefresh;
+@include sencha-layout;
+@include sencha-carousel;
+@include sencha-form;
+@include sencha-msgbox;
+@include sencha-loading-spinner;