@worksafevictoria/wcl7.5 1.13.0 → 1.14.0-beta.10

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@worksafevictoria/wcl7.5",
-  "version": "1.13.0",
+  "version": "1.14.0-beta.10",
   "main": "src/index.js",
   "license": "MIT",
   "repository": {

package/src/assets/icons/Mental-injury.svg

@@ -0,0 +1,40 @@
+<svg
+    xmlns="http://www.w3.org/2000/svg"
+    width="800px"
+    height="800px"
+    viewBox="0 0 48 48"
+    fill="none"
+  >
+    <path
+      fill-rule="evenodd"
+      clip-rule="evenodd"
+      d="M37.2847 25.6154L37.1193 25.2621C36.4062 23.7381 36.1988 22.1238 36.1366 20.6919C36.1052 19.9703 36.11 19.257 36.1176 18.6014C36.1187 18.5113 36.1198 18.4225 36.1209 18.335C36.1279 17.7692 36.1342 17.2553 36.123 16.7604C36.0756 14.8106 35.4636 12.9118 34.355 11.2858C33.0921 9.71615 31.4415 8.48173 29.5544 7.70176L29.5216 7.6882L29.4893 7.67348C26.935 6.50995 24.1507 5.908 21.3318 5.91114L21.3296 5.91115C17.7824 5.91115 14.3879 7.29451 11.8909 9.74531C9.39511 12.1949 8 15.5091 8 18.9569C8 21.0012 8.59295 23.3328 9.62467 25.4904C10.6588 27.653 12.0607 29.4888 13.5372 30.6266L14.3164 31.2271V40.1425C14.6413 40.5448 15.2724 41.0416 16.219 41.4724C17.3773 41.9997 18.5419 42.2133 19.2158 42.1583L19.2971 42.1516H19.3786C21.3349 42.1516 22.2503 41.5988 22.6443 41.2626C22.7871 41.1407 22.8864 41.026 22.953 40.9356V35.4002L25.4499 36.0456L25.4511 36.0459L25.4521 36.0462L25.4534 36.0465L25.4656 36.0495C25.4811 36.0533 25.5077 36.0597 25.5448 36.0683C25.619 36.0855 25.7345 36.1111 25.8852 36.1414C26.1875 36.202 26.6274 36.2802 27.1577 36.3457C28.2343 36.4785 29.6077 36.5491 30.9339 36.3545C32.2715 36.1584 33.3862 35.7193 34.1529 34.9857C34.8668 34.3024 35.4954 33.1581 35.4954 31.0618V29.352L37.1767 29.0874L37.1781 29.0872L37.1862 29.0858C37.1922 29.0847 37.2007 29.0832 37.2118 29.0811C37.2228 29.0791 37.2362 29.0765 37.2518 29.0735C37.315 29.061 37.413 29.0403 37.5345 29.0101C37.7834 28.9483 38.1014 28.854 38.4114 28.7232C38.7332 28.5875 38.9648 28.4464 39.1013 28.3262C39.1288 28.3019 39.1481 28.2825 39.1614 28.268C39.1565 28.2144 39.1378 28.1044 39.068 27.9264C38.9588 27.6481 38.7721 27.3265 38.5331 26.9938C38.2994 26.6687 38.0509 26.3816 37.8573 26.1735C37.762 26.071 37.6837 25.9916 37.632 25.9404C37.6189 25.9274 37.6075 25.9163 37.5982 25.9072C37.5892 25.8984 37.582 25.8915 37.5767 25.8865L37.5685 25.8786L37.5674 25.8777L37.2847 25.6154ZM24.953 37.9829C24.953 37.9829 25.7548 38.1901 26.953 38.3355C30.4936 38.7652 37.4954 38.655 37.4954 31.0618C37.4954 31.0618 40.7982 30.5421 41.1327 28.6545C41.4671 26.767 38.9308 24.4144 38.9308 24.4144C38.0683 22.5713 38.0953 20.4009 38.1207 18.3634C38.1277 17.8001 38.1346 17.2469 38.1225 16.7137C38.0654 14.3491 37.3155 12.0508 35.9624 10.0936C34.4807 8.23043 32.5377 6.77069 30.3183 5.85341C27.5022 4.57059 24.4343 3.90769 21.3296 3.91115C17.2639 3.91115 13.3648 5.49632 10.4899 8.31794C7.61508 11.1396 6 14.9665 6 18.9569C6 23.7578 8.74879 29.4615 12.3164 32.2108V40.7048C13.3287 42.828 17.1475 44.3338 19.3786 44.1516C24.1168 44.1516 24.953 41.416 24.953 41.416V37.9829Z"
+      fill="#333333"
+    />
+    <path
+      d="M26.7229 20.1457C27.4959 20.1457 27.2508 19.9188 27.8892 19.4947C28.5374 19.918 29.3023 20.1399 30.0828 20.1311L32.5622 19.2531C33.2609 18.6926 33.7405 17.9155 33.9208 17.0521C34.1012 16.1886 33.9713 15.291 33.5529 14.5096C33.1345 13.7281 32.4529 13.1103 31.6224 12.7594C31.4328 11.9234 30.9551 11.1756 30.2686 10.6402L27.8484 9.81597H27.5759C27.0375 9.05158 26.2294 8.50633 25.3049 8.28388L21.116 8C20.2535 8.06974 19.4402 8.41984 18.807 8.99394C18.5078 8.92529 18.2016 8.88971 17.8941 8.88787C17.1498 8.88936 16.4218 9.10047 15.7981 9.49572C15.1743 9.89097 14.6815 10.4535 14.379 11.1153L12.4074 12.4744C11.9169 13.1213 11.6528 13.9044 11.6541 14.7084C11.6492 15.0445 11.6951 15.3796 11.7903 15.7028C11.273 16.3559 10.9949 17.1586 11.0001 17.9832C10.9988 18.9396 11.3743 19.8601 12.0492 20.5554C12.1036 21.2401 12.3495 21.8973 12.7601 22.4558C13.1708 23.0143 13.7306 23.4529 14.379 23.7242C15.1261 24.1799 15.7587 24.7929 16.2302 25.518C16.7018 26.243 16.8964 27.0617 17 27.9138H21.116V23.9363C21.1151 23.2301 21.3176 22.5377 21.7005 21.9378C22.0834 21.3378 22.2979 20.8543 22.9489 20.5421C23.5588 20.315 24.1084 19.9569 24.5566 19.4947C25.195 19.9188 25.95 20.1457 26.7229 20.1457Z"
+      fill="#333333"
+    />
+    <path
+      d="M34 23.5C34 24.3284 33.3284 25 32.5 25C31.6716 25 31 24.3284 31 23.5C31 22.6716 31.6716 22 32.5 22C33.3284 22 34 22.6716 34 23.5Z"
+      fill="#333333"
+    />
+    <path
+      fill-rule="evenodd"
+      clip-rule="evenodd"
+      d="M21 32H17V30H21V32Z"
+      fill="#333333"
+    />
+    <path
+      fill-rule="evenodd"
+      clip-rule="evenodd"
+      d="M21 36H17V34H21V36Z"
+      fill="#333333"
+    />
+    <path
+      fill-rule="evenodd"
+      clip-rule="evenodd"
+      d="M21 40H17V38H21V40Z"
+      fill="#333333"
+    />
+  </svg>

package/src/assets/icons/Physical-injury.svg

@@ -0,0 +1,11 @@
+<svg
+    xmlns="http://www.w3.org/2000/svg"
+    fill="#000000"
+    width="800px"
+    height="800px"
+    viewBox="-32 0 512 512"
+  >
+    <path
+      d="M277.37 11.98C261.08 4.47 243.11 0 224 0c-53.69 0-99.5 33.13-118.51 80h81.19l90.69-68.02zM342.51 80c-7.9-19.47-20.67-36.2-36.49-49.52L239.99 80h102.52zM224 256c70.69 0 128-57.31 128-128 0-5.48-.95-10.7-1.61-16H97.61c-.67 5.3-1.61 10.52-1.61 16 0 70.69 57.31 128 128 128zM80 299.7V512h128.26l-98.45-221.52A132.835 132.835 0 0 0 80 299.7zM0 464c0 26.51 21.49 48 48 48V320.24C18.88 344.89 0 381.26 0 422.4V464zm256-48h-55.38l42.67 96H256c26.47 0 48-21.53 48-48s-21.53-48-48-48zm57.6-128h-16.71c-22.24 10.18-46.88 16-72.89 16s-50.65-5.82-72.89-16h-7.37l42.67 96H256c44.11 0 80 35.89 80 80 0 18.08-6.26 34.59-16.41 48H400c26.51 0 48-21.49 48-48v-41.6c0-74.23-60.17-134.4-134.4-134.4z"
+    />
+  </svg>

package/src/assets/icons/icon-view-off.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="140.743" height="128.766" viewBox="0 0 140.743 128.766"><g transform="translate(0 0)"><path d="M5.986,128.766A5.986,5.986,0,0,1,.45,120.507a.323.323,0,0,1,.083-.056.35.35,0,0,0,.073-.046L117.334,3.677a4.454,4.454,0,0,0,1.036-1.742l.107-.108a5.986,5.986,0,1,1,8.465,8.465L103,34.206a125.465,125.465,0,0,1,25.74,21.55,12.981,12.981,0,0,1,.042,17.348A125.8,125.8,0,0,1,115.556,85.64a118.682,118.682,0,0,1-16.05,11.144,90.43,90.43,0,0,1-17.951,7.984,63.583,63.583,0,0,1-18.927,3.054h-1.8a67.061,67.061,0,0,1-25.8-5.62L10.213,127.02A5.951,5.951,0,0,1,5.986,128.766Zm78.962-75.9a1.515,1.515,0,0,0-1.076.452L50.589,86.6A1.514,1.514,0,0,0,51,89.032,25.738,25.738,0,0,0,69.553,90.17,27.416,27.416,0,0,0,87.511,72.044a25.711,25.711,0,0,0-1.2-18.323,1.51,1.51,0,0,0-1.36-.854Z" transform="translate(8.661 0)" fill="#fff"/><path d="M44.106,51.784a1.461,1.461,0,0,0,.365-1.437A25.83,25.83,0,0,1,43.417,43.4,26.937,26.937,0,0,1,70.355,16.467,25.6,25.6,0,0,1,77.3,17.5a1.461,1.461,0,0,0,1.437-.371L90.354,5.506a1.52,1.52,0,0,0-.6-2.52A62.333,62.333,0,0,0,70.355,0C44.615-.342,18.874,17.664,3.388,34.718a12.87,12.87,0,0,0-.042,17.36,126.959,126.959,0,0,0,20.58,18.138,1.532,1.532,0,0,0,1.951-.174Z" transform="translate(0 21.038)" fill="#fff"/></g></svg>

package/src/assets/icons/other.svg

@@ -0,0 +1,19 @@
+<svg
+  xmlns="http://www.w3.org/2000/svg"
+  viewBox="0 0 256 256"
+  fill="currentColor"
+  role="img"
+  aria-label="Icon"
+  focusable="false"
+>
+  <g>
+    <circle cx="128" cy="22.4" r="21.1"/>
+    <path d="M223,51.5c-3.6-3.6-9.5-3.6-13.1,0l-23.3,23.3c0,0-18.1-18.2-18.3-18.3c-5.2-5.2-11.9-7.7-18.7-7.7H128h0h-21.6
+      c-6.8,0-13.5,2.6-18.7,7.7c-0.2,0.2-18.3,18.3-18.3,18.3L46.1,51.5c-3.6-3.6-9.5-3.6-13.1,0c-3.6,3.6-3.6,9.5,0,13.1l29.9,29.9
+      c3.6,3.6,9.5,3.6,13.1,0l18.4-18.5c0.5-0.5,1.1-0.8,1.9-0.8c1.5,0,2.6,1.2,2.6,2.6v23.8v44.9v95.1c0,0.5,0,0.9,0.1,1.4
+      c0.3,3.1,1.7,5.9,3.8,8c2.4,2.4,5.7,3.9,9.3,3.9c3.6,0,6.9-1.5,9.3-3.9c2.1-2.1,3.5-4.9,3.8-8c0-0.4,0.1-0.9,0.1-1.4v-92.4
+      c0-1.5,1.2-2.6,2.6-2.6s2.6,1.2,2.6,2.6v92.4c0,0.5,0,0.9,0.1,1.4c0.3,3.1,1.7,5.9,3.8,8c2.4,2.4,5.7,3.9,9.3,3.9s6.9-1.5,9.3-3.9
+      c2.1-2.1,3.5-4.9,3.8-8c0-0.4,0.1-0.9,0.1-1.4v-95.1h0V77.8c0-1.5,1.2-2.6,2.6-2.6c0.7,0,1.4,0.3,1.9,0.8L180,94.4
+      c3.6,3.6,9.5,3.6,13.1,0L223,64.5C226.6,60.9,226.6,55.1,223,51.5z"/>
+  </g>
+</svg>

package/src/components/Containers/Carousel/index.vue

@@ -1,26 +1,32 @@
 <template>
   <div>
-    <b-carousel
+    <BCarousel
       id="carousel-1"
       :class="{carouselPara: isParagraph}"
       v-model="slide"
       interval="0"
       controls
       indicators
+      label-indicators="Select a slide to display"
       keyboard
       :fade="true"
       background="#ababab"
+      img-width="100%"
+      img-height="auto"
     >
-      <b-carousel-slide
+      <BCarouselSlide
         v-for="item in filteredCarouselItems"
         :key="item.id"
         :img-src="getImageURL(item.imageURL)"
         :img-alt="item.imageAlt"
         @click.prevent="handleClick(item.linkURL)"
       >
-      <h4>{{ item.title }}</h4>
-      </b-carousel-slide>
-    </b-carousel>
+        <span 
+          :class="carousel-caption" 
+          :aria-label="item.title ? item.title : 'No caption available'"
+          :style="item.title === null || item.title === '' ? 'height: 32px;' : null">{{ item.title }}</span>
+      </BCarouselSlide>
+    </BCarousel>
   </div>
 </template>
 
@@ -113,29 +119,30 @@ methods: {
 <style>
   .carousel {
     position: relative;
-    padding-bottom: 7rem;
-    max-width: 540px;
+    margin-bottom: 10px;
   }
 
   .carousel-inner {
-    overflow: visible;
+    border-radius: 8px  ;
+  } 
+/* Introduced changes to make image responsive */
+  .carousel img {
+    object-fit: cover;
+    max-height: 392px;
+    height: auto;
+    width: 100%;
   }
 
   .carousel-indicators {
-    padding-bottom: 3rem;
-    float: right;
-    right: 2% !important;
-    width: 20%;
-    justify-content: end;
-    margin-left: 80%;
-    margin-right: 0;
+    justify-content: end !important;
+    margin-right: 10px !important;
   }
 
   .carousel-indicators button {
     width: 10px !important;
     height: 10px !important;
     border-radius: 50% !important;
-    background-color: black !important;
+    background-color: yellow !important;
   }
 
   .carousel-indicators button:focus,
@@ -145,17 +152,24 @@ methods: {
   }
 
   .carousel-caption {
-    color: black;
-    top: 100%;
-    left: 0;
-    right: 20%;
-    text-align: left;
-    text-decoration: underline;
+    display: flex;
+    font-size: 24px;
+    font-weight: normal;
+    flex-direction: column;
+    align-items: flex-start; 
+    text-align: left !important;
+    width: 100%;
+    color: white;
+    background-color: black;
+    left: 0 !important;
+    right: 0 !important;
+    bottom: 0 !important;
+    padding: 1rem !important;
   }
 
   .carousel-control-next,
   .carousel-control-prev {
-    bottom: 7rem;
+    bottom: 4rem;
   }
 
   .carousel-control-prev:focus,
@@ -168,16 +182,19 @@ methods: {
 
   .carousel-control-prev-icon,
   .carousel-control-next-icon {
-    height: 50px !important;
-    width: 50px !important;
-    outline:none !important;
+    height: 60px !important;
+    width: 60px !important;
+  }
+
+  .carousel-item {
+    position: relative;
   }
 
   .carouselPara {
     margin-left: auto;
     margin-right: auto;
-    width: 75%;
-    height: auto;
+    height: 50%;
+    width:50%;
   }
 
 </style>

package/src/components/Containers/HomepageHeader/index.vue

@@ -38,16 +38,7 @@
           :stretch="true"
           >{{ link.text }}</cta-button
         >
-        <cta-button
-          class="iebtn"
-          url="/choose-your-language"
-          type="dark"
-          :stretch="true"
-          :glyph="earthIcon"
-          :is-centred="false"
-          >Choose your language</cta-button
-        >
-      </div>
+     </div>
     </template>
   </hero-header>
 </template>
@@ -86,7 +77,7 @@ export default {
 
 .homepage-header {
   border-bottom: none !important;
-
+  
   :deep(.wysiwyg) {
     h1 {
       @media screen and (max-width: 390px) {

package/src/components/Containers/HomepageHeaderNew/index.stories.js

@@ -1,6 +1,7 @@
 import HomepageHeader from './index.vue'
 import { mockCarouselItems } from '../../../mock/carousel-items'
 
+// Introduced an additional headerLink
 
 const headerLinks = [
     {
@@ -22,6 +23,10 @@ const headerLinks = [
     {
       text: 'Pay or renew your insurance',
       path: '/pay-or-renew-your-workcover-insurance-premium'
+    },
+    {
+      text: 'Contact Worksafe',
+      path: '/contact-worksafe'
     }
   ]
 

package/src/components/Containers/HomepageHeaderNew/index.vue

@@ -13,11 +13,10 @@
       
     <div class="homepage-header__content-wrapper">
       <container class="homepage-header__content-wrapper__content">
-        <row>
+        <row id="header-row">
+          <!-- changes made to bootstrap grid breakpoints -->
           <column
-              class="homepage-header__content-wrapper__content-col col-12 col-md-7 homepage-header__content-wrapper__content-col--split wcl-rich-text--ltr"
-              :xs="7"
-              :md="7"
+              class="homepage-header__content-wrapper__content-col col-12 col-md-7 col-lg-8 homepage-header__content-wrapper__content-col--split wcl-rich-text--ltr"
             >
               <carousel-component 
                 :carousel-items="slideList"
@@ -25,10 +24,9 @@
                 :is-paragraph="false"
               />
           </column>
-          <column
-              md="4"
-              :offset-md="1"
-              class="homepage-header__side col-md-4 offset-md-1"
+          <column  
+              id="header-links"
+              class="homepage-header__side col-12 col-md-5 col-lg-4"
             >
               <div>
                 <cta-button
@@ -36,8 +34,9 @@
                   :key="i"
                   class="iebtn"
                   :url="link.path"
-                  type="dark"
                   :stretch="true"
+                  type="dark"
+                 
                   >{{ link.text }}</cta-button
                 >
               </div>
@@ -86,7 +85,35 @@ export default {
 
   data: () => ({
     earthIcon,
-  })
+  }),
+  mounted() {
+    window.addEventListener('resize', this.setCarouselHeight)
+    this.setCarouselHeight()
+  },
+  beforeDestroy() {
+    window.removeEventListener('resize', this.setCarouselHeight)
+  },
+  methods: {
+    setCarouselHeight() {
+      this.$nextTick(() => {
+        const sideMenu = this.$el.querySelector('.homepage-header__side')
+        const carousel = this.$el.querySelector('.carousel')
+        const carouselItem = this.$el.querySelector('.carousel-item')
+               
+        if (sideMenu && carousel && window.innerWidth >= 450  ) {
+          const menuHeight = sideMenu.offsetHeight
+          const newHeight = menuHeight - 16  // 16px padding adjustment
+          carousel.style.height = `${newHeight}px`
+          if (carouselItem) {
+            carouselItem.style.height = `${newHeight}px`
+          }
+        } else if (carousel) {
+            carousel.removeAttribute('style') // Reset to default styles
+            carouselItem.removeAttribute('style') // Reset to default styles
+        }
+      })
+    },
+  }  
 }
 </script>
 
@@ -102,6 +129,8 @@ export default {
   border-bottom: none !important;
   height: auto;
   align-items: normal;
+  padding-top: 30px;
+  padding-bottom: 30px;
 
   :deep(.wysiwyg) {
     h1 {
@@ -174,7 +203,6 @@ export default {
   }
 
   &__search {
-    margin-top: 10px;
     z-index: 1;
     width: auto;
     position: relative;
@@ -220,4 +248,5 @@ export default {
     }
   }
 }
+
 </style>

package/src/components/Containers/SectionGroup/index.vue

@@ -50,7 +50,7 @@
             <slot name="preContent"></slot>
           </column>
         </row>
-        
+
         <div
           class="section-group__content section-group__row"
           :class="{
@@ -61,7 +61,7 @@
               subHeading ||
               $slots.headerRight
             ),
-            [`${contentClass}`]: hasContentClass
+            [`${contentClass}`]: hasContentClass,
           }"
           :style="applyBackgroundOn === 'content' ? backgroundStyle : null"
         >
@@ -99,7 +99,7 @@ export default {
       type: String,
       default: 'page',
       validator: (value) =>
-        ['half-content', 'content', 'page', 'full'].indexOf(value) >= 0
+        ['half-content', 'content', 'page', 'full'].indexOf(value) >= 0,
     },
     backgroundVariant: {
       type: String,
@@ -113,48 +113,48 @@ export default {
           'yellow',
           'white',
           'lightblue',
-          'lightred'
-        ].indexOf(value) >= 0
+          'lightred',
+        ].indexOf(value) >= 0,
     },
     applyBackgroundOn: {
       type: String,
       default: 'section',
       validator: (value) =>
-        ['content', 'block', 'container', 'section'].indexOf(value) >= 0
+        ['content', 'block', 'container', 'section'].indexOf(value) >= 0,
     },
     backgroundImage: {
       type: String,
-      default: ''
+      default: '',
     },
     noPaddingTop: {
-      type: Boolean
+      type: Boolean,
     },
     noPaddingBottom: {
-      type: Boolean
+      type: Boolean,
     },
     bordered: {
-      type: Boolean
+      type: Boolean,
     },
     rtl: {
       type: Boolean,
-      default: false
+      default: false,
     },
     title: {
       type: String,
-      default: null
+      default: null,
     },
     subHeading: {
       type: String,
-      default: null
+      default: null,
     },
     titleTag: {
       type: String,
-      default: 'h2'
+      default: 'h2',
     },
     contentClass: {
       type: String,
-      default: ''
-    }
+      default: '',
+    },
   },
   computed: {
     generatedClass() {
@@ -162,7 +162,7 @@ export default {
         rtl: this.rtl,
         [`section-group--noPaddingTop`]: this.noPaddingTop,
         [`section-group--noPaddingBottom`]: this.noPaddingBottom,
-        [`section-group--size-` + this.size]: !!this.size
+        [`section-group--size-` + this.size]: !!this.size,
       }
     },
     backgroundStyle() {
@@ -175,7 +175,7 @@ export default {
           [`background-size`]: `cover`,
           [`background-position`]: `center center`,
           color: '#ffffff',
-          ['border-radius']: borderRadius
+          ['border-radius']: borderRadius,
         }
       }
       if (this.backgroundVariant) {
@@ -206,14 +206,14 @@ export default {
         styles = {
           ...(styles || {}),
           [`background-color`]: bgColour,
-          ['border-radius']: borderRadius
+          ['border-radius']: borderRadius,
         }
       }
 
       if (this.bordered) {
         styles = {
           ...(styles || {}),
-          [`border`]: `1px solid ` + colors.gray
+          [`border`]: `1px solid ` + colors.gray,
         }
       }
 
@@ -221,7 +221,7 @@ export default {
     },
     hasContentClass() {
       return this.contentClass.length > 0
-    }
+    },
   },
   mounted() {
     window.addEventListener('resize', this.setColumnSize)
@@ -241,8 +241,8 @@ export default {
         this.$emit('isDesktopView', !isTabletView && !isMobileView)
         this.$emit('isMobileOrTabletView', isMobileView || isTabletView)
       })
-    }
-  }
+    },
+  },
 }
 </script>
 

