Merge pull request #1402 from alphagov/revert-1401-revert-1384-remove…

…-button-component Remove button component
alphagov · May 11, 2018 · aa85a3a · aa85a3a
2 parents 6a0ea98 + f3b8183
commit aa85a3a
Show file tree

Hide file tree

Showing 6 changed files with 4 additions and 252 deletions.
diff --git a/app/assets/stylesheets/govuk-component/_button.scss b/app/assets/stylesheets/govuk-component/_button.scss
diff --git a/app/assets/stylesheets/govuk-component/_component.scss b/app/assets/stylesheets/govuk-component/_component.scss
@@ -20,5 +20,4 @@
 @import "breadcrumbs";
 @import "related-items";
 @import "organisation-logo";
-@import "button";
 @import "lead-paragraph";
diff --git a/app/assets/stylesheets/govuk-component/govspeak/_button.scss b/app/assets/stylesheets/govuk-component/govspeak/_button.scss
@@ -1,9 +1,11 @@
+@import "govuk_publishing_components/components/button";
+
 .govuk-govspeak {
   .button {
-    @extend %pub-c-button;
+    @extend %gem-c-button;
   }
 
   .button-start {
-    @extend %pub-c-button--start;
+    @extend %gem-c-button--start;
   }
 }
diff --git a/app/views/govuk_component/button.raw.html.erb b/app/views/govuk_component/button.raw.html.erb
diff --git a/app/views/govuk_component/docs/button.yml b/app/views/govuk_component/docs/button.yml
diff --git a/test/govuk_component/button_test.rb b/test/govuk_component/button_test.rb