Merge pull request #2323 from alphagov/restructure-asset-directories

Restructure asset directories
alphagov · Aug 24, 2023 · 8eefb92 · 8eefb92
2 parents 9f0f858 + 458b839
commit 8eefb92
Show file tree

Hide file tree

Showing 11 changed files with 6 additions and 7 deletions.
diff --git a/app/assets/config/manifest.js b/app/assets/config/manifest.js
@@ -3,4 +3,3 @@
 //= link legacy_layout.css
 //= link application.js
 //= link legacy_layout.js
-//= link password-strength-indicator.js
diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
@@ -1,4 +1,4 @@
 //= require govuk_publishing_components/dependencies
 //= require govuk_publishing_components/all_components
-//= require password-strength-indicator
+//= require_tree ./modules
 //= require rails-ujs
diff --git a/app/assets/javascripts/modules/chosen.js → ...sets/javascripts/legacy/modules/chosen.js b/app/assets/javascripts/modules/chosen.js → ...sets/javascripts/legacy/modules/chosen.js
diff --git a/...ts/javascripts/modules/dropdown_filter.js → ...scripts/legacy/modules/dropdown_filter.js b/...ts/javascripts/modules/dropdown_filter.js → ...scripts/legacy/modules/dropdown_filter.js
diff --git a/app/assets/javascripts/legacy_layout.js b/app/assets/javascripts/legacy_layout.js
@@ -1,3 +1,3 @@
 //= require chosen.jquery
-//= require_directory ./modules
+//= require_directory ./legacy/modules
 //= require zeroclipboard
diff --git a/...avascripts/password-strength-indicator.js → ...ts/modules/password-strength-indicator.js b/...avascripts/password-strength-indicator.js → ...ts/modules/password-strength-indicator.js
diff --git a/app/assets/stylesheets/_admin.scss → app/assets/stylesheets/legacy/_admin.scss b/app/assets/stylesheets/_admin.scss → app/assets/stylesheets/legacy/_admin.scss
diff --git a/...assets/stylesheets/_bootstrap_chosen.scss → ...stylesheets/legacy/_bootstrap_chosen.scss b/...assets/stylesheets/_bootstrap_chosen.scss → ...stylesheets/legacy/_bootstrap_chosen.scss
diff --git a/app/assets/stylesheets/_filters.scss → app/assets/stylesheets/legacy/_filters.scss b/app/assets/stylesheets/_filters.scss → app/assets/stylesheets/legacy/_filters.scss
diff --git a/app/assets/stylesheets/_thin_form.scss → ...assets/stylesheets/legacy/_thin_form.scss b/app/assets/stylesheets/_thin_form.scss → ...assets/stylesheets/legacy/_thin_form.scss
diff --git a/app/assets/stylesheets/legacy_layout.scss b/app/assets/stylesheets/legacy_layout.scss
@@ -1,7 +1,7 @@
 @import "govuk_admin_template";
 @import "chosen";
 
-@import "bootstrap_chosen";
-@import "filters";
-@import "admin";
-@import "thin_form";
+@import "legacy/bootstrap_chosen";
+@import "legacy/filters";
+@import "legacy/admin";
+@import "legacy/thin_form";