chaas/debshots
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Moved vendor assets into asset pipeline. Fixes assets in production.

Browse source
This commit is contained in:
Christoph Haas 2014-12-28 13:11:41 +01:00
parent f603072404
commit 183412b669
4 changed files with 5 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

1
app/assets/javascripts/application.js
View file

@ -16,4 +16,3 @@
//= require fancybox //= require fancybox
//= require jquery.cycle2 //= require jquery.cycle2
//= require_tree . //= require_tree .

4
app/assets/stylesheets/application.css.scss
View file

@ -12,4 +12,6 @@
*/ */
@import "foundation_and_overrides"; @import "foundation_and_overrides";
@import "my.css.scss"; @import "my";
@import "jquery-fancybox/jquery.fancybox";
/*@import "jquery-raty/jquery.raty";*/

2
app/views/layouts/application.html.slim
View file

@ -9,8 +9,6 @@ html
/ TODO: make the keywords reflect the virtual host (e.g. Debian) / TODO: make the keywords reflect the virtual host (e.g. Debian)
= stylesheet_link_tag "application", media: "all" = stylesheet_link_tag "application", media: "all"
= javascript_include_tag "vendor/modernizr" = javascript_include_tag "vendor/modernizr"
= stylesheet_link_tag "jquery-fancybox/jquery.fancybox", media: "all"
//= stylesheet_link_tag "jquery-raty/jquery.raty", media: "all"
= javascript_include_tag 'jquery' = javascript_include_tag 'jquery'
//= javascript_include_tag 'jquery-raty/jquery.raty' //= javascript_include_tag 'jquery-raty/jquery.raty'

4
config/environments/production.rb
View file

@ -21,11 +21,11 @@ Debshots::Application.configure do
# Disable Rails's static asset server (Apache or nginx will already do this). # Disable Rails's static asset server (Apache or nginx will already do this).
# config.serve_static_assets = false # config.serve_static_assets = false
config.serve_static_assets = true config.serve_static_files = true
# Compress JavaScripts and CSS. # Compress JavaScripts and CSS.
config.assets.js_compressor = :uglifier config.assets.js_compressor = :uglifier
# config.assets.css_compressor = :sass config.assets.css_compressor = :sass
# Do not fallback to assets pipeline if a precompiled asset is missed. # Do not fallback to assets pipeline if a precompiled asset is missed.
config.assets.compile = false config.assets.compile = false