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

package/src/components/Global/AppHeaderNew/mobile.scss

@@ -3,6 +3,7 @@
 .app-header {
   &.isMobile {
     padding: 0;
+    width: 100vw;
 
     .app-header {
       &__wrap {
@@ -20,6 +21,8 @@
 
           ul {
             float: none;
+            padding-left: 15px;
+            padding-right: 10px;
 
             li {
              height: 62px;
@@ -71,6 +74,8 @@
         display: table-cell;
         vertical-align: middle;
         text-align: left;
+        margin-left: 0px;
+        margin-right: 10px;
 
         svg {
             filter: invert(100%) sepia(5%) saturate(49%) hue-rotate(165deg)
@@ -177,6 +182,7 @@
                 margin-bottom: 5px;
                 padding: 0;
                 top: 0;
+                margin-left: 10px;
 
                 span {
                   color: $app-header-active;
@@ -267,38 +273,70 @@
   top: 10px !important;
 }
 
-.LogoImgMobile {
+.logoMobile {
+  height: 85px;
+  padding: 15px 0%;
+  display: flex;
+  align-items: center;
+  margin-right: 0px;
+  margin-left: 10px;
+  background-color: white;
+  width: 100%;
+ }
+
+.logoImgMobile {
   height: 40px;
   width: auto;
 }
 
-.logo__nav-mobile {
-  display:inline-block;
-  margin-left: 10px;
-  margin-right: 0px;
-  width: 100%;
+.logo__nav_mobile {
+  display:flex;
+  margin-left: 15px;
+  margin-right: 25px;
+  width: 60% !important;
   overflow-y:auto;
+  justify-content: flex-end;
+
+  table {
+    border-collapse: separate;
+    border-spacing: 5px;
+  }
+  
+  }
+
+.imgMobile {
+  display: block;
+  margin-left: auto;
+  margin-right: auto;
 }
 
 .td_mobile {
-    padding: 0px 5px !important;
     height: 35px;
     width: 35px;
   }
 
 .td_mobile-last {
- padding: 0px 0px 0px 5px !important;
+ padding: 0px !important;
 }
 
 .mobile-link {
-  height: 35px;
-  width: 35px;
+  width: 40px !important;
+  height: 40px !important;
   background-color: #f2f2f2;
   border: 1px solid #f2f2f2;
-  border-radius: 5px;
+  border-radius: 8px;
+
+  &:focus, &:hover {
+    border: 1px solid #BABABA;
+  }
 }
 
 .app-header__wrap_mobile {
   background: none;
   height: 0px;
-}
+}
+
+.flex-container_contrast_mobile {
+  margin-left: -167px;
+}
+

package/src/components/Global/AppHeaderNew/styles.scss

@@ -4,8 +4,8 @@
   color: $app-menu-white;
   z-index: 27;
   position: relative;
-  padding: 0px 10px;
-  width: 100%;
+  padding: 0px;
+  width: 100vw;
   font-size: 14px;
 
   &__wrap {
@@ -18,6 +18,9 @@
     padding: 0px 15px;
     display: table;
     width: 100%;
+    border-bottom-style: solid;
+    border-bottom-color: white;
+    border-bottom-width: 2px;
 
     > nav {
       width: 100%;
@@ -42,9 +45,14 @@
   }
   .isActiveChild {
     > a {
-      background: $app-header-active;
-      color: $app-header-text-colour;
+      background: $app-header-hover;
+      color: black;
       border-bottom: 1px solid transparent;
+
+      svg.caret-right {
+        filter: invert(0%) sepia(12%) saturate(108%) hue-rotate(344deg)
+        brightness(94%) contrast(80%);
+      }
     }
   }
 
@@ -378,16 +386,19 @@
 
 .logo {
   height: 85px;
-  padding: 15px 15px 15px 0px;
+  padding: 15px 0%;
   width: 100%;
   display: flex;
   align-items: center;
-  margin-right: 0%;
+  margin-right: 50px;
+  margin-left: -10px;
   background-color: white;
+  width: 100vw;
 
   &__nav {
     display:inline-block;
     margin-left: 15px;
+    margin-right: 10px; 
     color: #000;
     width: 100%;
     text-align: right;
@@ -421,9 +432,10 @@
   }
 }
 
-.LogoImg {
+.logoImg {
   height: 55px;
   width: auto;
+  margin-left: 20px;
 }
 
 .semi-circle {
@@ -470,11 +482,7 @@
     }
   }
 }
-@mixin opened-slide {
-  left: 100%;
-  -webkit-transform: translateX(-100%);
-  transform: translateX(-100%);
-}
+
 .contrast_slide {
   &_container {
     background: white;
@@ -490,21 +498,6 @@
     margin: 0;
     right: 0;
     position: absolute;
-
-    // &.closed {}
-    &.opened {
-      > .contrast_slide_hoverbar {
-        @include opened-slide;
-      }
-    }
-
-    @media (min-width: 768px) {
-      &:hover {
-        > .contrast_slide_hoverbar {
-          @include opened-slide;
-        }
-      }
-    }
   }
 
   &_hoverbar {
@@ -604,14 +597,13 @@
       padding: 10px 0;
 
       input[type='radio'] {
-        border: 2px solid #bebebe;
+        border: 3px solid #bebebe;
         border-radius: 50%;
-        box-shadow: 0 0 0px 0px #bebebe inset;
-        height: 24px;
+        height: 25px;
         outline: none;
         vertical-align: middle;
         margin-right: 5px;
-        width: 24px;
+        width: 25px;
         appearance: none;
 
         &:before {
@@ -633,11 +625,11 @@
   }
 }
 
-.flex-container {
+.flex-container_contrast {
   margin-left: -5px;
 }
 
-.flex-item {
+.flex-item_contrast {
   border: 1px solid;
   border-color: #BABABA;
   padding: 10px;
@@ -647,5 +639,6 @@
   input[type="radio"] {
     accent-color: black;
     margin-right: 5px;
+    vertical-align: middle;
   }
 }

package/src/components/Paragraphs/Accordion/index.stories.js

@@ -5,7 +5,7 @@ const mockAccordionItems = [
     field_title: 'Item one',
     field_pre_heading: 'preheading text',
     field_rich_text: {
-      value:
+      processed:
         '<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.</p>',
     },
     id: 'id-1',
@@ -14,7 +14,7 @@ const mockAccordionItems = [
     field_title: 'Item two',
     field_pre_heading: 'preheading text',
     field_rich_text: {
-      value:
+      processed:
         '<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.</p>',
     },
     id: 'id-2',
@@ -23,7 +23,7 @@ const mockAccordionItems = [
     field_title: 'Item three',
     field_pre_heading: 'preheading text',
     field_rich_text: {
-      value:
+      processed:
         '<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.</p>',
     },
     id: 'id-3',

package/src/components/Paragraphs/Accordion/index.vue

@@ -22,7 +22,7 @@
           <stepper-item
             v-if="isStepper"
             :itemid="item.id ? item.id : '' + index"
-            :content="hasContent(item) ? item.field_rich_text.value : ''"
+            :content="hasContent(item) ? item.field_rich_text.processed : ''"
             :title="item.field_title"
             class="accordion__item stepper"
             :rtl="rtl || item.field_rtl"
@@ -33,7 +33,7 @@
           <accordion-item
             v-if="!isStepper"
             :itemid="item.id ? item.id : '' + index"
-            :content="hasContent(item) ? item.field_rich_text.value : ''"
+            :content="hasContent(item) ? item.field_rich_text.processed : ''"
             :title="item.field_title"
             class="accordion__item"
             :rtl="rtl || item.field_rtl"
@@ -124,7 +124,7 @@ export default {
       return false
     },
     hasContent(item) {
-      return item?.field_rich_text?.value
+      return item?.field_rich_text?.processed
     },
   },
 }