From cb4f65b2af3caff98399c93b901e8f124dc46bd3 Mon Sep 17 00:00:00 2001 From: bmauger Date: Thu, 24 Feb 2022 15:02:02 -0500 Subject: [PATCH 1/9] Update image placement. --- src/ux-components/list-card/list-card.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ux-components/list-card/list-card.vue b/src/ux-components/list-card/list-card.vue index 869099dfd..526744af5 100644 --- a/src/ux-components/list-card/list-card.vue +++ b/src/ux-components/list-card/list-card.vue @@ -86,7 +86,7 @@ export default { computed: { getLabelClasses() { if (this.isWide) { - let classes = "flex-row py-r ps-3 pe-8"; + let classes = "flex-row py-r ps-3 pe-4"; if (this.buttonLabelSubCopy) { classes += " checkboxTop"; } From 71912c016224ee46182911ff45a5d6a4c10128d0 Mon Sep 17 00:00:00 2001 From: bmauger Date: Thu, 24 Feb 2022 15:09:30 -0500 Subject: [PATCH 2/9] Fix unit test. --- src/ux-components/list-card/list-card.spec.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/ux-components/list-card/list-card.spec.js b/src/ux-components/list-card/list-card.spec.js index a345c7b18..2176e683d 100644 --- a/src/ux-components/list-card/list-card.spec.js +++ b/src/ux-components/list-card/list-card.spec.js @@ -145,7 +145,7 @@ describe("list-card.vue", () => { // Assert const label = wrapper.find("label"); - expect(label.classes()).toEqual(["d-flex", "w-100", "align-items-center", "px-2", "h-100", "flex-row", "py-r", "ps-3", "pe-8"]); + expect(label.classes()).toEqual(["d-flex", "w-100", "align-items-center", "px-2", "h-100", "flex-row", "py-r", "ps-3", "pe-4"]); }); it("Should return flex row classes if isWide is true and checkboxTop if buttonLabelSubCopy is true", async () => { @@ -167,7 +167,7 @@ describe("list-card.vue", () => { // Assert const label = wrapper.find("label"); - expect(label.classes()).toEqual(["d-flex", "w-100", "align-items-center", "px-2", "h-100", "flex-row", "py-r", "ps-3", "pe-8", "checkboxTop"]); + expect(label.classes()).toEqual(["d-flex", "w-100", "align-items-center", "px-2", "h-100", "flex-row", "py-r", "ps-3", "pe-4", "checkboxTop"]); }); it("Should return flex column classes if isWide is false", async () => { From 2102e007ed72058e793abc5dc8cbc9feb9a539c0 Mon Sep 17 00:00:00 2001 From: bmauger Date: Fri, 25 Feb 2022 11:52:43 -0500 Subject: [PATCH 3/9] Add icon prop to text input. --- src/assets/img/icons/location-pin.svg | 3 ++ .../textbox-question/textbox-question.vue | 28 ++++++++++++++++-- src/layouts/component-test/component-test.vue | 29 +++++++++++++++++-- 3 files changed, 55 insertions(+), 5 deletions(-) create mode 100644 src/assets/img/icons/location-pin.svg diff --git a/src/assets/img/icons/location-pin.svg b/src/assets/img/icons/location-pin.svg new file mode 100644 index 000000000..e84330374 --- /dev/null +++ b/src/assets/img/icons/location-pin.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/common-components/textbox-question/textbox-question.vue b/src/common-components/textbox-question/textbox-question.vue index 9df4c19e7..5daaa9bd4 100644 --- a/src/common-components/textbox-question/textbox-question.vue +++ b/src/common-components/textbox-question/textbox-question.vue @@ -1,8 +1,10 @@ @@ -16,12 +18,29 @@ export default { placeholderText: String, inputId: String, isRequired: Boolean, + hasIcon: Boolean,// If input has an icon + iconRight: Boolean,// Place icon on right side of text input, otherwise default is left if hasIcon prop is used + iconURL: String, + hasError: Boolean, } }; diff --git a/src/layouts/component-test/component-test.vue b/src/layouts/component-test/component-test.vue index d75266010..c4d45822f 100644 --- a/src/layouts/component-test/component-test.vue +++ b/src/layouts/component-test/component-test.vue @@ -27,12 +27,37 @@
-
With Error (class="has-error"):
+
With icon aligned left
+ +
+
+
+
+
With icon aligned right
+ +
+
+
+
+
With Error
From 9f81097b6b91647ec2fe086be7810667464b6fd8 Mon Sep 17 00:00:00 2001 From: bmauger Date: Fri, 25 Feb 2022 14:27:21 -0500 Subject: [PATCH 4/9] Style updates. --- src/ux-components/checkbox/checkbox.vue | 12 ++++++++++++ src/ux-components/radio/radio.vue | 12 ++++++++++++ 2 files changed, 24 insertions(+) diff --git a/src/ux-components/checkbox/checkbox.vue b/src/ux-components/checkbox/checkbox.vue index 73eb562bf..2d1c892b9 100644 --- a/src/ux-components/checkbox/checkbox.vue +++ b/src/ux-components/checkbox/checkbox.vue @@ -41,6 +41,13 @@ export default { &:checked { background-size: 125%; border: 1px solid $blue; + + label { + p { + font-weight: 500; + font-size: .875rem; + color: $black; + } + } } &:focus { box-shadow: 0 0 0 4px $blue-300; @@ -51,5 +58,10 @@ export default { box-shadow: 0 0 0 4px $blue-300; } } + p { + font-weight: 400; + font-size: .875rem; + color: $gray-600; + } } diff --git a/src/ux-components/radio/radio.vue b/src/ux-components/radio/radio.vue index ed08026b2..44aa08880 100644 --- a/src/ux-components/radio/radio.vue +++ b/src/ux-components/radio/radio.vue @@ -89,6 +89,13 @@ export default { background-size: 71%; border: 1px solid $blue; background-image: url("data:image/svg+xml;charset=UTF-8,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 50 50' xml:space='preserve'%3e%3ccircle cx='25' cy='25' r='25' fill='%231574A1'/%3e%3c/svg%3e"); + + label { + p { + font-weight: 500; + font-size: .875rem; + color: $black; + } + } } &:focus { box-shadow: 0 0 0 4px $blue-300; @@ -99,5 +106,10 @@ export default { box-shadow: 0 0 0 4px $blue-300; } } + p { + font-weight: 400; + font-size: .875rem; + color: $gray-600; + } } From f6af95a753a2c710578c16f2f074a721cfc9ef8e Mon Sep 17 00:00:00 2001 From: Max Date: Fri, 25 Feb 2022 14:45:57 -0500 Subject: [PATCH 5/9] Adding button question example test page --- .../button-question/button-question.vue | 1 + .../button-question-examples.vue | 138 ++++++++++++++++++ src/router/index.js | 6 + 3 files changed, 145 insertions(+) create mode 100644 src/layouts/button-question-examples/button-question-examples.vue diff --git a/src/common-components/button-question/button-question.vue b/src/common-components/button-question/button-question.vue index 6bc67a273..5a1f2ee21 100644 --- a/src/common-components/button-question/button-question.vue +++ b/src/common-components/button-question/button-question.vue @@ -1,3 +1,4 @@ +