wickes-css2 2.94.0-develop.2 → 2.94.0-develop.20

package/src/scss/pages/_checkout-widget.scss

@@ -83,10 +83,20 @@
     margin-bottom: 0;
     list-style-type: none;
 
-    & > li:not(:first-of-type) {
+    & > li:last-child {
+      margin: 0;
+    }
+
+    & >li:not(:first-of-type) {
       margin-top: 5px;
     }
 
+    & > .checkout-widget__accordion-wrap {
+      &.checkout-widget__details-discount {
+        margin-top: 8px;
+      }
+    }
+
     .checkout-widget__details-hidden {
       padding-left: 15px;
       list-style: disc;
@@ -426,7 +436,7 @@
       text-align: center;
       width: 100%;
       color: $green;
-      font-size: 4rem;
+      font-size: 1rem;
       margin-bottom: 10px;
     }
   }
@@ -515,10 +525,6 @@
     padding-right: 0;
   }
 
-  &-hide {
-    display: none;
-  }
-
   input {
     text-transform: uppercase;
 
@@ -528,6 +534,92 @@
   }
 }
 
+.voucher {
+  padding-bottom: 10px;
+
+  .checkout-widget.checkout-voucher.checkout-voucher_fixed {
+    padding: 0;
+  }
+
+  .checkout-widget.checkout-voucher {
+    margin-bottom: 0;
+
+    &-hide {
+      display: none;
+    }
+
+    &.voucher-applied {
+      background: $white;
+      height: 40px;
+      padding: 8px 0;
+      margin: 0;
+
+      .voucher-applied__inner {
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        gap: 8px;
+
+        & .icon {
+          display: inline-block;
+
+          &__check {
+            width: 24px;
+            height: 24px;
+            display: flex;
+            justify-content: center;
+            align-items: center;
+
+            i {
+              font-size: 24px;
+              line-height: 24px;
+            }
+          }
+        }
+
+        & .fa-check-circle {
+          font-size: 1rem;
+          margin: 0;
+        }
+
+        & h5 {
+          font-size: .875rem;
+          margin: 0;
+        }
+      }
+    }
+
+    form {
+      display: flex;
+      justify-content: space-between;
+      width: 100%;
+
+      .form-row {
+        max-width: 100%;
+        flex: 1;
+        margin-right: 16px;
+        margin-bottom: 0;
+        padding: 0;
+
+        &__field {
+          margin-left: 30px;
+        }
+
+        &__error {
+          margin-left: 30px;
+          font-weight: 400;
+        }
+      }
+
+      .voucher__btn {
+        margin-top: 0;
+        margin-right: 15px;
+        height: 40px;
+      }
+    }
+  }
+}
+
 .voucher {
   .checkout-widget {
     margin-left: -15px;
@@ -537,17 +629,17 @@
 
 @include media-breakpoint-up(sm) {
   .voucher {
-    .checkout-widget {
-      margin: 0 0 20px;
-
+    .checkout-widget.checkout-voucher {
       form {
-        display: flex;
-        justify-content: space-between;
-        align-items: center;
-
         .form-row {
-          @include make-col(6);
-          margin-bottom: 0;
+          &__field {
+            margin-right: 0;
+            margin-left: 15px;
+          }
+
+          &__error {
+            margin-left: 15px;
+          }
         }
       }
     }
@@ -578,6 +670,12 @@
 
   .checkout-voucher {
     & form {
+      .form-row {
+        &__error {
+          margin-left: 15px;
+        }
+      }
+
       & .voucher__btn {
         max-width: 115px;
         height: 40px;
@@ -595,6 +693,22 @@
   }
 }
 
+@include media-breakpoint-up(md) {
+  .voucher {
+    .checkout-widget.checkout-voucher {
+      form {
+        .form-row {
+          &__field {
+            margin-right: 0;
+            margin-left: 30px;
+          }
+        }
+      }
+    }
+  }
+}
+
+
 @include media-breakpoint-up(xl) {
   .checkout-widget {
     &__detail-value_payment:not(.checkout-widget__details-hidden) {
@@ -626,6 +740,14 @@
   }
 }
 
+@include media-breakpoint-up(lg) {
+  .checkout-voucher {
+    display: flex;
+    justify-content: center;
+    align-items: center;
+  }
+}
+
 @include media-breakpoint-down(md) {
   .checkout-widget {
     &__secure {
@@ -698,7 +820,6 @@
     }
 
     &_order-summary {
-      padding: 20px 30px;
 
       .accordion__header-text {
         margin-left: 4px;
@@ -733,12 +854,6 @@
 
 @include media-breakpoint-down(xs) {
   .checkout-widget {
-    &_order-summary {
-      padding: 20px 45px;
-      margin-left: -15px;
-      margin-right: -15px;
-    }
-
     &__payment-wrapper {
       margin-left: -30px;
       margin-right: -25px;
@@ -773,12 +888,6 @@
       padding-bottom: 20px;
     }
 
-    &__detail-name_accordion + .checkout-widget__details-hidden + span {
-      right: auto;
-      left: 0;
-      top: 20px;
-    }
-
     &__detail-name,
     &__detail-value:not(.checkout-widget__details-hidden) {
       display: block;

package/src/scss/pages/_my-account_new.scss

@@ -638,10 +638,6 @@
     align-items: center;
     padding: 17px 0 15px 10px;
 
-    &__act {
-      display: none;
-    }
-
     &__info {
       align-self: flex-start;
     }
@@ -759,7 +755,6 @@
       margin-bottom: 15px;
 
       .store {
-        &__act,
         &__count {
           display: none;
         }
@@ -860,12 +855,6 @@
 
     .stock__store {
       padding-bottom: 40px;
-
-      .store__act {
-        padding-top: 7px;
-        position: absolute;
-        color: $blue;
-      }
     }
 
     .stock__tabs {
@@ -1117,7 +1106,7 @@
     }
 
     &_cell {
-      border: 2px solid $gray-light;
+      border: 1px solid $gray-light;
 
       &:nth-child(2n+1) {
         padding-left: 20px;

package/src/scss/pages/my-account-v2.scss

@@ -1,10 +1,10 @@
 @import '../helpers/helpers';
 @import '../components/my-account/consignment-info';
 @import '../components/my-account/shipment';
-@import '../components/my-account/order';
 @import '../components/my-account/menu';
 @import '../components/my-account/contacts';
 @import '../components/my-account/mobile-nav';
+@import '../components/my-account/active-orders';
 
 .my-account {
   margin: 0;
@@ -265,81 +265,6 @@
       margin-bottom: 0;
     }
   }
-
-  .active-orders {
-    margin-top: 24px;
-
-    &__title {
-      font-weight: 500;
-      font-size: 1.25rem;
-      line-height: 1rem;
-      color: $blue-dark;
-      margin-bottom: 0;
-    }
-
-    &__item {
-      margin-top: 16px;
-      padding: 16px;
-      background: $white;
-      border-radius: 4px;
-
-      & + & {
-        margin-top: 16px;
-      }
-    }
-
-    .view-more {
-      display: flex;
-      align-items: center;
-      justify-content: center;
-      padding-top: 12px;
-      border-top: 1px solid $gray;
-
-      .link {
-        font-weight: 500;
-        font-size: .875rem;
-        line-height: 1.375rem;
-        text-align: center;
-        color: $blue;
-        text-decoration: none;
-        display: flex;
-        justify-content: center;
-        align-items: center;
-
-        span:hover {
-          text-decoration: underline;
-        }
-
-        .icon {
-          margin-left: 8px;
-          font-size: 1rem;
-        }
-      }
-    }
-
-    .btn--all-orders {
-      margin-top: 16px;
-    }
-
-    .tooltip {
-      filter: drop-shadow(0 0 8px rgba(0, 0, 0, .12));
-      position: absolute;
-
-      .tooltip-inner {
-        background: $white;
-        color: $gray-dark;
-        padding: 8px 16px !important;
-        border-radius: 4px;
-        font-weight: 400;
-        font-size: .75rem;
-        line-height: 1rem;
-      }
-
-      .arrow:before {
-        border-top-color: $white;
-      }
-    }
-  }
 }
 
 @include media-breakpoint-up(sm) {
@@ -395,50 +320,6 @@
       }
     }
 
-    .active-orders {
-      &__header {
-        display: flex;
-        justify-content: space-between;
-        align-items: center;
-
-        .btn--all-orders {
-          margin-top: 0;
-          max-width: 125px;
-        }
-      }
-
-      &__item {
-        display: grid;
-        grid-template-areas:
-        'header viewMore'
-        'orderDetails orderDetails'
-        'consignmentInfo consignmentInfo'
-        'shipment shipment';
-
-        .order-header {
-          flex-direction: row-reverse;
-          justify-content: flex-end;
-          grid-area: header;
-
-          &__title {
-            margin-left: 16px;
-            font-weight: 700;
-          }
-        }
-
-        .view-more {
-          grid-area: viewMore;
-          justify-content: flex-end;
-          border-top: 0;
-          padding: 0;
-
-          .link .icon {
-            margin-left: 13px;
-          }
-        }
-      }
-    }
-
     .notification_info-message {
       font-size: .875rem;
     }
@@ -456,10 +337,6 @@
       padding: 24px;
     }
 
-    .active-orders__title {
-      font-size: 1.5rem;
-    }
-
     .notification_general:not(.notification_info-message) {
       margin-top: 16px;
       margin-bottom: 16px;
@@ -530,18 +407,6 @@
     .clipboard-code.discount-code {
       padding-right: 14px;
     }
-
-    .active-orders {
-      &__item {
-        padding: 24px;
-        grid-template-areas:
-        'header consignmentInfo viewMore'
-        'orderDetails orderDetails orderDetails'
-        'shipment shipment shipment';
-        grid-template-columns: auto auto 1fr;
-        align-items: center;
-      }
-    }
   }
 }
 

package/src/scss/pages/page_checkout_delivery-new.scss

@@ -5,18 +5,87 @@
 @import '../components/marketing-preferences';
 
 .page_checkout-delivery-new {
-  .summary {
-    .checkout-title__title {
-      color: $blue-ocean;
-      font-weight: 400;
-      line-height: 1.75rem;
-    }
+  .right-aside {
+    .summary {
+      .checkout-title__title {
+        color: $blue-ocean;
+        font-weight: 400;
+        line-height: 1.75rem;
+      }
+
+      &__aside {
+        padding: 12px 30px 0;
+
+        .checkout-info-wrap {
+          padding: 0;
+        }
+
+        .checkout-widget.checkout-widget_order-summary {
+          padding: 25px 20px 0;
+        }
+
+        .checkout-widget {
+          &__details {
+            font-size: 1rem;
+
+            .checkout-widget {
+              &__item {
+                display: flex;
+                justify-content: space-between;
+                font-size: 1rem;
+                line-height: 1.125rem;
+                font-weight: 400;
+                margin-bottom: 20px;
+                padding: 0;
+
+                &-bold {
+                  font-weight: 500;
+                  margin-bottom: 20px;
+                }
 
-    &__aside {
-      padding: 12px 30px 0;
+                &-vat {
+                  font-size: .75rem;
+                  margin-top: -15px;
+                }
+              }
+
+
+              &__details-discount {
+                order: 1;
+              }
+            }
+          }
 
-      .checkout-info-wrap {
-        padding: 0;
+          &__total {
+            border: 0;
+            display: flex;
+            justify-content: space-between;
+            margin-left: -25px;
+            margin-right: -25px;
+            margin-bottom: 0;
+            padding: 20px 25px;
+            color: #fff;
+            background-color: #0a3055;
+            font-size: 1.375rem;
+            line-height: 1.5rem;
+            font-weight: 400;
+          }
+        }
+      }
+
+      &__basked-id {
+        padding: 26px 0;
+        background: #f8f8f8;
+        text-align: center;
+        font-size: 1rem;
+
+        .id-number {
+          font-weight: 700;
+        }
+      }
+
+      .accordion__header-icon-small {
+        left: 85px;
       }
     }
   }
@@ -308,6 +377,7 @@
   .continue-btn {
     background: $gray-bg;
     padding: 35px;
+    margin-top: 20px;
 
     .btn-action {
       height: 50px;
@@ -401,6 +471,26 @@
         }
       }
     }
+
+    .right-aside {
+      .summary {
+        &__aside {
+          .checkout-widget.checkout-widget_order-summary {
+            padding: 20px 0 0;
+          }
+        }
+
+        .checkout-widget {
+          &.checkout-widget_order-summary {
+            .checkout-widget__total {
+              font-weight: 400;
+              margin-left: -20px;
+              margin-right: -20px;
+            }
+          }
+        }
+      }
+    }
   }
 }
 
@@ -555,6 +645,24 @@
         }
       }
     }
+
+    .right-aside {
+      .summary {
+        .checkout-widget {
+          &.checkout-widget_order-summary {
+            .checkout-widget__total {
+              font-weight: 400;
+              margin-left: -30px;
+              margin-right: -30px;
+            }
+          }
+        }
+
+        .summary__basked-id {
+          margin-top: 13px;
+        }
+      }
+    }
   }
 }
 
@@ -674,6 +782,7 @@
 
     .continue-btn {
       margin: 0 -15px;
+      margin-top: 20px;
     }
 
     .billing-payment-block {