package/src/components/Global/AppHeaderNew/index.vue

@@ -5,7 +5,7 @@
       :class="'app-header' + (screen === 'mobile' ? ' ' + 'isMobile' : '')"
     >
       <!-- Top menu -->
-      <div class="logo">
+      <div :class="screen === 'mobile' ? 'logoMobile' : 'logo'">
         <!-- Mobile Menu -->
         <div v-if="screen === 'mobile'" class="app-header__mobile-menu-container">
           <a class="dark" role="button" @click.prevent="showMobileMenu">
@@ -15,7 +15,7 @@
         <!-- Logo -->
         <nuxt-link class="dark" to="/">
           <img
-            :class="screen === 'mobile' ? 'LogoImgMobile' : 'LogoImg'"
+            :class="screen === 'mobile' ? 'logoImgMobile' : 'logoImg'"
             :alt="
               isWorkWell
                 ? 'Work Well Victoria - Logo'
@@ -26,36 +26,38 @@
         </nuxt-link>
         <span :class="screen === 'mobile' ? 'logo__nav_mobile' : 'logo__nav'">
           <!-- Roles added for accessibility -->
-          <table role="presentation" >
+          <table role="presentation" style="margin-right: 0;">
             <tbody role="presentation">
               <tr role="presentation">
-              <td :class="screen === 'mobile' ? 'td_mobile' : ''">
+              <td :class="screen === 'mobile' ? 'td_mobile mobile-link' : ''">
                 <!-- Language link -->
