wickes-css2 2.94.0-develop.1 → 2.94.0-develop.12

package/src/page_personal-details-installer.html

@@ -1,13 +1,18 @@
-{{#extend "my-account-v2" dataBreadcrumbs=personal_details.installer.breadcrumbs pageClass="page_my-account_new" title="My Account DIY" pageMyAcc=true myAccV2=true isLoggedIn=true mainClass="personal-details"}}
+{{#extend "my-account-v2"
+  customIconUserClass=my_account.installer.icons.installer
+  dataBreadcrumbs=personal_details.installer.breadcrumbs
+  pageClass="page_my-account_new"
+  title="My Account Installer"
+  pageMyAcc=true
+  myAccV2=true
+  isLoggedIn=true
+  mainClass="personal-details"
+}}
 {{#content "head" mode="append"}}
 <link type="text/css" rel="stylesheet" href="./css/pages/page_personal-details.css">
 {{/content}}
 {{#content "notification"}}
-<div class="globalMessages container">
-  <div class="row">
-    <div class="col-12">
-    </div>
-  </div>
+<div class="globalMessages">
 </div>
 {{/content}}
 {{#content "main"}}
@@ -33,6 +38,7 @@
           details=personal_details.installer.currentData
       }}
       {{> my-account/personal-details-form
+          isInstaller=true
           fields=personal_details.installer.fields
           buttons=personal_details.buttons
       }}
@@ -43,9 +49,13 @@
 {{/content}}
 {{#content "foot" mode="append"}}
 {{> my-account/leave-modal
-personal_details.leave-popup
+personal_details.reset-popup
 id="leave-popup"
 }}
+{{> my-account/leave-modal
+personal_details.leave-popup
+id="change-password-popup"
+}}
 <script defer src="./js/my-account.min.js"></script>
 <script defer src="./js/personal-details.min.js"></script>
 {{/content}}

package/src/page_personal-details.html

@@ -1,13 +1,17 @@
-{{#extend "my-account-v2" dataBreadcrumbs=personal_details.diy.breadcrumbs pageClass="page_my-account_new" title="My Account DIY" pageMyAcc=true myAccV2=true isLoggedIn=true mainClass="personal-details"}}
+{{#extend "my-account-v2"
+  dataBreadcrumbs=personal_details.diy.breadcrumbs
+  pageClass="page_my-account_new"
+  title="My Account DIY"
+  pageMyAcc=true
+  myAccV2=true
+  isLoggedIn=true
+  mainClass="personal-details"
+}}
 {{#content "head" mode="append"}}
 <link type="text/css" rel="stylesheet" href="./css/pages/page_personal-details.css">
 {{/content}}
 {{#content "notification"}}
-<div class="globalMessages container">
-  <div class="row">
-    <div class="col-12">
-    </div>
-  </div>
+<div class="globalMessages">
 </div>
 {{/content}}
 {{#content "main"}}
@@ -43,9 +47,13 @@
 {{/content}}
 {{#content "foot" mode="append"}}
 {{> my-account/leave-modal
-    personal_details.leave-popup
+    personal_details.reset-popup
     id="leave-popup"
 }}
+{{> my-account/leave-modal
+    personal_details.leave-popup
+    id="change-password-popup"
+}}
 <script defer src="./js/my-account.min.js"></script>
 <script defer src="./js/personal-details.min.js"></script>
 {{/content}}

package/src/page_wismo-order-history-loadmore.html

@@ -1,4 +1,4 @@
-{{#extend "my-account" pageClass="wismo-hist" title="Wismo Order history" }}
+{{#extend "my-account" pageClass="wismo-hist" title="Wismo Order history" switch-vat=true}}
 {{#content "head" mode="append"}}
 <link type="text/css" rel="stylesheet" href="./css/pages/page_wismo-order-history.css">
 {{/content}}
@@ -12,7 +12,7 @@
 
     {{> form-row row-mod="sort-order-by" dropdown="true" label="Sort by" id="d1" placeholder="Date"}}
     {{#each page_wismo-order-history.orders }}
-      {{> table_wismo-history }}
+      {{> table_wismo-history switch-vat=true }}
     {{/each }}
     <div class="load-more-wrap" id="loadmorewrap">
       <button class="btn btn-primary load-more" id="loadmore">Load more</button>
@@ -21,4 +21,4 @@
       </div>
     </div>
   {{/content}}
-{{/extend}}
+{{/extend}}

package/src/scss/barclays-paypage-combined-minified.css

@@ -1 +1 @@
-#acsHeading,#cscHeading,#expiryMonthTooltipText,#messagePanel img,#paymentDetailsHeader,#paypageHeading,#submitHelp,.invisible,.logoImg{display:none}#messagePanel,#storeName,.logo{text-align:center}.bodyText,body{font-family:Roboto,Helvetica,Arial,sans-serif}#amexAcceptanceMarkLink,#jcbAcceptanceMarkLink,#mcAcceptanceMarkLink,#paypalAcceptanceMarkLink,#vbvAcceptanceMarkLink,.submitButton,a,a:hover,a:visited{text-decoration:none}#commands,#footer{margin-top:30px}@font-face{font-family:Roboto;src:url(../fonts/Roboto-Regular.woff2) format("woff2"),url(../fonts/Roboto-Regular.woff) format("woff");font-weight:400;font-style:normal}body{color:#626d75;font-size:100%;margin:0}a img,body{border:0}#requiredFieldsMessage1{font-size:12px}.dateDropDownLabel,.description{position:absolute;left:-10000px;top:auto;width:.063em;height:.063em;overflow:hidden}#cardEntryForm,.formSection,.formSection #cardNumber.formInput,.formSection #cardType.formInput,.formSection #cardholderName.formInput,.formSection #expiryYear.formInput,.submitButton{box-sizing:border-box;width:99vw}.formSection{width:97vw}.formSection #expiryYear.formInput{width:80px}.formSection.inputError .tooltip{display:block!important}.formSection.inputError .formInput{border-color:#cf000f}#cardEntryForm{margin:0 auto;width:100%;text-align:left}.logo{width:100%;margin:auto}.logoImg{width:12.563em;height:2.938em}#storeName{margin:2%;font-weight:700}#messagePanel{font-size:medium;font-weight:400;background-color:#c00;border:.125em solid #c00;padding:5px 2px;margin:5px;list-style:none;color:#fff}.inlineText{display:block;font-size:.75em;font-weight:400;width:100%;float:left}#errorIcon,.noJsErrorIcon{width:1em;height:1em}#errorIcon{margin-right:1em}.centered{margin:0 auto}#basketPanel,#billingAddressPanel,#customerAddressPanel,#paymentDetailsPanel,#paymentMethodPanel,#purchaseDetailsPanel,#shippingAddressPanel{padding-top:2%;margin-bottom:2%}.formInput{font-size:.875rem;line-height:1.57143;background:#fff;border:1px solid #ccc;border-radius:3px;color:#3e3e3e;padding:8px 16px;outline:0;height:40px;width:100%;box-shadow:none;-webkit-box-shadow:none;-moz-box-shadow:none;margin-bottom:5px}label.inputError{color:#800}input.inputError,select.inputError{background-color:#ffe3e3!important;color:#800;border:.1em solid #800}input.inputValid,select.inputValid{background-color:#dfffdf!important;color:#005f00;border:.1em solid #005f00}label.labelError{color:#d00!important}.bodyText{color:#626d75;font-size:medium;text-align:left}#cscBottomImage,#cscDialog,#dccEntryForm,#footer,#mainDccDiv,#payerAuthDialog,#progressText,#subHeaderText,.basketItemQty,.basketQtyHeader,.bodyStyle,.cancelButton,.noJsContinueButton,.progressSpinner,.quantityCol,.wait,div#purchaseDetailsAmount,span#amount,tbody tr td{text-align:center}#purchaseDetailsHeader{padding-top:.5%}#addressLabel,#amountLabel,#goodsLabel,#postCodeLabel,.basketItemFooter,.basketItemPriceFooter{display:inline-block}#address,#amount,#goods,#postCode{width:48%;display:inline-block}#cardType,#cscDialogContent{width:95%}#expiryMonth,#expiryYear,#startMonth,#startYear{width:70px;padding:8px}#expiryYear,#startYear{margin-left:2px}#expiryMonth,#startMonth{margin-right:2px}#expiryYearLabel{font-size:0;position:static}#cardType::-ms-expand,#expiryMonth::-ms-expand,#expiryYear::-ms-expand{display:none}#expiryYearLabel:after{font-size:16px;content:"/"}#issue{width:15%}#ifAvailable{font-style:italic;font-weight:400;font-size:medium;margin-left:.625em}#confirmCsc,#csc{box-sizing:border-box}#cscSection:after{content:"";width:38%;height:51px;display:block;position:absolute;bottom:-15px;right:125px}#dccSubmit,#newCardLink{float:right}.linkText{font-family:Roboto,Helvetica,Arial,sans-serif!important;font-size:medium;font-weight:700;margin:1% 2% 1% 8%;padding:1.5% 5%;border:thin solid #626d75;background-color:#eee!important;background-image:linear-gradient(bottom,#f5a30d,#ffd786 82%)!important;background-image:-ms-linear-gradient(bottom,#f5a30d 0,#ffd786 82%)!important;background-image:-webkit-gradient(linear,left bottom,left top,color-stop(0,#f5a30d),color-stop(.82,#ffd786))!important;color:#036!important;border-radius:.313em;-moz-border-radius:.313em;-webkit-border-radius:.313em;box-shadow:.188em .188em .188em #ccc;-moz-box-shadow:.188em .188em .188em #ccc;-webkit-box-shadow:.188em .188em .188em #ccc}#cardHolderText,#merchantText,#progressText,.cancelButton,.formLabel,.submitButton{font-family:Roboto,Helvetica,Arial,sans-serif}.cancelButton,legend{color:#000;font-weight:700}a,a:hover,a:visited{color:#626d75!important}#closeCSCLink{display:block;padding:2%;margin:1% 2% 1% 1%}#cscDialog{display:none;margin:0;position:fixed;top:25%;width:95%;z-index:6000}#cscDialogContent,#payerAuthDialogContent{box-shadow:.313em .313em .313em #ccc;-moz-box-shadow:.313em .313em .313em #ccc;-webkit-box-shadow:.313em .313em .313em #ccc;display:block;margin:0 auto;background:#fff;border:.063em solid #636b70;text-align:center}#addressPanel,#amexAcceptanceMark,#btnCancel,#cardNumberHelpPanel,#cscDescLink .linkText,#cscRightImage,#footer,#paymentDetailsLegend,#paymentDetailsTitle,#ppLogo,#purchaseDetailsGoods,#purchaseDetailsHeader,#purchaseDetailsPanel,#shippingAddressPanel,#storeName,#visaCheckoutPaymentDetailsPanel,#visaCheckoutPaymentSummaryPanel,.basketPriceHeader,.closeDialogIcon,.labelHelpImg,.priceCol,.tooltipBottom{display:none}#cscDialogTitle{margin:.75em 0 .563em .6em}#cscDialogTitle,.dialogTitle{display:block;font-weight:700}.dialogTitle{margin-bottom:1.15em}#cscDescriptionBody{height:10.938em;width:100%}#cscText{width:100%;text-align:left}#cscBottomImage{height:6em;width:100%;margin:.625em 0 .5em}.cancelButton{width:30%;float:left;background:#9fc2c1;border:1px solid #8daf9c;font-size:16px;padding:3%;border-radius:6px;display:none}#footer,#payerAuthDialog{width:100%}#payerAuthDialog{display:block;margin:0 auto;position:absolute;top:6.25em}#payerAuthDialogContent{width:25em;height:31.25em}#payerAuthIframe{width:100%;border:0;padding:0;height:30em}.bodyStyle{display:block;margin:4%;width:90%}.noJsReturnPanel{display:block;margin-top:.938em;border:thin solid #d00;padding:.625em .625em .625em 2.5em;color:#cc292b;font-size:medium}.noJsContinueButton{display:block;margin:0 auto;padding:.313em}.wait{top:50%;left:50%;margin-top:-7em;margin-left:-7em;z-index:6000;overflow:auto;border:.063em solid #636b70;width:14.5em;height:4em;background-color:#fff;padding-top:1em}#overlay,.wait{display:none;position:absolute}#overlay{opacity:.4;top:0;left:0;background-color:#dcdcdc;width:100%;z-index:5000}.opaque{opacity:.4;zoom:1}tbody tr td{margin:0 auto;height:auto!important;background:#fff}#progressSpinnerImage{margin:0 auto .6em;width:2em;height:2em;display:block}#progressText{color:#e4141d;font-size:medium}#mainDccDiv{width:95%;margin-left:auto;margin-right:auto}#subHeaderText{font-size:medium;font-weight:700;margin-bottom:2%}#dccEntryForm{margin:0 auto}#selectionPanel,.errorText{text-align:left}#cardHolderText,#merchantText{color:#626d75;margin-top:3%;font-size:large;font-weight:700}#dccCommands{margin:2% auto 0}#dccCancel,#dccSubmit{font-size:medium}#dccCancel{float:left}#basketTable{width:100%}.basketHeader{font-weight:700;font-size:.625em;padding-left:.625em}.basketFooter,.basketSubTotalHeader,.subTotalCol{text-align:right}.basketFooter{font-weight:700;width:100%}.basketItemFooter{padding-right:1em;width:80%}.billingAddress,.shippingAddress{display:block;padding-left:.625em;text-align:left;clear:left}#paymentMethodHeader{padding-top:.313em}button{width:auto;overflow:visible}.paymentMethodCARD,.paymentMethodGIRO_PAY,.paymentMethodIDEAL,.paymentMethodMASTER_PASS,.paymentMethodMISTER_CASH,.paymentMethodPAY_PAL,.paymentMethodSOFORT{display:block;margin:.625em}.paymentMethodCARD{width:12.125em;border:.063em solid #ccc;border-radius:.625em}.paymentMethodPAY_PAL{width:12.188em}.paymentMethodMASTER_PASS{width:9.063em}.paymentMethodIDEAL{width:2.313em}.paymentMethodGIRO_PAY{width:4.5em}.paymentMethodSOFORT{width:6.25em}.paymentMethodMISTER_CASH{width:3.313em}.paymentMethodOption{display:inline-block;vertical-align:middle!important;height:2.125em;font-size:0;position:absolute;left:-9000px}#cardNumberSection,#commands,#cscMessagePanel,#cscSection,#expiryDateMessagePanel,#expirySection,.tooltipText{position:relative}legend{display:block;text-align:left;border-style:none}fieldset{display:block;border:0;background-color:transparent;padding-top:1%;padding-bottom:2%}#confirmCheck1,#confirmCheck2{float:left;margin:1% 0 1% 2%}#confirmCheck1LabelPanel,#confirmCheck2LabelPanel{display:inline-block;width:82%;font-weight:400}#checkBoxSection,#checkBoxSection2{margin-top:.5em}.basketItemImage{width:2.5em;height:2.5em;float:left;margin-right:.5em}#amexAcceptanceMarkImg,#jcbAcceptanceMarkImg,#mcAcceptanceMarkImg,#paypalAcceptanceMarkImg,#vbvAcceptanceMarkImg{height:2em!important;display:inline-block!important;overflow:hidden}#vbvAcceptanceMarkImg{width:3.55em!important}#mcAcceptanceMarkImg{width:4.35em!important}#amexAcceptanceMarkImg,#jcbAcceptanceMarkImg{width:4.4em!important}#paypalAcceptanceMarkImg{width:3.125em!important}.cardType{display:block!important;background-repeat:no-repeat;padding:.125em}#confirmCardLabel{display:block!important;font-size:.75em;font-weight:700}#confirmCardExpiryLabel{display:block!important;font-size:.6em;font-style:italic}#cscImage{width:16em}span#amountLabel{font-size:20px;color:#616161}span#amount{font-size:18px}#confirmCheck2Label:after{content:"";width:15px;height:15px;position:relative;top:1px;margin-left:5px;display:inline-block;background-image:url(../lock.png);background-size:contain;background-repeat:no-repeat}input,textarea{-webkit-appearance:none;-webkit-border-radius:0}.formLabel{text-align:left;display:block;margin:20px 0 5px;color:#3e3e3e;font-size:16px;font-weight:700;letter-spacing:0;line-height:22px}#messagePanel,.tooltip{display:none!important}.formLabelDescr{font-size:12px;line-height:20px;font-weight:500}#cardNumberHelpPanel:before{content:"*";display:block}input[type=radio]{margin:1em .25em}input.inputError{background-color:#fff!important;border-color:#c00;color:#c00}.tooltip{padding:0}.tooltipText{width:100%;min-height:1px;color:#cf000f;margin-top:8px;font-size:14px;letter-spacing:0;line-height:22px}#cscDescLink{display:none;background-image:url(../images/hybrid_cvv.png);width:37px;height:25px;background-size:cover;margin:-39px 0 15px 100px}.submitButton{float:none;box-shadow:none;display:inline-block;cursor:pointer;background-color:#0277bd;color:#fff;font-weight:500;text-align:center;white-space:nowrap;vertical-align:middle;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none;border:1px solid transparent;padding:8px 0;width:100%;font-size:16px;line-height:24px;border-radius:3px;transition:none;height:40px}#commands{width:100%}#commands:before{height:32px;width:33px;box-sizing:border-box}#paymentDetailsPanel #paymentDetailsFieldset{padding:0;margin:0}#cscSection,#expirySection{display:inline-block;vertical-align:top}#expirySection{width:150px;white-space:nowrap;margin-right:16px}#cscSection{width:100px;order:5}#paymentDetailsPanel{display:flex;width:100%;flex-flow:wrap}#cardNumber,#cardholderName{width:99vw;box-sizing:border-box}#expiryDateMessagePanel{display:block;margin-top:5px;margin-left:0;order:6;width:300px}.formInputForError{font-size:.875rem;line-height:1.57143;background:#fff;border:1px solid red;border-radius:3px;color:#3e3e3e;padding:8px 16px;outline:0;height:40px;box-shadow:none;margin-bottom:5px;width:90%}#cscMessagePanel{white-space:normal;width:300px;right:165px}#errorIconDiv{display:flex;align-items:center;justify-content:center}.inlineErrorIcon{width:15px;height:auto}.errorMessagePanel{gap:3px}#cardNumberSection,#cardholderNameSection{display:block;width:100%}@media (min-width:490px){@font-face{font-weight:500}.formInput{touch-action:none}.formInput.visa{background:url(../images/icons/visa-icon.png) 99% no-repeat #fff}.formInput.mastercard{background:url(../images/icons/mastercard-icon.png) 99% no-repeat #fff}.formInput.amex{background:url(../images/icons/amex-icon.png) 99% no-repeat #fff}.formInput.jcb{background:url(../images/icons/jcb-icon.png) 99% no-repeat #fff}.formInput.dinersclub{background:url(../images/icons/dinersclub-icon.png) 99% no-repeat #fff}.formInput.maestro{background:url(../images/icons/maestro-icon.png) 99% no-repeat #fff}#expiryMonth,#expiryYear,#startMonth,#startYear{width:80px}#expirySection{width:200px}#cscSection{width:110px}#cscSection label{white-space:nowrap}#cardNumberSection{order:-1}#cardTypeSection{order:-2}#expiryDateMessagePanel{width:70%}.formInputForError{box-sizing:border-box}#cscMessagePanel{width:425px;right:216px}}@media (max-width:489px){#paymentDetailsTitle{display:none}#cardNumberSection{order:-1}#cardTypeSection{order:-2}.hidden{margin:0}#commands{margin-top:0}#errorIconDiv:has(#cscErrorIcon){display:flex;align-items:flex-start;position:relative;top:3px}}
+#acsHeading,#cscHeading,#expiryMonthTooltipText,#messagePanel img,#paymentDetailsHeader,#paypageHeading,#submitHelp,.invisible,.logoImg{display:none}#messagePanel,#storeName,.logo{text-align:center}.bodyText,body{font-family:Roboto,Helvetica,Arial,sans-serif}#amexAcceptanceMarkLink,#jcbAcceptanceMarkLink,#mcAcceptanceMarkLink,#paypalAcceptanceMarkLink,#vbvAcceptanceMarkLink,.submitButton,a,a:hover,a:visited{text-decoration:none}#commands,#footer{margin-top:30px}@font-face{font-family:Roboto;src:url(../fonts/Roboto-Regular.woff2) format("woff2"),url(../fonts/Roboto-Regular.woff) format("woff");font-weight:400;font-style:normal}body{color:#626d75;font-size:100%;margin:0}a img,body{border:0}#requiredFieldsMessage1{font-size:12px}.dateDropDownLabel,.description{position:absolute;left:-10000px;top:auto;width:.063em;height:.063em;overflow:hidden}#cardEntryForm,.formSection,.formSection #cardNumber.formInput,.formSection #cardType.formInput,.formSection #cardholderName.formInput,.formSection #expiryYear.formInput,.submitButton{box-sizing:border-box;width:99vw}.formSection{width:97vw}.formSection #expiryYear.formInput{width:80px}.formSection.inputError .tooltip{display:block!important}.formSection.inputError .formInput{border-color:#cf000f}#cardEntryForm{margin:0 auto;width:100%;text-align:left}.logo{width:100%;margin:auto}.logoImg{width:12.563em;height:2.938em}#storeName{margin:2%;font-weight:700}#messagePanel{font-size:medium;font-weight:400;background-color:#c00;border:.125em solid #c00;padding:5px 2px;margin:5px;list-style:none;color:#fff}.inlineText{display:block;font-size:.75em;font-weight:400;width:100%;float:left}#errorIcon,.noJsErrorIcon{width:1em;height:1em}#errorIcon{margin-right:1em}.centered{margin:0 auto}#basketPanel,#billingAddressPanel,#customerAddressPanel,#paymentDetailsPanel,#paymentMethodPanel,#purchaseDetailsPanel,#shippingAddressPanel{padding-top:2%;margin-bottom:2%}.formInput{font-size:.875rem;line-height:1.57143;background:#fff;border:1px solid #ccc;border-radius:3px;color:#3e3e3e;padding:8px 16px;outline:0;height:40px;width:100%;box-shadow:none;-webkit-box-shadow:none;-moz-box-shadow:none;margin-bottom:5px}label.inputError{color:#800}input.inputError,select.inputError{background-color:#ffe3e3!important;color:#800;border:.1em solid #800}input.inputValid,select.inputValid{background-color:#dfffdf!important;color:#005f00;border:.1em solid #005f00}label.labelError{color:#d00!important}.bodyText{color:#626d75;font-size:medium;text-align:left}#cscBottomImage,#cscDialog,#dccEntryForm,#footer,#mainDccDiv,#payerAuthDialog,#progressText,#subHeaderText,.basketItemQty,.basketQtyHeader,.bodyStyle,.cancelButton,.noJsContinueButton,.progressSpinner,.quantityCol,.wait,div#purchaseDetailsAmount,span#amount,tbody tr td{text-align:center}#purchaseDetailsHeader{padding-top:.5%}#addressLabel,#amountLabel,#goodsLabel,#postCodeLabel,.basketItemFooter,.basketItemPriceFooter{display:inline-block}#address,#amount,#goods,#postCode{width:48%;display:inline-block}#cardType,#cscDialogContent{width:95%}#expiryMonth,#expiryYear,#startMonth,#startYear{width:80px;padding:8px}#expiryYear,#startYear{margin-left:2px}#expiryMonth,#startMonth{margin-right:2px}#expiryYearLabel{font-size:0;position:static}#cardType::-ms-expand,#expiryMonth::-ms-expand,#expiryYear::-ms-expand{display:none}#expiryYearLabel:after{font-size:16px;content:"/"}#issue{width:15%}#ifAvailable{font-style:italic;font-weight:400;font-size:medium;margin-left:.625em}#confirmCsc,#csc{box-sizing:border-box}#dccSubmit,#newCardLink{float:right}.linkText{font-family:Roboto,Helvetica,Arial,sans-serif!important;font-size:medium;font-weight:700;margin:1% 2% 1% 8%;padding:1.5% 5%;border:thin solid #626d75;background-color:#eee!important;background-image:linear-gradient(bottom,#f5a30d,#ffd786 82%)!important;background-image:-ms-linear-gradient(bottom,#f5a30d 0,#ffd786 82%)!important;background-image:-webkit-gradient(linear,left bottom,left top,color-stop(0,#f5a30d),color-stop(.82,#ffd786))!important;color:#036!important;border-radius:.313em;-moz-border-radius:.313em;-webkit-border-radius:.313em;box-shadow:.188em .188em .188em #ccc;-moz-box-shadow:.188em .188em .188em #ccc;-webkit-box-shadow:.188em .188em .188em #ccc}#cardHolderText,#merchantText,#progressText,.cancelButton,.formLabel,.submitButton{font-family:Roboto,Helvetica,Arial,sans-serif}.cancelButton,legend{color:#000;font-weight:700}a,a:hover,a:visited{color:#626d75!important}#closeCSCLink{display:block;padding:2%;margin:1% 2% 1% 1%}#cscDialog{display:none;margin:0;position:fixed;top:25%;width:95%;z-index:6000}#cscDialogContent,#payerAuthDialogContent{box-shadow:.313em .313em .313em #ccc;-moz-box-shadow:.313em .313em .313em #ccc;-webkit-box-shadow:.313em .313em .313em #ccc;display:block;margin:0 auto;background:#fff;border:.063em solid #636b70;text-align:center}#addressPanel,#amexAcceptanceMark,#btnCancel,#cardNumberHelpPanel,#cscDescLink .linkText,#cscRightImage,#footer,#paymentDetailsLegend,#paymentDetailsTitle,#ppLogo,#purchaseDetailsGoods,#purchaseDetailsHeader,#purchaseDetailsPanel,#shippingAddressPanel,#storeName,#visaCheckoutPaymentDetailsPanel,#visaCheckoutPaymentSummaryPanel,.basketPriceHeader,.closeDialogIcon,.labelHelpImg,.priceCol,.tooltipBottom{display:none}#cscDialogTitle{margin:.75em 0 .563em .6em}#cscDialogTitle,.dialogTitle{display:block;font-weight:700}.dialogTitle{margin-bottom:1.15em}#cscDescriptionBody{height:10.938em;width:100%}#cscText{width:100%;text-align:left}#cscBottomImage{height:6em;width:100%;margin:.625em 0 .5em}.cancelButton{width:30%;float:left;background:#9fc2c1;border:1px solid #8daf9c;font-size:16px;padding:3%;border-radius:6px;display:none}#footer,#payerAuthDialog{width:100%}#payerAuthDialog{display:block;margin:0 auto;position:absolute;top:6.25em}#payerAuthDialogContent{width:25em;height:31.25em}#payerAuthIframe{width:100%;border:0;padding:0;height:30em}.bodyStyle{display:block;margin:4%;width:90%}.noJsReturnPanel{display:block;margin-top:.938em;border:thin solid #d00;padding:.625em .625em .625em 2.5em;color:#cc292b;font-size:medium}.noJsContinueButton{display:block;margin:0 auto;padding:.313em}.wait{top:50%;left:50%;margin-top:-7em;margin-left:-7em;z-index:6000;overflow:auto;border:.063em solid #636b70;width:14.5em;height:4em;background-color:#fff;padding-top:1em}#overlay,.wait{display:none;position:absolute}#overlay{opacity:.4;top:0;left:0;background-color:#dcdcdc;width:100%;z-index:5000}.opaque{opacity:.4;zoom:1}tbody tr td{margin:0 auto;height:auto!important;background:#fff}#progressSpinnerImage{margin:0 auto .6em;width:2em;height:2em;display:block}#progressText{color:#e4141d;font-size:medium}#mainDccDiv{width:95%;margin-left:auto;margin-right:auto}#subHeaderText{font-size:medium;font-weight:700;margin-bottom:2%}#dccEntryForm{margin:0 auto}#selectionPanel,.errorText{text-align:left}#cardHolderText,#merchantText{color:#626d75;margin-top:3%;font-size:large;font-weight:700}#dccCommands{margin:2% auto 0}#dccCancel,#dccSubmit{font-size:medium}#dccCancel{float:left}#basketTable{width:100%}.basketHeader{font-weight:700;font-size:.625em;padding-left:.625em}.basketFooter,.basketSubTotalHeader,.subTotalCol{text-align:right}.basketFooter{font-weight:700;width:100%}.basketItemFooter{padding-right:1em;width:80%}.billingAddress,.shippingAddress{display:block;padding-left:.625em;text-align:left;clear:left}#paymentMethodHeader{padding-top:.313em}button{width:auto;overflow:visible}.paymentMethodCARD,.paymentMethodGIRO_PAY,.paymentMethodIDEAL,.paymentMethodMASTER_PASS,.paymentMethodMISTER_CASH,.paymentMethodPAY_PAL,.paymentMethodSOFORT{display:block;margin:.625em}.paymentMethodCARD{width:12.125em;border:.063em solid #ccc;border-radius:.625em}.paymentMethodPAY_PAL{width:12.188em}.paymentMethodMASTER_PASS{width:9.063em}.paymentMethodIDEAL{width:2.313em}.paymentMethodGIRO_PAY{width:4.5em}.paymentMethodSOFORT{width:6.25em}.paymentMethodMISTER_CASH{width:3.313em}.paymentMethodOption{display:inline-block;vertical-align:middle!important;height:2.125em;font-size:0;position:absolute;left:-9000px}#cardNumberSection,#commands,#cscMessagePanel,#cscSection,#expiryDateMessagePanel,#expirySection,.tooltipText{position:relative}legend{display:block;text-align:left;border-style:none}fieldset{display:block;border:0;background-color:transparent;padding-top:1%;padding-bottom:2%}#confirmCheck1,#confirmCheck2{float:left;margin:1% 0 1% 2%}#confirmCheck1LabelPanel,#confirmCheck2LabelPanel{display:inline-block;width:82%;font-weight:400}#checkBoxSection,#checkBoxSection2{margin-top:.5em}.basketItemImage{width:2.5em;height:2.5em;float:left;margin-right:.5em}#amexAcceptanceMarkImg,#jcbAcceptanceMarkImg,#mcAcceptanceMarkImg,#paypalAcceptanceMarkImg,#vbvAcceptanceMarkImg{height:2em!important;display:inline-block!important;overflow:hidden}#vbvAcceptanceMarkImg{width:3.55em!important}#mcAcceptanceMarkImg{width:4.35em!important}#amexAcceptanceMarkImg,#jcbAcceptanceMarkImg{width:4.4em!important}#paypalAcceptanceMarkImg{width:3.125em!important}.cardType{display:block!important;background-repeat:no-repeat;padding:.125em}#confirmCardLabel{display:block!important;font-size:.75em;font-weight:700}#confirmCardExpiryLabel{display:block!important;font-size:.6em;font-style:italic}#cscImage{width:16em}span#amountLabel{font-size:20px;color:#616161}span#amount{font-size:18px}#confirmCheck2Label:after{content:"";width:15px;height:15px;position:relative;top:1px;margin-left:5px;display:inline-block;background-image:url(../lock.png);background-size:contain;background-repeat:no-repeat}input,textarea{-webkit-appearance:none;-webkit-border-radius:0}.formLabel{text-align:left;display:block;margin:20px 0 5px;color:#3e3e3e;font-size:16px;font-weight:700;letter-spacing:0;line-height:22px}#messagePanel,.tooltip{display:none!important}.formLabelDescr{font-size:12px;line-height:20px;font-weight:500}#cardNumberHelpPanel:before{content:"*";display:block}input[type=radio]{margin:1em .25em}input.inputError{background-color:#fff!important;border-color:#c00;color:#c00}.tooltip{padding:0}.tooltipText{width:100%;min-height:1px;color:#cf000f;margin-top:8px;font-size:14px;letter-spacing:0;line-height:22px}#cscDescLink{display:none;background-image:url(../images/hybrid_cvv.png);width:37px;height:25px;background-size:cover;margin:-39px 0 15px 100px}.submitButton{float:none;box-shadow:none;display:inline-block;cursor:pointer;background-color:#0277bd;color:#fff;font-weight:500;text-align:center;white-space:nowrap;vertical-align:middle;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none;border:1px solid transparent;padding:8px 0;width:100%;font-size:16px;line-height:24px;border-radius:3px;transition:none;height:40px}#commands{width:100%}#commands:before{height:32px;width:33px;box-sizing:border-box}#paymentDetailsPanel #paymentDetailsFieldset{padding:0;margin:0}#cscSection,#expirySection{display:inline-block;vertical-align:top}#expirySection{width:170px;white-space:nowrap;margin-right:16px}#cscSection{width:112px;order:5}#paymentDetailsPanel{display:flex;width:100%;flex-flow:wrap}#cardNumber,#cardholderName{width:99vw;box-sizing:border-box}#expiryDateMessagePanel{display:block;margin-top:5px;margin-left:0;order:6;width:300px}.formInputForError{font-size:.875rem;line-height:1.57143;background:#fff;border:1px solid red;border-radius:3px;color:#3e3e3e;padding:8px 16px;outline:0;height:40px;box-shadow:none;margin-bottom:5px;width:80%}#cscMessagePanel{white-space:normal;width:max-content;max-width:100vw;right:186px}#errorIconDiv{display:flex;align-items:center;justify-content:center}.inlineErrorIcon{width:15px;height:auto}.errorMessagePanel{gap:3px}#cardNumberSection,#cardholderNameSection{display:block;width:100%}@media (min-width:490px){@font-face{font-weight:500}.formInput{touch-action:none}.formInput.visa{background:url(../images/icons/visa-icon.png) 99% no-repeat #fff}.formInput.mastercard{background:url(../images/icons/mastercard-icon.png) 99% no-repeat #fff}.formInput.amex{background:url(../images/icons/amex-icon.png) 99% no-repeat #fff}.formInput.jcb{background:url(../images/icons/jcb-icon.png) 99% no-repeat #fff}.formInput.dinersclub{background:url(../images/icons/dinersclub-icon.png) 99% no-repeat #fff}.formInput.maestro{background:url(../images/icons/maestro-icon.png) 99% no-repeat #fff}#expiryMonth,#expiryYear,#startMonth,#startYear{width:80px}#expirySection{width:200px}#cscSection{width:110px}#cscSection label{white-space:nowrap}#cardNumberSection{order:-1}#cardTypeSection{order:-2}#expiryDateMessagePanel{width:100%}.formInputForError{box-sizing:border-box}#cscMessagePanel{right:216px}}@media (max-width:489px){#paymentDetailsTitle{display:none}#cardNumberSection{order:-1}#cardTypeSection{order:-2}.hidden{margin:0}#commands{margin-top:0}#errorIconDiv,#errorIconDiv:has(#cscErrorIcon){display:flex;align-items:flex-start;position:relative;top:3px}.submitButton{margin-top:20px}}@media (max-width:265px){#cscMessagePanel{right:0}#expiryDateMessagePanel{order:5}}

package/src/scss/barclays-paypage-combined.css

@@ -200,7 +200,7 @@ label.labelError {
 }
 
 #expiryMonth, #expiryYear, #startMonth, #startYear {
-  width: 70px;
+  width: 80px;
   padding: 8px;
 }
 
@@ -254,16 +254,6 @@ label.labelError {
   position: relative;
 }
 
-#cscSection:after {
-  content: "";
-  width: 38%;
-  height: 51px;
-  display: block;
-  position: absolute;
-  bottom: -15px;
-  right: 125px;
-}
-
 #newCardLink {
   float: right;
 }
@@ -891,13 +881,13 @@ input.inputError {
 }
 
 #expirySection {
-  width: 150px;
+  width: 170px;
   white-space: nowrap;
   margin-right: 16px
 }
 
 #cscSection {
-  width: 100px
+  width: 112px
 }
 
 #paymentDetailsPanel {
@@ -937,7 +927,7 @@ input.inputError {
   height: 40px;
   box-shadow: none;
   margin-bottom: 5px;
-  width: 90%;
+  width: 80%;
 }
 
 #cscSection {
@@ -949,7 +939,7 @@ input.inputError {
   white-space: normal;
   width: max-content;
   max-width: 100vw;
-  right: 166px;
+  right: 186px;
   position: relative;
 }
 
@@ -1079,6 +1069,10 @@ input.inputError {
     position: relative;
     top: 3px;
   }
+  
+  .submitButton {
+    margin-top: 20px;
+  }
 }
 
 @media (max-width: 265px) {

package/src/scss/components/_big-wins-critical.scss

@@ -249,7 +249,6 @@
       margin-bottom: 15px;
 
       .store {
-        &__act,
         &__count {
           display: none;
         }

package/src/scss/components/_big-wins.scss

@@ -536,7 +536,6 @@
       margin-bottom: 15px;
 
       .store {
-        &__act,
         &__count {
           display: none;
         }
@@ -638,12 +637,6 @@
 
     .stock__store {
       padding-bottom: 40px;
-
-      .store__act {
-        padding-top: 7px;
-        position: absolute;
-        color: $blue;
-      }
     }
 
     .stock__tabs {
@@ -881,7 +874,7 @@
     }
 
     &_cell {
-      border: 2px solid $gray-light;
+      border: 1px solid $gray-light;
 
       &:nth-child(2n+1) {
         padding-left: 20px;

package/src/scss/components/_order-item-cc.scss

@@ -98,12 +98,6 @@
     }
   }
 
-  & .store {
-    &__act {
-      display: none;
-    }
-  }
-
   &__store-info {
     @include make-col(12);
     margin-top: 15px;

package/src/scss/components/checkout-payment-details-v2.scss

@@ -286,7 +286,7 @@
   .checkout-payment-details-v2 {
     .checkout-payment-details {
       .hop-iframe__wrapper {
-        height: 560px;
+        height: 710px;
       }
     }
   }
@@ -296,7 +296,7 @@
   .checkout-payment-details-v2 {
     .checkout-payment-details {
       .hop-iframe__wrapper {
-        height: 560px;
+        height: 555px;
       }
     }
   }

package/src/scss/components/my-account/_active-orders.scss

@@ -0,0 +1,263 @@
+@import '../../helpers/helpers';
+
+.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;
+  }
+
+  .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;
+    }
+  }
+}
+
+.order {
+  &-header {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    padding: 0;
+
+    &__title {
+      margin-bottom: 0;
+      font-size: 1.125rem;
+      line-height: 1.5rem;
+    }
+  }
+
+  &-status {
+    background: rgba(2, 119, 189, .1);
+    padding: 2px 8px;
+    border-radius: 50px;
+    font-weight: 500;
+    display: flex;
+    align-items: center;
+
+    .icon {
+      font-size: 1rem;
+      height: auto;
+      color: $blue;
+      margin-right: 8px;
+    }
+
+    &.completed {
+      background: rgba(103, 165, 9, .1);
+
+      .icon {
+        color: $green;
+      }
+    }
+
+    &.cancelled {
+      background: rgba(207, 0, 15, .1);
+
+      .icon {
+        color: $red;
+      }
+    }
+  }
+
+  &-details {
+    margin-top: 8px;
+
+    &__summary {
+      display: flex;
+      align-items: baseline;
+    }
+
+    &__price {
+      margin-bottom: 0;
+      font-weight: 700;
+      font-size: 1.125rem;
+      line-height: 1.5rem;
+      color: $blue-dark;
+    }
+
+    &__vat {
+      margin-left: 5px;
+      line-height: 1rem;
+    }
+
+    &__count {
+      position: relative;
+      padding-left: 8px;
+      margin-left: 8px;
+      font-weight: 400;
+      font-size: .875rem;
+      line-height: 1.375rem;
+      color: $gray-dark;
+
+      &::before {
+        content: '';
+        height: 100%;
+        position: absolute;
+        max-height: 16px;
+        left: 0;
+        top: 50%;
+        width: 1px;
+        background: $gray;
+        transform: translateY(-50%);
+      }
+    }
+
+    &__date {
+      display: block;
+      margin-top: 4px;
+      font-weight: 400;
+      font-size: .875rem;
+      line-height: 1.375rem;
+      color: $gray-dark;
+    }
+  }
+}
+
+@include media-breakpoint-up(sm) {
+  .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;
+        }
+      }
+    }
+  }
+
+  .order-details {
+    grid-area: orderDetails;
+    display: flex;
+    align-items: baseline;
+
+    &__date {
+      margin-left: 8px;
+      padding-left: 8px;
+      margin-top: 0;
+      position: relative;
+
+      &::before {
+        content: '';
+        height: 100%;
+        position: absolute;
+        max-height: 16px;
+        left: 0;
+        top: 50%;
+        width: 1px;
+        background: $gray;
+        transform: translateY(-50%);
+      }
+    }
+  }
+}
+
+@include media-breakpoint-up(md) {
+  .active-orders__title {
+    font-size: 1.5rem;
+  }
+}
+
+@include media-breakpoint-up(lg) {
+  .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/components/my-account/_orders-nav.scss

@@ -0,0 +1,61 @@
+.nav-orders {
+  margin-top: 24px;
+
+  .account-nav {
+    padding: 0;
+
+    .accordion__header-text {
+      color: $blue;
+    }
+
+    .accordion__header-text,
+    .account-nav__link {
+      font-size: 14px;
+      font-weight: 500;
+      line-height: 22px;
+    }
+  }
+
+  &__wrap {
+    list-style-type: none;
+    padding: 0;
+    margin-bottom: 0;
+    display: flex;
+    align-items: center;
+    border-bottom: 2px solid $gray;
+
+    .link {
+      text-decoration: none;
+      font-size: 14px;
+      font-weight: 500;
+      line-height: 22px;
+      color: $gray-dark;
+      transition: all .3s;
+
+      &:hover {
+        color: $blue;
+      }
+    }
+  }
+
+  &__item {
+    padding: 7px 12px;
+    position: relative;
+
+    &.active {
+      .link {
+        color: $blue;
+        pointer-events: none;
+      }
+
+      &::after {
+        content: '';
+        border-bottom: 2px solid $blue;
+        position: absolute;
+        bottom: -2px;
+        left: 0;
+        width: 100%;
+      }
+    }
+  }
+}

package/src/scss/components/my-account/_shipment.scss

@@ -53,6 +53,7 @@
       font-size: .75rem;
       line-height: 1rem;
       color: $blue;
+      max-width: max-content;
 
       &:hover {
         text-decoration: underline;

package/src/scss/helpers/_variables.scss

@@ -24,6 +24,7 @@ $gray-whiter: #f1f1f1;
 $gray-bg: #f8f8f8;        // Menu background colour
 $gray-gradient: #e0e0e0;  // tabs gradient gray
 $gray-quill: #cececd;
+$gray-wait: #9d9d9c;
 $gray-dim: #656565;
 $gray-matt: #515151;
 $squant: #666666;