From 868897f0d2353ca307692fc57235fa1d42292b48 Mon Sep 17 00:00:00 2001 From: Bryan Date: Wed, 20 Oct 2021 10:43:04 -0400 Subject: [PATCH] Update buttons to use one button for all instances (so far). --- src/Funnel1.vue | 27 ++++++++---------------- src/assets/scss/components/_buttons.scss | 10 ++++----- src/components/buttons/buttonPrimary.vue | 24 +++++++++++++++++++-- 3 files changed, 36 insertions(+), 25 deletions(-) diff --git a/src/Funnel1.vue b/src/Funnel1.vue index 2c9ca1cae..0998aa9d8 100644 --- a/src/Funnel1.vue +++ b/src/Funnel1.vue @@ -40,29 +40,24 @@
-
- -
-
-
-
-
@@ -75,8 +70,6 @@ import imageButton from './components/imageButton'; import confetti from './components/confetti'; import buttonPrimary from './components/buttons/buttonPrimary'; - import buttonPrimaryFocus from './components/buttons/buttonPrimaryFocus'; - import buttonDisabled from './components/buttons/buttonDisabled'; export default { @@ -86,9 +79,7 @@ vehicleImage, imageButton, confetti, - buttonPrimary, - buttonPrimaryFocus, - buttonDisabled + buttonPrimary } } diff --git a/src/assets/scss/components/_buttons.scss b/src/assets/scss/components/_buttons.scss index efbb34ded..0d0608dd7 100644 --- a/src/assets/scss/components/_buttons.scss +++ b/src/assets/scss/components/_buttons.scss @@ -30,11 +30,11 @@ } } } - &:disabled { - background: $gray-100; - background: linear-gradient(270deg, $gray-100 0%, $gray-100 100%); - color: $gray-400; - } + } + &.disabled { + background: $gray-100; + background: linear-gradient(270deg, $gray-100 0%, $gray-100 100%); + color: $gray-400; } &.btn-primary-focus { position: relative;//Required for :after pseduo to position correctly diff --git a/src/components/buttons/buttonPrimary.vue b/src/components/buttons/buttonPrimary.vue index 50cd6daa7..abc24e291 100644 --- a/src/components/buttons/buttonPrimary.vue +++ b/src/components/buttons/buttonPrimary.vue @@ -1,10 +1,30 @@