+            
                 <nuxt-link
-                  :class="screen === 'mobile' ? 'mobile-link' : ''"
                   to="/languages"
                   @click.native="fireAnalytics('Choose your language', '/languages')"
                   title="Language"
                 >
                   <span v-if="screen !== 'mobile'">Choose your language </span>
-                  <img alt="Language Icon" width="15px" height="15px" :src=LanguageIcon />
+                  <img :class="screen === 'mobile' ? 'imgMobile' : ''" alt="Language Icon" width="15px" height="15px" :src=LanguageIcon />
                 </nuxt-link>
+                
               </td>
-              <td :class="screen === 'mobile' ? 'td_mobile' : ''">
+              <td :class="screen === 'mobile' ? 'td_mobile mobile-link' : ''">
                 <!-- Contrast link -->
-                <a href="javascript:void(0)" :class="screen === 'mobile' ? 'mobile-link' : ''" @click="show = !show" @keyup.esc="show = !show" title="Contrast" ref="selectContrast">
-                  <span v-if="screen !== 'mobile'">Adjust contrast</span> <img alt="Contrast Icon" width="15px" height="15px" :src=ContrastIcon />
+                <a href="javascript:void(0)" @click="show = !show" @keyup.esc="show = !show" title="Contrast" ref="selectContrast">
+                  <span v-if="screen !== 'mobile'">Adjust contrast</span> <img :class="screen === 'mobile' ? 'imgMobile' : ''" alt="Contrast Icon" width="15px" height="15px" :src=ContrastIcon />
                 </a>
                 <div
                   ref="contrastChoices"
