Merge branch 'main' into invite_new_user

4 years ago · 1b391c76f6
18 changed files with 3 additions and 14 deletions
--- a/app/javascript/packs/active_admin/print.scss
+++ b/app/javascript/packs/active_admin/print.scss
@ -1,2 +0,0 @@
-/* Active Admin Print Stylesheet */
-@import "~@activeadmin/activeadmin/src/scss/print";
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@ -52,9 +52,7 @@
        text: "This is a new service – #{govuk_mail_to("test@mhclg.gov.uk", "give feedback or report a problem", subject: "Feedback about Lettings and Sales of Social Housing in England Data Collection")}".html_safe
      ) %>

-      <div role="navigation">
-        <%= content_for(:before_content) %>
-      </div>
+      <%= content_for(:before_content) %>

      <main class="govuk-main-wrapper" id="main-content" role="main">
        <% if flash.notice %>
--- a/app/views/layouts/organisations.html.erb
+++ b/app/views/layouts/organisations.html.erb
@ -1,10 +1,3 @@
-<% content_for :before_content do %>
-  <%= govuk_back_link(
-    text: 'Back',
-    href: :back,
-  ) %>
-<% end %>
-
 <% content_for :content do %>
  <h1 class="govuk-heading-l">
    Your organisation
--- a/app/javascript/channels/consumer.js
+++ b/app/javascript/channels/consumer.js
--- a/app/javascript/channels/index.js
+++ b/app/javascript/channels/index.js
--- a/app/javascript/controllers/application.js
+++ b/app/javascript/controllers/application.js
--- a/app/javascript/controllers/conditional_question_controller.js
+++ b/app/javascript/controllers/conditional_question_controller.js
--- a/app/javascript/controllers/index.js
+++ b/app/javascript/controllers/index.js
--- a/app/javascript/controllers/numeric_question_controller.js
+++ b/app/javascript/controllers/numeric_question_controller.js
--- a/app/javascript/controllers/soft_validations_controller.js
+++ b/app/javascript/controllers/soft_validations_controller.js
--- a/app/javascript/controllers/tasklist_controller.js
+++ b/app/javascript/controllers/tasklist_controller.js
--- a/app/javascript/packs/active_admin.js
+++ b/app/javascript/packs/active_admin.js
@ -1,6 +1,6 @@
 // Load Active Admin's styles into Webpacker,
 // see `active_admin.scss` for customization.
-import "../stylesheets/active_admin";
+import "../styles/active_admin";

 import "@activeadmin/activeadmin";

--- a/app/javascript/packs/application.js
+++ b/app/javascript/packs/application.js
--- a/app/javascript/styles/_tab-navigation.scss
+++ b/app/javascript/styles/_tab-navigation.scss
--- a/app/javascript/styles/_task-list.scss
+++ b/app/javascript/styles/_task-list.scss
--- a/app/javascript/stylesheets/active_admin.scss
+++ b/app/javascript/stylesheets/active_admin.scss
--- a/app/javascript/styles/application.scss
+++ b/app/javascript/styles/application.scss
--- a/config/webpacker.yml
+++ b/config/webpacker.yml
@ -1,7 +1,7 @@
 # Note: You must restart bin/webpack-dev-server for changes to take effect

 default: &default
-  source_path: app/javascript
+  source_path: app/webpacker
  source_entry_path: packs
  public_root_path: public
  public_output_path: packs