Merge pull request #1016 from alphagov/remove-toolkit-button-sass

Remove toolkit button sass
alphagov · Apr 1, 2019 · a597d14 · a597d14
2 parents 67cb8cd + 4b3c091
commit a597d14
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 25 deletions.
diff --git a/app/assets/stylesheets/finder_frontend.scss b/app/assets/stylesheets/finder_frontend.scss
@@ -1,7 +1,4 @@
-// govuk_frontend_toolkit helpers
-@import "design-patterns/buttons";
 @import "not-ie-conditional";
-
 @import "reset";
 @import "govuk_publishing_components/all_components";
 @import "components/*";
@@ -91,12 +88,6 @@
     font-weight: 600;
   }
 
-  a.button, input.button {
-    @include button(govuk-colour("green"));
-    width: auto;
-    @include govuk-font(24, $weight: bold);
-  }
-
   header {
     .summary {
       margin-bottom: govuk-spacing(6);
@@ -178,20 +169,12 @@
     }
   }
 
-  .app-c-option-select {
-    margin-bottom: govuk-spacing(6);
-  }
-
   .form {
     @include govuk-font(19);
     @include media(tablet) {
       max-width: $two-thirds;
     }
 
-    input.button[type=submit] {
-      margin-top: govuk-spacing(2);
-    }
-
     p {
       max-width: $full-width;
     }
@@ -211,12 +194,6 @@
     }
   }
 
-  .button {
-    @include button(govuk-colour("green"));
-    width: auto;
-    @include govuk-font(24, $weight: bold);
-  }
-
   .search-results-title {
     border-bottom: 1px solid govuk-colour('black');
     padding-bottom: govuk-spacing(4);
@@ -407,3 +384,6 @@
   }
 }
 
+.govspeak-wrapper {
+  @include govuk-responsive-margin(4, "bottom");
+}
diff --git a/app/views/email_alert_subscriptions/new.html.erb b/app/views/email_alert_subscriptions/new.html.erb
@@ -37,10 +37,15 @@
       <% end %>
 
       <% if @signup_presenter.body %>
-        <%= render 'govuk_publishing_components/components/govspeak', content: @signup_presenter.body.html_safe %>
+        <div class="govspeak-wrapper">
+          <%= render 'govuk_publishing_components/components/govspeak', content: @signup_presenter.body.html_safe %>
+        </div>
       <% end %>
 
-      <%= submit_tag 'Create subscription', class: "button" %>
+      <%= render "govuk_publishing_components/components/button", {
+        text: "Create subscription",
+        margin_bottom: true
+      } %>
     <% end %>
 
   </div>