-                  class="flex-container"
+                  :class="screen === 'mobile' ? 'flex-container_contrast_mobile' : 'flex-container_contrast'"
                   v-if="show"
                 >
-                  <div class="flex-item contrast_slide--box-list">
-                    <div v-for="list in lists" :key="list.value">
-                      <label :class="{'last-radio': list.label==='Greyscale'}">
+                  <div class="flex-item_contrast contrast_slide--box-list">
+                    <div v-for="list in lists" :key="list.value" >
+                     <label :for="list.id" :class="{'last-radio': list.label==='Greyscale'}">
                         <input
                           type="radio"
+                          :id="list.id"
                           :name="list.name"
                           :value="list.value"
                           :checked="list.value === selectedValue"
@@ -74,7 +76,7 @@
                   class="cta-button cta-button--text-only cta-button--slim"
                   to="/search"
                   title="Search"
-                  ><span v-if="screen !== 'mobile'">Search  &nbsp;</span> <img alt="Search Icon" width="15px" height="15px" :src=NavSearchIcon />
+                  ><span v-if="screen !== 'mobile'">Search  &nbsp;</span><img alt="Search Icon" style="margin-top: 2px;" width="15px" height="15px" :src=NavSearchIcon />
                 </nuxt-link>
               </td>
               <td :class="screen === 'mobile' ? 'td_mobile-last' : ''">
