Skip to content

Commit

Permalink
Disable Jammit's embed_assets
Browse files Browse the repository at this point in the history
Simply can't get it working correctly with relative paths outside of Rails.

* Inline datauri-able assets
* Disable relative path rewriting
* Shuffle contents of `fontello` directory (and update references) so that `fontello/fonts` can be cleanly dropped into `dist` over on the DC side
* Remove `-datauri`-suffixed CSS files, as they're all datauri now

Basically giving up on #28
  • Loading branch information
reefdog committed Nov 2, 2015
1 parent 3f5f566 commit cca921e
Show file tree
Hide file tree
Showing 18 changed files with 873 additions and 332 deletions.
12 changes: 6 additions & 6 deletions config/assets.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
javascript_compressor: closure
css_compressor: sass
template_function: DocumentCloud._.template
embed_assets: datauri
rewrite_relative_paths: false
javascript_compressor: closure
css_compressor: sass
template_function: DocumentCloud._.template
embed_assets: off
rewrite_relative_paths: off

javascripts:
pym:
Expand Down Expand Up @@ -30,7 +30,7 @@ javascripts:

stylesheets:
page_embed:
- src/css/vendor/fontello/css/fontello.css
- src/css/vendor/fontello/css/fontello-embedded.css
- src/css/vendor/fontello/css/animation.css
- src/css/*.css
- src/css/*.scss
18 changes: 12 additions & 6 deletions dist/enhance.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file modified dist/enhance.js.gz
Binary file not shown.
1 change: 0 additions & 1 deletion dist/page_embed-datauri.css

This file was deleted.

Binary file removed dist/page_embed-datauri.css.gz
Binary file not shown.
Loading

0 comments on commit cca921e

Please sign in to comment.