From f40f709e4f4c9c4c0345a2af405eaae41828417d Mon Sep 17 00:00:00 2001
From: Katie Smith <katie.smith@digital.cabinet-office.gov.uk>
Date: Thu, 6 Feb 2020 14:49:51 +0000
Subject: [PATCH] Stop importing old style buttons

---
 app/assets/stylesheets/app.scss                       |  4 ----
 .../components/stick-at-top-when-scrolling.scss       |  4 ----
 app/assets/stylesheets/globals.scss                   | 11 ++---------
 app/assets/stylesheets/main.scss                      |  2 --
 4 files changed, 2 insertions(+), 19 deletions(-)

diff --git a/app/assets/stylesheets/app.scss b/app/assets/stylesheets/app.scss
index 58664ed16..c195d3eed 100644
--- a/app/assets/stylesheets/app.scss
+++ b/app/assets/stylesheets/app.scss
@@ -220,7 +220,3 @@ details .arrow {
 .heading-upcoming-jobs {
   margin-top: $gutter-half;
 }
-
-.button-secondary {
-  @include button($grey-3);
-}
diff --git a/app/assets/stylesheets/components/stick-at-top-when-scrolling.scss b/app/assets/stylesheets/components/stick-at-top-when-scrolling.scss
index df55b945c..c60647f9b 100644
--- a/app/assets/stylesheets/components/stick-at-top-when-scrolling.scss
+++ b/app/assets/stylesheets/components/stick-at-top-when-scrolling.scss
@@ -60,10 +60,6 @@ $sticky-padding: $gutter * 2 / 3;
     margin: 0;
   }
 
-  .button-secondary {
-    margin: 0 $gutter-half 3px 0;
-  }
-
 }
 
 .content-fixed,
diff --git a/app/assets/stylesheets/globals.scss b/app/assets/stylesheets/globals.scss
index 8863601cd..9da8fb427 100644
--- a/app/assets/stylesheets/globals.scss
+++ b/app/assets/stylesheets/globals.scss
@@ -80,15 +80,8 @@ a {
 
 input:focus,
 textarea:focus,
-select:focus,
-button:focus {
+select:focus
+{
   outline: 3px solid $focus-colour;
   outline-offset: 0;
 }
-
-// To be removed when all buttons follow the GOV.UK Frontend conventions
-// - https://design-system.service.gov.uk/components/button/
-
-button {
-  font-family: $govuk-font-family-nta;
-}
diff --git a/app/assets/stylesheets/main.scss b/app/assets/stylesheets/main.scss
index 26b07297d..cec02421b 100644
--- a/app/assets/stylesheets/main.scss
+++ b/app/assets/stylesheets/main.scss
@@ -11,7 +11,6 @@ $path: '/static/images/';
 @import 'typography';
 @import 'grid_layout';
 @import 'helpers';
-@import 'design-patterns/buttons';
 
 // Dependencies from GOVU.UK Frontend Toolkit, rewritten for this application
 @import 'url-helpers';
@@ -23,7 +22,6 @@ $path: '/static/images/';
 // https://github.com/alphagov/govuk_elements
 @import 'elements/helpers';
 @import 'elements/reset';
-@import 'elements/buttons';
 @import 'elements/details';
 @import 'elements/elements-typography';
 @import 'elements/forms';