@@ -411,18 +413,25 @@ export default {
       NavSearchIcon,
       lists: [
         {
+          id: 'contrast1',
           name: 'contrast',
           value: 'default',
-          label: 'Light contrast (default)'
+          label: 'Light contrast (default)',
+          labelmobile: 'Light'
         },
         {
+          id: 'contrast2',
           name: 'contrast',
           value: 'high_contrast',
-          label: 'Increased contrast'
+          label: 'Increased contrast',
+          labelmobile: 'Increased'
         },
-        { name: 'contrast', 
-          value: 'grayscale', 
-          label: 'Greyscale' 
+        {
+          id: 'contrast3',
+          name: 'contrast',
+          value: 'grayscale',
+          label: 'Greyscale',
+          labelmobile: 'Greyscale'
         }
       ],
       selectedValue: null
@@ -497,7 +506,6 @@ export default {
       this.windowWidth = window.innerWidth;
     },
     firstLevelClick(item, ref) {
-      // Reset screen to fix whitespace
       if (window && window.scrollTo && this.screen === "desktop") {
         window.scrollTo(0, 0);
       }
@@ -527,10 +535,8 @@ export default {
         this.isSecondLevelOpen === true &&
         selectedItem === previouslyOpenItem
       ) {
-        selectedItem.classList.remove("isActiveParent");
-        selectedItem.getElementsByTagName("a")[0].setAttribute("aria-expanded", "false");
-        this.isSecondLevelOpen = false;
-        this.letBodyOverflow(true);
+        this.closeMegaMenu();
+       
       }
       // If the link has no children then go to that page
       else if (!item.below) {
@@ -578,6 +584,7 @@ export default {
       }
       // If the menu is already open and the same item is clicked,
       // close it
+
       else if (
         item.below &&
         this.isThirdLevelOpen === true &&