Browse Source

Merge pull request #130 from communitiesuk/webpacker-tweaks

Reorder frontend assets
pull/126/head
Paul Robert Lloyd 3 years ago committed by GitHub
parent
commit
642ccc7869
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 2
      app/javascript/packs/active_admin/print.scss
  2. 0
      app/webpacker/channels/consumer.js
  3. 0
      app/webpacker/channels/index.js
  4. 0
      app/webpacker/controllers/application.js
  5. 0
      app/webpacker/controllers/conditional_question_controller.js
  6. 0
      app/webpacker/controllers/index.js
  7. 0
      app/webpacker/controllers/numeric_question_controller.js
  8. 0
      app/webpacker/controllers/soft_validations_controller.js
  9. 0
      app/webpacker/controllers/tasklist_controller.js
  10. 2
      app/webpacker/packs/active_admin.js
  11. 0
      app/webpacker/packs/application.js
  12. 0
      app/webpacker/styles/_tab-navigation.scss
  13. 0
      app/webpacker/styles/_task-list.scss
  14. 0
      app/webpacker/styles/active_admin.scss
  15. 0
      app/webpacker/styles/application.scss
  16. 2
      config/webpacker.yml

2
app/javascript/packs/active_admin/print.scss

@ -1,2 +0,0 @@
/* Active Admin Print Stylesheet */
@import "~@activeadmin/activeadmin/src/scss/print";

0
app/javascript/channels/consumer.js → app/webpacker/channels/consumer.js

0
app/javascript/channels/index.js → app/webpacker/channels/index.js

0
app/javascript/controllers/application.js → app/webpacker/controllers/application.js

0
app/javascript/controllers/conditional_question_controller.js → app/webpacker/controllers/conditional_question_controller.js

0
app/javascript/controllers/index.js → app/webpacker/controllers/index.js

0
app/javascript/controllers/numeric_question_controller.js → app/webpacker/controllers/numeric_question_controller.js

0
app/javascript/controllers/soft_validations_controller.js → app/webpacker/controllers/soft_validations_controller.js

0
app/javascript/controllers/tasklist_controller.js → app/webpacker/controllers/tasklist_controller.js

2
app/javascript/packs/active_admin.js → app/webpacker/packs/active_admin.js

@ -1,6 +1,6 @@
// Load Active Admin's styles into Webpacker, // Load Active Admin's styles into Webpacker,
// see `active_admin.scss` for customization. // see `active_admin.scss` for customization.
import "../stylesheets/active_admin"; import "../styles/active_admin";
import "@activeadmin/activeadmin"; import "@activeadmin/activeadmin";

0
app/javascript/packs/application.js → app/webpacker/packs/application.js

0
app/javascript/styles/_tab-navigation.scss → app/webpacker/styles/_tab-navigation.scss

0
app/javascript/styles/_task-list.scss → app/webpacker/styles/_task-list.scss

0
app/javascript/stylesheets/active_admin.scss → app/webpacker/styles/active_admin.scss

0
app/javascript/styles/application.scss → app/webpacker/styles/application.scss

2
config/webpacker.yml

@ -1,7 +1,7 @@
# Note: You must restart bin/webpack-dev-server for changes to take effect # Note: You must restart bin/webpack-dev-server for changes to take effect
default: &default default: &default
source_path: app/javascript source_path: app/webpacker
source_entry_path: packs source_entry_path: packs
public_root_path: public public_root_path: public
public_output_path: packs public_output_path: packs

Loading…
Cancel
Save