From b0ff984f75a9ef78c87e6299e60b9e602f592daf Mon Sep 17 00:00:00 2001 From: Bryan Mauger Date: Wed, 1 Feb 2023 14:42:10 -0500 Subject: [PATCH 1/4] CSR-1156 move css to appropriate pages. --- .../button-question/button-question.vue | 18 ------------------ .../questions-page-layout.vue | 3 ++- src/layouts/vehicle-parts/vehicle-parts.vue | 10 ++++++++++ 3 files changed, 12 insertions(+), 19 deletions(-) diff --git a/src/digital-components/button-question/button-question.vue b/src/digital-components/button-question/button-question.vue index 4c60b0708..ec73b348b 100644 --- a/src/digital-components/button-question/button-question.vue +++ b/src/digital-components/button-question/button-question.vue @@ -255,22 +255,4 @@ export default { text-align: center; } } - -.vehicle-parts { - .question-text { - span { - font-size: 0.875rem; - text-align: left; - margin: 0 0 0.5rem 0; - } - } - .question-text { - margin: 0; - } - fieldset { - .ui-radio { - margin: 0; - } - } -} diff --git a/src/fmg-components/layouts/questions-page-layout/questions-page-layout.vue b/src/fmg-components/layouts/questions-page-layout/questions-page-layout.vue index f6bb2a656..a900cfba9 100644 --- a/src/fmg-components/layouts/questions-page-layout/questions-page-layout.vue +++ b/src/fmg-components/layouts/questions-page-layout/questions-page-layout.vue @@ -98,9 +98,10 @@ export default { .questions-page { .question-text { margin-bottom: 0.5rem; - span { + font-size: 0.875rem; text-align: left; + margin: 0 0 0.5rem 0; } } } diff --git a/src/layouts/vehicle-parts/vehicle-parts.vue b/src/layouts/vehicle-parts/vehicle-parts.vue index 5723cd0a8..6df0b7393 100644 --- a/src/layouts/vehicle-parts/vehicle-parts.vue +++ b/src/layouts/vehicle-parts/vehicle-parts.vue @@ -227,3 +227,13 @@ export default { }, }; + + From bc617b8d793fcf84fc741e193c7313da495fba78 Mon Sep 17 00:00:00 2001 From: Bryan Mauger Date: Thu, 2 Feb 2023 13:43:56 -0500 Subject: [PATCH 2/4] Revert "CSR-1156 move css to appropriate pages." This reverts commit b0ff984f75a9ef78c87e6299e60b9e602f592daf. --- .../button-question/button-question.vue | 18 ++++++++++++++++++ .../questions-page-layout.vue | 3 +-- src/layouts/vehicle-parts/vehicle-parts.vue | 10 ---------- 3 files changed, 19 insertions(+), 12 deletions(-) diff --git a/src/digital-components/button-question/button-question.vue b/src/digital-components/button-question/button-question.vue index ec73b348b..4c60b0708 100644 --- a/src/digital-components/button-question/button-question.vue +++ b/src/digital-components/button-question/button-question.vue @@ -255,4 +255,22 @@ export default { text-align: center; } } + +.vehicle-parts { + .question-text { + span { + font-size: 0.875rem; + text-align: left; + margin: 0 0 0.5rem 0; + } + } + .question-text { + margin: 0; + } + fieldset { + .ui-radio { + margin: 0; + } + } +} diff --git a/src/fmg-components/layouts/questions-page-layout/questions-page-layout.vue b/src/fmg-components/layouts/questions-page-layout/questions-page-layout.vue index a900cfba9..f6bb2a656 100644 --- a/src/fmg-components/layouts/questions-page-layout/questions-page-layout.vue +++ b/src/fmg-components/layouts/questions-page-layout/questions-page-layout.vue @@ -98,10 +98,9 @@ export default { .questions-page { .question-text { margin-bottom: 0.5rem; + span { - font-size: 0.875rem; text-align: left; - margin: 0 0 0.5rem 0; } } } diff --git a/src/layouts/vehicle-parts/vehicle-parts.vue b/src/layouts/vehicle-parts/vehicle-parts.vue index 6df0b7393..5723cd0a8 100644 --- a/src/layouts/vehicle-parts/vehicle-parts.vue +++ b/src/layouts/vehicle-parts/vehicle-parts.vue @@ -227,13 +227,3 @@ export default { }, }; - - From 5c3937798b9e49a802d554cae704b54eeae277aa Mon Sep 17 00:00:00 2001 From: Bryan Mauger Date: Thu, 2 Feb 2023 15:46:08 -0500 Subject: [PATCH 3/4] Remove unused css. This reverts commit b0ff984f75a9ef78c87e6299e60b9e602f592daf. --- .../button-question/button-question.vue | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/src/digital-components/button-question/button-question.vue b/src/digital-components/button-question/button-question.vue index 4c60b0708..ec73b348b 100644 --- a/src/digital-components/button-question/button-question.vue +++ b/src/digital-components/button-question/button-question.vue @@ -255,22 +255,4 @@ export default { text-align: center; } } - -.vehicle-parts { - .question-text { - span { - font-size: 0.875rem; - text-align: left; - margin: 0 0 0.5rem 0; - } - } - .question-text { - margin: 0; - } - fieldset { - .ui-radio { - margin: 0; - } - } -} From 31d787d62d8231d08878efeafb79ca4fd670b899 Mon Sep 17 00:00:00 2001 From: Bryan Mauger Date: Fri, 3 Feb 2023 10:55:12 -0500 Subject: [PATCH 4/4] Refactor method, add prop. --- .../button-question/button-question.vue | 39 +++++++++++++++---- .../glass-part-question.vue | 1 + src/layouts/vehicle-parts/vehicle-parts.vue | 2 +- 3 files changed, 33 insertions(+), 9 deletions(-) diff --git a/src/digital-components/button-question/button-question.vue b/src/digital-components/button-question/button-question.vue index ec73b348b..7e32f6f08 100644 --- a/src/digital-components/button-question/button-question.vue +++ b/src/digital-components/button-question/button-question.vue @@ -5,7 +5,10 @@ https://safelite.atlassian.net/wiki/spaces/DC/pages/76644418/Button+Question+Com :class=" isOverflowScrollable ? 'button-question button-question-overflow' : 'button-question' "> -
+
{{ questionText }}
@@ -123,6 +126,7 @@ export default { useTextForValue: Boolean, valueToLogType: String, additionalButtonStyling: String, + isSmallQuestionText: Boolean, }, beforeMount() { if (this.buttonTypeObject) { @@ -136,13 +140,15 @@ export default { }, computed: { getFieldSetClasses() { - if (this.isOverflowScrollable) { - return "container-fluid overflow-scroll position-absolute px-5 pt-1 py-0"; - } else if (this.buttonTypeString == "listCard") { - return "w-100"; - } else { - return ""; - } + const baseClasses = this.isOverflowScrollable + ? "container-fluid overflow-scroll position-absolute px-5 pt-1 py-0" + : this.buttonTypeString == "listCard" + ? "w-100" + : ""; + const withSmallQuestionClass = this.isSmallQuestionText + ? baseClasses + " small-question-text" + : baseClasses; + return withSmallQuestionClass; }, getComponentLoopWrapperClasses() { let classes; @@ -255,4 +261,21 @@ export default { text-align: center; } } +.small-question-text { + &.question-text { + span { + font-size: 0.875rem; + text-align: left; + margin: 1rem 0 0.5rem 0; + } + } + &.question-text { + margin: 0; + } + & fieldset { + .ui-radio { + margin: 0; + } + } +} diff --git a/src/layouts/vehicle-parts/glass-part-question/glass-part-question.vue b/src/layouts/vehicle-parts/glass-part-question/glass-part-question.vue index a6f5e3f0a..7317b743d 100644 --- a/src/layouts/vehicle-parts/glass-part-question/glass-part-question.vue +++ b/src/layouts/vehicle-parts/glass-part-question/glass-part-question.vue @@ -25,6 +25,7 @@ textPosition="text-start" :loaderEnabled="false" isRequired + isSmallQuestionText :groupName="`${glassLocation}-${glassName}-${selectedTint}`" :validationRules="partValidationRules" />
diff --git a/src/layouts/vehicle-parts/vehicle-parts.vue b/src/layouts/vehicle-parts/vehicle-parts.vue index 5723cd0a8..56ac2ed15 100644 --- a/src/layouts/vehicle-parts/vehicle-parts.vue +++ b/src/layouts/vehicle-parts/vehicle-parts.vue @@ -1,6 +1,6 @@