diff options
| author | utvk <utvk@users.noreply.github.com> | 2014-02-03 20:12:14 +0100 |
|---|---|---|
| committer | utvk <utvk@users.noreply.github.com> | 2014-02-03 20:12:14 +0100 |
| commit | 63c33bb60ba85fb2c768a81e8e34475834d08fc6 (patch) | |
| tree | 840872a8d310d79e5d5f66ff479367727f1d16d0 /lib/alavetelitheme.rb | |
| parent | 37b4192f364c9c0d3530e8d536ea6ad293d9a344 (diff) | |
| parent | c526168388918e309af51ea26274cb7a13b46acc (diff) | |
Merge branch 'master' into norway
Conflicts:
assets/stylesheets/custom.css.scss
lib/views/general/_orglink.html.erb
Diffstat (limited to 'lib/alavetelitheme.rb')
| -rw-r--r-- | lib/alavetelitheme.rb | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/lib/alavetelitheme.rb b/lib/alavetelitheme.rb index 2930ba6..8476e90 100644 --- a/lib/alavetelitheme.rb +++ b/lib/alavetelitheme.rb @@ -32,6 +32,15 @@ end # something unique (e.g. yourtheme-custom-routes.rb": $alaveteli_route_extensions << 'custom-routes.rb' +# Prepend the asset directories in this theme to the asset path: +['stylesheets', 'images', 'javascripts'].each do |asset_type| + theme_asset_path = File.join(File.dirname(__FILE__), + '..', + 'assets', + asset_type) + Rails.application.config.assets.paths.unshift theme_asset_path +end + # Tell FastGettext about the theme's translations: look in the theme's # locale-theme directory for a translation in the first place, and if # it isn't found, look in the Alaveteli locale directory next: |