Support for Rails 3.1 asset pipeline #42

Open
wants to merge 11 commits into
from
Commits on Aug 29, 2011
  1. @jweslley
  2. @jweslley
  3. @jweslley

    remove files for demo

    jweslley committed Aug 29, 2011
  4. @jweslley

    add how-to-use instructions

    jweslley committed Aug 29, 2011
Commits on Sep 2, 2011
  1. @jweslley
  2. @jweslley

    fixed image extension

    jweslley committed Sep 2, 2011
Commits on Jan 5, 2012
  1. @nicolasblanco
Commits on Jan 19, 2012
  1. @willthames

    Merge remote-tracking branch 'upstream/master'

    willthames committed Jan 19, 2012
    Conflicts:
    	README.md
    	app/assets/fonts/web-app-theme/default/museo700-regular-webfont.eot
    	app/assets/fonts/web-app-theme/default/museo700-regular-webfont.svg
    	app/assets/fonts/web-app-theme/default/museo700-regular-webfont.ttf
    	app/assets/fonts/web-app-theme/default/museo700-regular-webfont.woff
    	app/assets/fonts/web-app-theme/default/museosans_500-webfont.eot
    	app/assets/fonts/web-app-theme/default/museosans_500-webfont.svg
    	app/assets/fonts/web-app-theme/default/museosans_500-webfont.ttf
    	app/assets/fonts/web-app-theme/default/museosans_500-webfont.woff
    	app/assets/fonts/web-app-theme/default/museosans_500_italic-webfont.eot
    	app/assets/fonts/web-app-theme/default/museosans_500_italic-webfont.svg
    	app/assets/fonts/web-app-theme/default/museosans_500_italic-webfont.ttf
    	app/assets/fonts/web-app-theme/default/museosans_500_italic-webfont.woff
    	app/assets/images/web-app-theme/activo/arrow.png
    	app/assets/images/web-app-theme/activo/boxbar-background.png
    	app/assets/images/web-app-theme/activo/button-background-active.png
    	app/assets/images/web-app-theme/activo/button-background.png
    	app/assets/images/web-app-theme/activo/menubar-background.png
    	app/assets/images/web-app-theme/default/arrow.png
    	app/assets/images/web-app-theme/default/bgd.jpg
    	app/assets/images/web-app-theme/default/boxbar-background.png
    	app/assets/images/web-app-theme/default/button-background-active.png
    	app/assets/images/web-app-theme/default/button-background.png
    	app/assets/images/web-app-theme/default/messages/error.png
    	app/assets/images/web-app-theme/default/messages/notice.png
    	app/assets/images/web-app-theme/default/messages/warning.png
    	app/assets/images/web-app-theme/icons/application_edit.png
    	app/assets/images/web-app-theme/icons/cross.png
    	app/assets/images/web-app-theme/icons/key.png
    	app/assets/images/web-app-theme/icons/tick.png
    	app/assets/images/web-app-theme/themes/activo/images/arrow.png
    	app/assets/images/web-app-theme/themes/activo/images/boxbar-background.png
    	app/assets/images/web-app-theme/themes/activo/images/button-background-active.png
    	app/assets/images/web-app-theme/themes/activo/images/button-background.png
    	app/assets/images/web-app-theme/themes/activo/images/menubar-background.png
    	app/assets/images/web-app-theme/themes/default/images/arrow.png
    	app/assets/images/web-app-theme/themes/default/images/bgd.jpg
    	app/assets/images/web-app-theme/themes/default/images/boxbar-background.png
    	app/assets/images/web-app-theme/themes/default/images/button-background-active.png
    	app/assets/images/web-app-theme/themes/default/images/button-background.png
    	app/assets/images/web-app-theme/themes/default/images/messages/error.png
    	app/assets/images/web-app-theme/themes/default/images/messages/notice.png
    	app/assets/images/web-app-theme/themes/default/images/messages/warning.png
    	app/assets/stylesheets/web-app-theme.css
    	app/assets/stylesheets/web-app-theme/activo.css.erb
    	app/assets/stylesheets/web-app-theme/amro.css
    	app/assets/stylesheets/web-app-theme/base.css
    	app/assets/stylesheets/web-app-theme/bec-green.css
    	app/assets/stylesheets/web-app-theme/bec.css
    	app/assets/stylesheets/web-app-theme/blue.css
    	app/assets/stylesheets/web-app-theme/default.css.erb
    	app/assets/stylesheets/web-app-theme/djime-cerulean.css
    	app/assets/stylesheets/web-app-theme/drastic-dark.css
    	app/assets/stylesheets/web-app-theme/kathleene.css
    	app/assets/stylesheets/web-app-theme/olive.css
    	app/assets/stylesheets/web-app-theme/orange.css
    	app/assets/stylesheets/web-app-theme/red.css
    	app/assets/stylesheets/web-app-theme/reidb-greenish.css
    	app/assets/stylesheets/web-app-theme/themes/activo/style.css
    	app/assets/stylesheets/web-app-theme/themes/amro/style.css
    	app/assets/stylesheets/web-app-theme/themes/bec-green/style.css
    	app/assets/stylesheets/web-app-theme/themes/bec/style.css
    	app/assets/stylesheets/web-app-theme/themes/blue/style.css
    	app/assets/stylesheets/web-app-theme/themes/default/fonts/museo700-regular-webfont.eot
    	app/assets/stylesheets/web-app-theme/themes/default/fonts/museo700-regular-webfont.svg
    	app/assets/stylesheets/web-app-theme/themes/default/fonts/museo700-regular-webfont.ttf
    	app/assets/stylesheets/web-app-theme/themes/default/fonts/museo700-regular-webfont.woff
    	app/assets/stylesheets/web-app-theme/themes/default/fonts/museosans_500-webfont.eot
    	app/assets/stylesheets/web-app-theme/themes/default/fonts/museosans_500-webfont.svg
    	app/assets/stylesheets/web-app-theme/themes/default/fonts/museosans_500-webfont.ttf
    	app/assets/stylesheets/web-app-theme/themes/default/fonts/museosans_500-webfont.woff
    	app/assets/stylesheets/web-app-theme/themes/default/fonts/museosans_500_italic-webfont.eot
    	app/assets/stylesheets/web-app-theme/themes/default/fonts/museosans_500_italic-webfont.svg
    	app/assets/stylesheets/web-app-theme/themes/default/fonts/museosans_500_italic-webfont.ttf
    	app/assets/stylesheets/web-app-theme/themes/default/fonts/museosans_500_italic-webfont.woff
    	app/assets/stylesheets/web-app-theme/themes/default/style.css
    	app/assets/stylesheets/web-app-theme/themes/djime-cerulean/style.css
    	app/assets/stylesheets/web-app-theme/themes/drastic-dark/style.css
    	app/assets/stylesheets/web-app-theme/themes/kathleene/style.css
    	app/assets/stylesheets/web-app-theme/themes/olive/style.css
    	app/assets/stylesheets/web-app-theme/themes/orange/style.css
    	app/assets/stylesheets/web-app-theme/themes/red/style.css
    	app/assets/stylesheets/web-app-theme/themes/reidb-greenish/style.css
    	app/assets/stylesheets/web-app-theme/themes/warehouse/style.css
    	app/assets/stylesheets/web-app-theme/warehouse.css
    	images/icons/application_edit.png
    	images/icons/cross.png
    	images/icons/key.png
    	images/icons/tick.png
    	lib/generators/web_app_theme/theme/templates/layout_admin.html.erb
    	lib/generators/web_app_theme/theme/templates/layout_sign.html.erb
    	lib/generators/web_app_theme/theme/theme_generator.rb
    	lib/web-app-theme.rb
    	spec/dummy/public/images/avatar.png
    	spec/dummy/public/images/icons/application_edit.png
    	spec/dummy/public/images/icons/cross.png
    	spec/dummy/public/images/icons/key.png
    	spec/dummy/public/images/icons/tick.png
    	spec/dummy/public/index.html
    	spec/dummy/public/javascripts/jquery-1.3.min.js
    	spec/dummy/public/javascripts/jquery.localscroll.js
    	spec/dummy/public/javascripts/jquery.scrollTo.js
    	stylesheets/base.css
    	stylesheets/themes/activo/images/arrow.png
    	stylesheets/themes/activo/images/boxbar-background.png
    	stylesheets/themes/activo/images/button-background-active.png
    	stylesheets/themes/activo/images/button-background.png
    	stylesheets/themes/activo/images/menubar-background.png
    	stylesheets/themes/activo/style.css
    	stylesheets/themes/amro/style.css
    	stylesheets/themes/bec-green/style.css
    	stylesheets/themes/bec/style.css
    	stylesheets/themes/blue/style.css
    	stylesheets/themes/default/fonts/museo700-regular-webfont.eot
    	stylesheets/themes/default/fonts/museo700-regular-webfont.svg
    	stylesheets/themes/default/fonts/museo700-regular-webfont.ttf
    	stylesheets/themes/default/fonts/museo700-regular-webfont.woff
    	stylesheets/themes/default/fonts/museosans_500-webfont.eot
    	stylesheets/themes/default/fonts/museosans_500-webfont.svg
    	stylesheets/themes/default/fonts/museosans_500-webfont.ttf
    	stylesheets/themes/default/fonts/museosans_500-webfont.woff
    	stylesheets/themes/default/fonts/museosans_500_italic-webfont.eot
    	stylesheets/themes/default/fonts/museosans_500_italic-webfont.svg
    	stylesheets/themes/default/fonts/museosans_500_italic-webfont.ttf
    	stylesheets/themes/default/fonts/museosans_500_italic-webfont.woff
    	stylesheets/themes/default/images/arrow.png
    	stylesheets/themes/default/images/bgd.jpg
    	stylesheets/themes/default/images/boxbar-background.png
    	stylesheets/themes/default/images/button-background-active.png
    	stylesheets/themes/default/images/button-background.png
    	stylesheets/themes/default/images/messages/error.png
    	stylesheets/themes/default/images/messages/notice.png
    	stylesheets/themes/default/images/messages/warning.png
    	stylesheets/themes/default/style.css
    	stylesheets/themes/djime-cerulean/style.css
    	stylesheets/themes/drastic-dark/style.css
    	stylesheets/themes/kathleene/style.css
    	stylesheets/themes/olive/style.css
    	stylesheets/themes/orange/style.css
    	stylesheets/themes/red/style.css
    	stylesheets/themes/reidb-greenish/style.css
    	stylesheets/themes/warehouse/style.css
    	web-app-theme.gemspec
  2. @willthames
  3. @willthames
  4. @jweslley

    Merge pull request #1 from willthames/master

    jweslley committed Jan 19, 2012
    Merge of pilu/master and jweslley/master