Merge branch 'develop' into feature/CSR-405

src/common-components/dropdown-question/dropdown-question.vue

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

src/common-components/textbox-question/textbox-question.vue

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

src/layouts/component-test/component-test.vue

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

src/ux-components/checkbox/checkbox.vue

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

src/ux-components/radio/radio.vue

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