Skip to content

Commit

Permalink
Merge pull request #613 from tf/css-scss
Browse files Browse the repository at this point in the history
Rename .css.scss files to just .scss
  • Loading branch information
tf committed Aug 31, 2016
2 parents d9bbdf1 + 840c891 commit 4e89189
Show file tree
Hide file tree
Showing 118 changed files with 3 additions and 3 deletions.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
1 change: 0 additions & 1 deletion app/assets/stylesheets/pageflow/themes/default.css.scss

This file was deleted.

1 change: 1 addition & 0 deletions app/assets/stylesheets/pageflow/themes/default.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
@import "./default/base";
File renamed without changes.
4 changes: 2 additions & 2 deletions lib/generators/pageflow/assets/assets_generator.rb
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@ class AssetsGenerator < Rails::Generators::Base

def create_assets
template 'editor.js', 'app/assets/javascripts/pageflow/editor.js'
template 'editor.css.scss', 'app/assets/stylesheets/pageflow/editor.scss'
template 'editor.scss', 'app/assets/stylesheets/pageflow/editor.scss'

template 'application.js', 'app/assets/javascripts/pageflow/application.js'
template 'application.css.scss', 'app/assets/stylesheets/pageflow/application.scss'
template 'application.scss', 'app/assets/stylesheets/pageflow/application.scss'

append_to_file 'app/assets/javascripts/active_admin.js.coffee' do
"#= require pageflow/admin\n"
Expand Down

0 comments on commit 4e89189

Please sign in to comment.