Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Take advantage of asset pipeline for some core assets [THEME] [DEPLOY]
Removed some core assets (jquery, jquery-ui, formtastic) that are automatically provided by gems; before the asset pipeline, assets had to be copied across to the project directory by hand or via *:install rake tasks. Removed some assets that didn't appear to be used by anything such as reset-fonts-grids.css, jquery.dimensions.min.js. [THEME] The 'reset' stylesheet was moved to core, it is unlikely you would need or want to update this manually. 'common' and 'formtastic' core stylesheets have been merged into the 'application' stylesheet. Change the following lines in themes/*/views/layouts/application.html.erb: <%= theme_stylesheet_link_tag 'reset', :media => :all %> <%= stylesheet_link_tag 'common', 'formtastic', :media => :all %> to look like: <%= stylesheet_link_tag 'application', :media => :all %> Conflicts: app/assets/javascripts/jquery-ui.js app/assets/javascripts/jquery-ui.min.js app/assets/javascripts/jquery.js app/assets/javascripts/jquery.min.js app/assets/javascripts/jquery_ujs.js
- Loading branch information