Merge branch 'develop' into feature/SSR-113

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

@@ -131,13 +131,15 @@ export default {
   },
   computed: {
       getFieldSetClasses() {
-          if (this.isOverflowScrollable) {
+        if (this.isOverflowScrollable) {
-              return "container-fluid overflow-scroll position-absolute px-5 pt-1 py-0";
+          return "container-fluid overflow-scroll position-absolute px-5 pb-2";
-          } else if (this.buttonTypeString == "listCard") {
+        }
-              return "w-100";
+        else if (this.buttonType == "listCard") {
-          } else {
+          return "w-100";
-              return "";
+        }
-          }
+        else {
+          return "";
+        }
       },
       getComponentLoopWrapperClasses() {
           let classes;

src/common-components/site-header/site-header.vue

@@ -71,5 +71,11 @@ import { globalEvents } from "@/constants/events";
 .site-header {
   padding: 0.97rem 0;
 }
-    
+.logo-image {
+    max-width: 78px;
+}
+.alert {
+    left: 0;
+    top: 72px;
+}
 </style>

src/common-components/site-sub-header/site-sub-header.vue

@@ -1,7 +1,7 @@
 <template>
     <div>
       <div class="d-flex align-items-center justify-content-center container-fluid overflow-hidden">
-        <h5 class="text-center fw-normal mb-0" >
+        <h5 class="text-center fw-normal mb-0" :class="headerColor">
           <span>
             {{ content }}
           </span>
@@ -44,7 +44,10 @@ import buttonBack from "@/common-components/site-sub-header/button-back/button-b
             backButtonAccessibleText()
             {
               return this.getCmsContent(this.cmsWidgetName, "BackButtonAccessibleText")
-            }
+            },
+            headerColor() {
+                return this.subText ? "dark-header" : "light-header";
+            },
         },
         methods: {
           clickEvent() {
@@ -57,6 +60,14 @@ import buttonBack from "@/common-components/site-sub-header/button-back/button-b
 
   
 <style lang="scss" scoped>
+.dark-header {
+    color: $black;
+}
+
+.light-header {
+    color: $gray-550;
+}
+
 h5 {
   line-height: 32px;
   max-width: 300px;
@@ -65,4 +76,7 @@ h5 {
     color: inherit;
   }
 }
+p.small {
+    color: $gray-550;
+}
 </style>