Remove application.scss

Remove unused _margins.scss and replace with responsive spacing override class
alphagov · Mar 20, 2023 · 43b7fcb · 43b7fcb
1 parent 478959a
commit 43b7fcb
Show file tree

Hide file tree

Showing 8 changed files with 5 additions and 44 deletions.
diff --git a/app/assets/config/manifest.js b/app/assets/config/manifest.js
@@ -1,7 +1,6 @@
 //= link_tree ../images
 //= link application.js
 //= link test-dependencies.js
-//= link application.css
 
 //= link components/_taxon-list.css
 //= link components/_topic-list.css

diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss
@@ -1,9 +1 @@
-$govuk-new-link-styles: true;
-
-// This flag stops the font from being included in this application's
-// stylesheet - the font is being served by Static across all of GOV.UK, so is
-// not needed here.
-$govuk-include-default-font-face: false;
-
-@import "govuk_publishing_components/govuk_frontend_support";
-@import "helpers/margins";
+// Not used since AssetHelper is configured to load individual stylesheets
diff --git a/app/assets/stylesheets/components/_topic-list.scss b/app/assets/stylesheets/components/_topic-list.scss
@@ -18,7 +18,3 @@
     @include govuk-font(16, $weight: bold);
   }
 }
-
-.app-c-topic-list--margin-bottom {
-  @include responsive-bottom-margin;
-}
diff --git a/app/assets/stylesheets/helpers/_margins.scss b/app/assets/stylesheets/helpers/_margins.scss
diff --git a/app/views/components/_topic-list.html.erb b/app/views/components/_topic-list.html.erb
@@ -1,4 +1,3 @@
-<% add_app_component_stylesheet("topic-list") %>
 <%
   items ||= []
   see_more_link ||= false
@@ -10,7 +9,7 @@
 
   ul_classes = %w[govuk-list app-c-topic-list]
   ul_classes << "app-c-topic-list--small" if small
-  ul_classes << "app-c-topic-list--margin-bottom" if margin_bottom
+  ul_classes << "govuk-!-margin-bottom-6" if margin_bottom
   ul_classes << brand_helper.brand_class if brand
 %>
 <% if items.any? %>

diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
@@ -37,7 +37,6 @@
   <title><%= yield :title %> - GOV.UK</title>
   <%= javascript_include_tag "test-dependencies" if Rails.env.test? %>
   <%= javascript_include_tag "application" %>
-  <%= stylesheet_link_tag "application", :media => "all" %>
   <%= csrf_meta_tags %>
   <%= yield :meta_tags %>
   <%= render 'govuk_publishing_components/components/meta_tags', content_item: content_item_h %>

diff --git a/app/views/subtopics/_subtopic.html.erb b/app/views/subtopics/_subtopic.html.erb
@@ -11,7 +11,7 @@
       <% end %>
     </div>
 
-    <div class="govuk-grid-column-one-third add-title-margin govuk-!-margin-bottom-3">
+    <div class="govuk-grid-column-one-third govuk-!-margin-top-8 govuk-!-margin-bottom-3">
       <%= render "govuk_publishing_components/components/subscription_links", {
         email_signup_link: "/email-signup?link=/topic/#{params[:topic_slug]}/#{params[:subtopic_slug]}",
         email_signup_link_text: t("shared.get_emails"),

diff --git a/spec/views/components/topic_list.html.erb_spec.rb b/spec/views/components/topic_list.html.erb_spec.rb
@@ -57,9 +57,9 @@ def component_name
   it "renders with margin-bottom" do
     render_component(items: [simple_item])
     # Margin bottom should not be applied by default
-    expect(rendered).not_to have_selector(".app-c-topic-list--margin-bottom")
+    expect(rendered).not_to have_selector(".govuk-\!-margin-bottom-6")
 
     render_component(items: [simple_item], margin_bottom: true)
-    expect(rendered).to have_selector(".app-c-topic-list--margin-bottom")
+    expect(rendered).to have_selector(".govuk-\!-margin-bottom-6")
   end
 end