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

Merge branch 'develop' into feature/CSR-405

Browse source
This commit is contained in:
Max 2022-02-28 09:46:16 -05:00
commit 71bc0f978c
5 changed files with 14 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/common-components/dropdown-question/dropdown-question.vue
View file

@ -26,6 +26,9 @@ export default {
<style lang="scss"> <style lang="scss">
.dropdown-question { .dropdown-question {
label {
color: $black;
}
.form-label { .form-label {
margin-bottom: .25rem; margin-bottom: .25rem;
} }
@ -37,7 +40,7 @@ export default {
min-height: 3rem; min-height: 3rem;
&:focus, &:focus,
&:focus-visible { &:focus-visible {
box-shadow: 0 0 0 2px $blue; box-shadow: 0 0 0 2.5px $blue;
} }
&:disabled, &:disabled,
&.disabled { &.disabled {
@ -49,7 +52,7 @@ export default {
} }
} }
&:hover { &:hover {
border: 1px solid transparent; border: 1px solid $gray-500;
box-shadow: 0 0 0 4px $blue-300; box-shadow: 0 0 0 4px $blue-300;
} }
} }

7
src/common-components/textbox-question/textbox-question.vue
View file

@ -28,6 +28,9 @@ export default {
<style lang="scss"> <style lang="scss">
.textbox-question { .textbox-question {
label {
color: $black;
}
input { input {
&.has-icon { &.has-icon {
background-image: url(~@/assets/img/icons/location-pin.svg); background-image: url(~@/assets/img/icons/location-pin.svg);
@ -52,7 +55,7 @@ export default {
color: $gray-500; color: $gray-500;
} }
&:focus { &:focus {
box-shadow: 0 0 0 2px $blue; box-shadow: 0 0 0 2.5px $blue;
} }
&:disabled, &:disabled,
&.disabled { &.disabled {
@ -63,7 +66,7 @@ export default {
} }
} }
&:hover { &:hover {
border: 1px solid transparent; border: 1px solid $gray-500;
box-shadow: 0 0 0 4px $blue-300; box-shadow: 0 0 0 4px $blue-300;
} }
} }

4
src/layouts/component-test/component-test.vue
View file

@ -30,7 +30,7 @@
<h6 class="my-4">With icon aligned left</h6> <h6 class="my-4">With icon aligned left</h6>
<textboxQuestion <textboxQuestion
labelText="Text Input Label" labelText="Text Input Label"
placeholderText="Disabled" placeholderText="Text Input Label"
inputID="test-text-input" inputID="test-text-input"
hasIcon hasIcon
imgUrl="~@/assets/img/icons/spinner.svg" imgUrl="~@/assets/img/icons/spinner.svg"
@ -42,7 +42,7 @@
<h6 class="my-4">With icon aligned right</h6> <h6 class="my-4">With icon aligned right</h6>
<textboxQuestion <textboxQuestion
labelText="Text Input Label" labelText="Text Input Label"
placeholderText="Disabled" placeholderText="Text Input Label"
inputID="test-text-input" inputID="test-text-input"
hasIcon hasIcon
iconRight iconRight

2
src/ux-components/checkbox/checkbox.vue
View file

@ -50,7 +50,7 @@ export default {
} }
} }
&:focus { &:focus {
box-shadow: 0 0 0 4px $blue-300; box-shadow: 0 0 0 2.5px $blue;
} }
} }
&:hover { &:hover {

2
src/ux-components/radio/radio.vue
View file

@ -98,7 +98,7 @@ export default {
} }
} }
&:focus { &:focus {
box-shadow: 0 0 0 4px $blue-300; box-shadow: 0 0 0 2.5px $blue;
} }
} }
&:hover { &:hover {