Skip to content
New issue

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

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

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
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions Gemfile
Expand Up @@ -9,3 +9,4 @@ gem "sprockets"
gem "compass" gem "compass"
gem "sass" gem "sass"
gem "i18n" gem "i18n"
gem "tilt"
37 changes: 19 additions & 18 deletions Gemfile.lock
@@ -1,60 +1,60 @@
PATH PATH
remote: . remote: .
specs: specs:
sencha-touch-rails (1.0.1) sencha-touch-rails (1.1.0)
railties (>= 3.2.1, < 5.0) railties (>= 3.2.1, < 5.0)
thor (~> 0.14) thor (~> 0.14)


GEM GEM
remote: http://rubygems.org/ remote: http://rubygems.org/
specs: specs:
actionpack (3.2.1) actionpack (3.2.3)
activemodel (= 3.2.1) activemodel (= 3.2.3)
activesupport (= 3.2.1) activesupport (= 3.2.3)
builder (~> 3.0.0) builder (~> 3.0.0)
erubis (~> 2.7.0) erubis (~> 2.7.0)
journey (~> 1.0.1) journey (~> 1.0.1)
rack (~> 1.4.0) rack (~> 1.4.0)
rack-cache (~> 1.1) rack-cache (~> 1.2)
rack-test (~> 0.6.1) rack-test (~> 0.6.1)
sprockets (~> 2.1.2) sprockets (~> 2.1.2)
activemodel (3.2.1) activemodel (3.2.3)
activesupport (= 3.2.1) activesupport (= 3.2.3)
builder (~> 3.0.0) builder (~> 3.0.0)
activesupport (3.2.1) activesupport (3.2.3)
i18n (~> 0.6) i18n (~> 0.6)
multi_json (~> 1.0) multi_json (~> 1.0)
builder (3.0.0) builder (3.0.0)
chunky_png (1.2.5) chunky_png (1.2.5)
compass (0.11.7) compass (0.12.2)
chunky_png (~> 1.2) chunky_png (~> 1.2)
fssm (>= 0.2.7) fssm (>= 0.2.7)
sass (~> 3.1) sass (~> 3.1)
erubis (2.7.0) erubis (2.7.0)
fssm (0.2.8.1) fssm (0.2.9)
hike (1.2.1) hike (1.2.1)
i18n (0.6.0) i18n (0.6.0)
journey (1.0.1) journey (1.0.4)
json (1.6.5) json (1.7.3)
multi_json (1.0.4) multi_json (1.3.6)
rack (1.4.1) rack (1.4.1)
rack-cache (1.1) rack-cache (1.2)
rack (>= 0.4) rack (>= 0.4)
rack-ssl (1.3.2) rack-ssl (1.3.2)
rack rack
rack-test (0.6.1) rack-test (0.6.1)
rack (>= 1.0) rack (>= 1.0)
railties (3.2.1) railties (3.2.3)
actionpack (= 3.2.1) actionpack (= 3.2.3)
activesupport (= 3.2.1) activesupport (= 3.2.3)
rack-ssl (~> 1.3.2) rack-ssl (~> 1.3.2)
rake (>= 0.8.7) rake (>= 0.8.7)
rdoc (~> 3.4) rdoc (~> 3.4)
thor (~> 0.14.6) thor (~> 0.14.6)
rake (0.9.2.2) rake (0.9.2.2)
rdoc (3.12) rdoc (3.12)
json (~> 1.4) json (~> 1.4)
sass (3.1.15) sass (3.1.20)
sprockets (2.1.2) sprockets (2.1.2)
hike (~> 1.2) hike (~> 1.2)
rack (~> 1.0) rack (~> 1.0)
Expand All @@ -72,3 +72,4 @@ DEPENDENCIES
sass sass
sencha-touch-rails! sencha-touch-rails!
sprockets sprockets
tilt
12 changes: 8 additions & 4 deletions lib/sass_load_paths.rb
@@ -1,10 +1,14 @@
module Sass::Rails require 'tilt'
class SassTemplate
module Sass
module Rails
class SassTemplate < Tilt::SassTemplate
def sass_options_from_rails(scope) def sass_options_from_rails(scope)
options = scope.environment.context_class.sass_config 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/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 return options
end end
end end
end end
end
8 changes: 6 additions & 2 deletions lib/theme_images.rb
Expand Up @@ -13,6 +13,10 @@ def theme_image(theme, path, mime_type = nil)
end end
end end


module Sass::Script::Functions module Sass
include SenchaTouch::SassExtensions::Functions::ThemeImages module Script
module Functions
include SenchaTouch::SassExtensions::Functions::ThemeImages
end
end
end end
34 changes: 17 additions & 17 deletions vendor/assets/stylesheets/sencha-touch-rails.scss
@@ -1,18 +1,18 @@
@import 'sencha-touch/default/all'; @import 'sencha-touch/default/all';
// //
// @include sencha-panel; @include sencha-panel;
// @include sencha-buttons; @include sencha-buttons;
// @include sencha-sheet; @include sencha-sheet;
// @include sencha-picker; @include sencha-picker;
// @include sencha-tabs; @include sencha-tabs;
// @include sencha-toolbar; @include sencha-toolbar;
// @include sencha-toolbar-forms; @include sencha-toolbar-forms;
// @include sencha-indexbar; @include sencha-indexbar;
// @include sencha-list; @include sencha-list;
// @include sencha-list-paging; @include sencha-list-paging;
// @include sencha-list-pullrefresh; @include sencha-list-pullrefresh;
// @include sencha-layout; @include sencha-layout;
// @include sencha-carousel; @include sencha-carousel;
// @include sencha-form; @include sencha-form;
// @include sencha-msgbox; @include sencha-msgbox;
// @include sencha-loading-spinner; @include sencha-loading-spinner;