jason/DigitalConsumer.FixMyGlass
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #259 from Safelite/feature/CSR-406

Browse source 
Adjusting button-question so question text is always black font and a…
This commit is contained in:
max-dempsey 2022-02-28 10:52:32 -05:00 committed by GitHub
commit 1d0ad40f76
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/common-components/button-question/button-question.vue
View file

@ -1,6 +1,6 @@
<!-- Documented in confluence https://safelite.atlassian.net/wiki/spaces/DC/pages/76644418/Button+Question+Component --> <!-- Documented in confluence https://safelite.atlassian.net/wiki/spaces/DC/pages/76644418/Button+Question+Component -->
<template> <template>
<div :class="isOverflowScrollable ? 'button_question' : ''"> <div :class="isOverflowScrollable ? 'button-question button-question-overflow' : 'button-question'">
<div v-if="questionText" class="mt-5 mb-4 d-flex"> <div v-if="questionText" class="mt-5 mb-4 d-flex">
<span class="text-center fs-5 fw-bold w-100">{{ questionText }}</span> <span class="text-center fs-5 fw-bold w-100">{{ questionText }}</span>
</div> </div>
@ -146,8 +146,7 @@ export default {
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
.button_question { .button-question-overflow {
color: $black;
height: calc(100vh - 280px); height: calc(100vh - 280px);
.overflow-scroll { .overflow-scroll {
@ -156,4 +155,7 @@ export default {
-webkit-overflow-scrolling: touch; -webkit-overflow-scrolling: touch;
} }
} }
.button-question {
color: $black;
}
</style> </style>

2
src/ux-components/list-card/list-card.spec.js
View file

@ -188,7 +188,7 @@ describe("list-card.vue", () => {
// Assert // Assert
const label = wrapper.find("label"); const label = wrapper.find("label");
expect(label.classes()).toEqual(["d-flex", "w-100", "align-items-center", "px-2", "h-100", "flex-column", "pt-4", "pb-2"]); expect(label.classes()).toEqual(["d-flex", "w-100", "align-items-center", "px-2", "h-100", "flex-column", "pt-4", "pb-3"]);
}); });
it("Should emit button value on click", async () => { it("Should emit button value on click", async () => {

2
src/ux-components/list-card/list-card.vue
View file

@ -92,7 +92,7 @@ export default {
} }
return classes; return classes;
} else { } else {
return "flex-column pt-4 pb-2"; return "flex-column pt-4 pb-3";
} }
}, },
}, },