wickes-css2 2.98.0-billie.4 → 2.98.0-develop.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (138) hide show
  1. package/Readme.md +1 -1
  2. package/build/css/category-main.css +1 -1
  3. package/build/css/components/checkout-payment-details-v2.css +1 -1
  4. package/build/css/components/global-search.css +1 -1
  5. package/build/css/components/loader.css +1 -1
  6. package/build/css/emulation.css +1 -1
  7. package/build/css/homepage-main.css +1 -1
  8. package/build/css/main.css +1 -1
  9. package/build/css/my-account-main-v2.css +1 -1
  10. package/build/css/my-account-main.css +1 -1
  11. package/build/css/pages/checkout-new.css +1 -1
  12. package/build/css/pages/my-account-v2.css +1 -1
  13. package/build/css/pages/page_address-book.css +1 -1
  14. package/build/css/pages/page_change-password.css +1 -1
  15. package/build/css/pages/page_default-store.css +1 -1
  16. package/build/css/pages/page_discount.css +1 -0
  17. package/build/css/pages/page_home.css +1 -1
  18. package/build/css/pages/page_my-orders.css +1 -1
  19. package/build/css/pages/page_personal-details.css +1 -1
  20. package/build/css/pages/page_products-list-combined.css +1 -1
  21. package/build/css/pages/page_products-list.css +1 -1
  22. package/build/css/pdp-main-before-combine.css +1 -1
  23. package/build/css/pdp-main-critical.css +1 -1
  24. package/build/css/pdp-main-non-critical.css +1 -1
  25. package/build/css/pdp-main.css +1 -1
  26. package/build/css/plp-main.css +1 -1
  27. package/build/css/store-locator-main.css +1 -1
  28. package/build/img/apps/app-lg.png +0 -0
  29. package/build/img/apps/app-md.png +0 -0
  30. package/build/js/basket.min.js +2 -2
  31. package/build/js/bundle.min.js +1 -1
  32. package/build/js/checkout.min.js +1 -1
  33. package/build/js/default-store.min.js +1 -1
  34. package/build/js/emulation.min.js +11 -23
  35. package/build/js/general.bundle.min.js +1 -1
  36. package/build/js/merged-checkout.min.js +1 -1
  37. package/build/js/my-account.min.js +1 -1
  38. package/build/js/page/basket-v2.js +1 -2
  39. package/build/js/page/checkout-payment-details.js +0 -8
  40. package/build/js/page/default-store.js +1 -4
  41. package/build/js/page/my-account.js +9 -2
  42. package/build/js/page/personal-details.js +22 -1
  43. package/build/js/pdp.bundle.min.js +1 -1
  44. package/build/js/personal-details.min.js +1 -1
  45. package/build/js/plp.bundle.min.js +1 -1
  46. package/build/js/project-list.min.js +1 -1
  47. package/package.json +10 -2
  48. package/src/components/address-postcode-look-up.hbs +2 -2
  49. package/src/components/checkout-edit-billing-address.hbs +6 -20
  50. package/src/components/checkout-payment-details-v2.hbs +55 -94
  51. package/src/components/checkout_payment-new.hbs +1 -10
  52. package/src/components/header-menu/logout-action.hbs +8 -0
  53. package/src/components/header-menu/popover-actions-mob.hbs +11 -0
  54. package/src/components/header-menu/popover-actions.hbs +13 -0
  55. package/src/components/header-menu/user-actions-mob.hbs +18 -0
  56. package/src/components/header-menu/user-actions.hbs +12 -0
  57. package/src/components/my-account/active-orders/list-orders.hbs +1 -1
  58. package/src/components/my-account/active-orders/order.hbs +0 -2
  59. package/src/components/my-account/clipboard-code-card.hbs +13 -6
  60. package/src/components/my-account/discount.hbs +3 -1
  61. package/src/components/payment-loader.hbs +21 -59
  62. package/src/components/payments-checkout-v2.hbs +6 -12
  63. package/src/components/payments-checkout.hbs +0 -6
  64. package/src/components/payments.hbs +4 -10
  65. package/src/components/price-block-order.hbs +0 -1
  66. package/src/data/data_header-menu.json +153 -0
  67. package/src/data/my-account/data_discount.json +80 -0
  68. package/src/data/my-account/data_personal-details.json +22 -0
  69. package/src/elements/radiobutton.hbs +0 -7
  70. package/src/img/apps/app-lg.png +0 -0
  71. package/src/img/apps/app-md.png +0 -0
  72. package/src/js/components/general/clamp-content.js +1 -0
  73. package/src/js/components/general/main-nav.js +5 -5
  74. package/src/js/emulation/paymentLoader.js +11 -22
  75. package/src/js/page/basket-v2.js +1 -2
  76. package/src/js/page/checkout-payment-details.js +0 -8
  77. package/src/js/page/default-store.js +1 -4
  78. package/src/js/page/my-account.js +9 -2
  79. package/src/js/page/personal-details.js +22 -1
  80. package/src/page_checkout_delivery-address-customer-journey.html +2 -2
  81. package/src/page_my-account-installer.html +2 -1
  82. package/src/page_my-account-trade-pro.html +1 -0
  83. package/src/page_my-account.html +10 -2
  84. package/src/page_personal-details.html +5 -0
  85. package/src/page_plp_v2-vat.html +8 -2
  86. package/src/page_shopping-cart-v2.html +2 -3
  87. package/src/page_tradepro-discount-app.html +82 -0
  88. package/src/page_tradepro-discount.html +82 -0
  89. package/src/partials/header.hbs +40 -41
  90. package/src/partials/main-nav.hbs +51 -171
  91. package/src/scss/common/_elements.scss +0 -4
  92. package/src/scss/common/_rewards-counter.scss +1 -1
  93. package/src/scss/components/_leave-modal.scss +6 -2
  94. package/src/scss/components/_payments-v2.scss +0 -8
  95. package/src/scss/components/_price-block-critical.scss +3 -3
  96. package/src/scss/components/_price-block.scss +8 -3
  97. package/src/scss/components/checkout-payment-details-v2.scss +0 -237
  98. package/src/scss/components/loader.scss +0 -8
  99. package/src/scss/components/my-account/_active-orders.scss +0 -2
  100. package/src/scss/components/my-account/_barcode.scss +58 -0
  101. package/src/scss/components/my-account/_clipboard-code.scss +77 -0
  102. package/src/scss/components/my-account/_discount.scss +51 -0
  103. package/src/scss/emulation.scss +1 -1
  104. package/src/scss/helpers/_mixins.scss +9 -0
  105. package/src/scss/pages/_checkout-confirmation-new.scss +3 -10
  106. package/src/scss/pages/my-account-v2.scss +38 -172
  107. package/src/scss/pages/page_change-password.scss +1 -1
  108. package/src/scss/pages/page_default-store.scss +5 -4
  109. package/src/scss/pages/page_discount.scss +212 -0
  110. package/src/scss/pages/page_personal-details.scss +1 -74
  111. package/src/scss/pages/page_products-list-combined.scss +13 -3
  112. package/src/scss/pages/page_products-list.scss +9 -1
  113. package/src/scss/partials/_header-critical.scss +2 -5
  114. package/src/scss/partials/_header.scss +58 -25
  115. package/src/scss/partials/_main-nav.scss +43 -29
  116. package/src/scss/plp-main.scss +1 -0
  117. package/src/sitemap.html +2 -25
  118. package/build/img/billie-logo.svg +0 -4
  119. package/build/img/billie-spinner.svg +0 -5
  120. package/build/img/billie.svg +0 -4
  121. package/build/img/payment/checkout/billie.svg +0 -4
  122. package/build/img/payment/footer/billie.svg +0 -4
  123. package/build/js/page/billie-business-type.js +0 -34
  124. package/src/components/address-billie.hbs +0 -42
  125. package/src/components/checkout-payment-info-block.hbs +0 -49
  126. package/src/components/checkout-payment-option.hbs +0 -40
  127. package/src/components/my-account/active-orders/payment-status.hbs +0 -8
  128. package/src/img/billie-logo.svg +0 -4
  129. package/src/img/billie-spinner.svg +0 -5
  130. package/src/img/billie.svg +0 -4
  131. package/src/img/payment/checkout/billie.svg +0 -4
  132. package/src/img/payment/footer/billie.svg +0 -4
  133. package/src/js/page/billie-business-type.js +0 -34
  134. package/src/page_checkout_confirmation-billie.html +0 -339
  135. package/src/page_payment-details-with-billie.html +0 -67
  136. package/src/page_product-details-billie.html +0 -86
  137. package/src/scss/components/_tooltip.scss +0 -19
  138. package/src/scss/components/my-account/_payment-status.scss +0 -36
@@ -1,121 +1,16 @@
1
1
  @import '../helpers/helpers';
2
- @import '../components/tooltip';
3
2
 
4
3
  .checkout-payment-details-v2 {
5
4
  .checkout-payment-details {
6
5
  margin: 0;
7
6
 
8
- .warning-required {
9
- margin: 16px 0;
10
- }
11
-
12
- .addr-billie.billie-form {
13
- margin-bottom: 24px;
14
- }
15
-
16
- .address-postcode {
17
- margin-bottom: 24px;
18
- }
19
-
20
- &__populated-address {
21
- display: block;
22
- margin-top: -11px;
23
- }
24
-
25
- &__populated-text {
26
- margin-right: 4px;
27
- }
28
-
29
- .radio-expanded-content {
30
- display: flex;
31
- flex-wrap: wrap;
32
-
33
- > .form-row {
34
- &:first-child {
35
- margin-top: 16px;
36
- }
37
-
38
- &:last-child {
39
- margin-bottom: 0;
40
- }
41
- }
42
- }
43
-
44
- .radio-option-wrapper {
45
- position: relative;
46
- }
47
-
48
- .radio-group {
49
- display: flex;
50
- flex-direction: column;
51
-
52
- > .form-row:last-child {
53
- margin-bottom: 0;
54
- }
55
- }
56
-
57
- .billie-tooltip {
58
- right: auto;
59
- top: 0;
60
- transform: none;
61
- left: 252px;
62
- }
63
-
64
- .form-row.radio-group {
65
- margin-bottom: 0;
66
- }
67
-
68
- .form-row__field.radio-group {
69
- margin-top: 6px;
70
- }
71
-
72
- .rbn_align {
73
- font-size: 14px;
74
- font-weight: 400;
75
- line-height: 24px;
76
- }
77
-
78
7
  .form-row {
79
8
  padding: 0;
80
- width: 100%;
81
- margin-left: 0;
82
- margin-right: 0;
83
- margin-bottom: 16px;
84
9
 
85
10
  &__field-klarna {
86
11
  margin-bottom: -10px;
87
12
  }
88
13
 
89
- &__label,
90
- &__error,
91
- &__info,
92
- &__field {
93
- padding-left: 0;
94
- padding-right: 0;
95
- }
96
-
97
- &.first-name {
98
- flex: 0 0 100%;
99
- margin-top: 16px;
100
- }
101
-
102
- &.last-name {
103
- flex: 0 0 100%;
104
- }
105
-
106
- .registered-business {
107
- margin-top: 16px;
108
- padding-right: 0;
109
- }
110
-
111
- .reg-number {
112
- padding-left: 0;
113
- }
114
-
115
- .registered-label {
116
- margin-right: 8px;
117
- }
118
-
119
14
  &__action {
120
15
  &:before {
121
16
  content: none;
@@ -230,73 +125,6 @@
230
125
  }
231
126
  }
232
127
 
233
- &__billie {
234
- .billie-info {
235
- background: $white;
236
- margin-bottom: 20px;
237
- padding: 20px;
238
-
239
- &__header {
240
- display: flex;
241
- justify-content: space-between;
242
- align-items: center;
243
- margin-bottom: 20px;
244
- padding-bottom: 20px;
245
- border-bottom: 1px solid $gray;
246
-
247
- &_title {
248
- margin: 0;
249
- font-size: 1rem;
250
- font-weight: 500;
251
- line-height: 1.5rem;
252
- }
253
- }
254
-
255
- &__list {
256
- padding: 0;
257
- margin: 0;
258
- list-style-type: none;
259
- border-bottom: 1px solid $gray;
260
-
261
- &_item {
262
- font-size: 0.875rem;
263
- font-weight: 400;
264
- line-height: 1.375rem;
265
- height: 30px;
266
- display: flex;
267
- align-items: center;
268
-
269
- .fa-check {
270
- margin-right: 10px;
271
- }
272
-
273
- &:last-child {
274
- margin-bottom: 15px;
275
- }
276
- }
277
- }
278
-
279
- &__learn-more {
280
- display: flex;
281
- align-items: center;
282
- border-bottom: 1px solid $gray;
283
- }
284
-
285
- &__accept-info {
286
- margin-top: 15px;
287
- margin-bottom: 10px;
288
- color: $warm-grey;
289
- font-weight: 400;
290
- font-size: 0.75rem;
291
- line-height: 1rem;
292
- }
293
-
294
- &__link {
295
- color: $black;
296
- }
297
- }
298
- }
299
-
300
128
  .apple {
301
129
  &-logo {
302
130
  height: 28px;
@@ -379,11 +207,6 @@
379
207
  .checkout-payment-details__descr {
380
208
  margin-bottom: 30px;
381
209
 
382
- .form-row.first-name {
383
- flex: 0 0 50%;
384
- max-width: 50%;
385
- }
386
-
387
210
  &::after {
388
211
  position: absolute;
389
212
  content: '';
@@ -398,66 +221,6 @@
398
221
  }
399
222
  }
400
223
 
401
- @include media-breakpoint-up(sm) {
402
- .checkout-payment-details-v2 {
403
- .checkout-payment-details {
404
- margin: 0;
405
-
406
- &__populated-address {
407
- display: flex;
408
- }
409
-
410
- .radio-expanded-content {
411
- align-items: baseline;
412
- }
413
-
414
- .form-row {
415
- &.first-name {
416
- flex: 0 0 50%;
417
- max-width: 50%;
418
- padding-right: 8px;
419
-
420
- .form-row__label,
421
- .form-row__field,
422
- .form-row__error {
423
- padding: 0;
424
- }
425
- }
426
-
427
- &.registered-business {
428
- flex: 0 0 50%;
429
- max-width: 50%;
430
- margin-bottom: 0;
431
- }
432
-
433
- &.reg-number {
434
- flex: 0 0 50%;
435
- max-width: 50%;
436
- margin-bottom: 0;
437
- padding-left: 8px;
438
- }
439
-
440
- &.registered-business {
441
- padding-right: 8px;
442
- }
443
-
444
- &.last-name {
445
- flex: 0 0 50%;
446
- max-width: 50%;
447
- padding-left: 8px;
448
- margin-top: 16px;
449
-
450
- .form-row__label,
451
- .form-row__field,
452
- .form-row__error {
453
- padding: 0;
454
- }
455
- }
456
- }
457
- }
458
- }
459
- }
460
-
461
224
  @include media-breakpoint-up(md) {
462
225
  .checkout-payment-details-v2 {
463
226
  .checkout-payment-details {
@@ -25,7 +25,6 @@
25
25
 
26
26
  .paypal-checkout-logo,
27
27
  .klarna-checkout-logo,
28
- .billie-checkout-logo,
29
28
  .clearpay-checkout-logo {
30
29
  margin-bottom: 25px;
31
30
  }
@@ -114,13 +113,6 @@
114
113
  margin-bottom: 20px;
115
114
  }
116
115
 
117
- .billie-spinner-logo {
118
- display: block;
119
- background: url('../img/billie-spinner.svg') no-repeat;
120
- height: 38px;
121
- width: 111px;
122
- }
123
-
124
116
  .apple-spinner-logo {
125
117
  height: 58px;
126
118
  width: 136px;
@@ -171,7 +171,6 @@
171
171
  'header viewMore'
172
172
  'orderDetails orderDetails'
173
173
  'consignmentInfo consignmentInfo'
174
- 'paymentStatus paymentStatus'
175
174
  'shipment shipment';
176
175
 
177
176
  .order-header {
@@ -237,7 +236,6 @@
237
236
  grid-template-areas:
238
237
  'header consignmentInfo viewMore'
239
238
  'orderDetails orderDetails orderDetails'
240
- 'paymentStatus paymentStatus paymentStatus'
241
239
  'shipment shipment shipment';
242
240
  grid-template-columns: auto auto 1fr;
243
241
  align-items: center;
@@ -0,0 +1,58 @@
1
+ .barcode {
2
+ margin-top: 16px;
3
+ padding: 12px;
4
+ background: $white;
5
+ border-radius: 4px;
6
+ color: $gray-dark;
7
+ position: relative;
8
+ font-size: .75rem;
9
+ line-height: 1rem;
10
+
11
+ &__discount {
12
+ position: absolute;
13
+ top: -8px;
14
+ right: -8px;
15
+
16
+ img {
17
+ border-radius: 40px;
18
+ width: 100%;
19
+ max-width: 58px;
20
+ }
21
+ }
22
+
23
+ &__content {
24
+ display: flex;
25
+ justify-content: center;
26
+ align-items: center;
27
+
28
+ p {
29
+ margin-bottom: 0;
30
+ margin-left: 8px;
31
+ font-weight: 500;
32
+ display: -webkit-box;
33
+ -webkit-line-clamp: 1;
34
+ -webkit-box-orient: vertical;
35
+ overflow: hidden;
36
+ text-overflow: ellipsis;
37
+ }
38
+
39
+ .custom-icon {
40
+ width: 13px;
41
+ height: auto;
42
+ }
43
+ }
44
+
45
+ &__image {
46
+ display: flex;
47
+
48
+ svg {
49
+ width: 100%;
50
+ height: auto;
51
+ }
52
+ }
53
+
54
+ &__code {
55
+ text-align: center;
56
+ margin-bottom: 0;
57
+ }
58
+ }
@@ -0,0 +1,77 @@
1
+ .clipboard-code {
2
+ background: rgba(255, 255, 255, .08);
3
+ border-radius: 4px;
4
+ padding: 16px;
5
+
6
+ .icon-wrap {
7
+ display: flex;
8
+ align-items: center;
9
+ justify-content: center;
10
+ width: 32px;
11
+ height: 32px;
12
+ }
13
+
14
+ .title {
15
+ margin-bottom: 0;
16
+ font-weight: 700;
17
+ font-size: 1rem;
18
+ line-height: 1.25rem;
19
+ }
20
+
21
+ .subtitle {
22
+ display: inline-block;
23
+ font-weight: 400;
24
+ font-size: .875rem;
25
+ line-height: 1.375rem;
26
+ }
27
+
28
+ .icon {
29
+ color: $blue-satin;
30
+ font-size: 1.35rem;
31
+ }
32
+
33
+ .custom-icon path {
34
+ fill: $blue-satin;
35
+ }
36
+
37
+ &__content {
38
+ margin-left: 8px;
39
+ }
40
+
41
+ &__cta {
42
+ margin-top: 4px;
43
+ display: flex;
44
+ align-items: center;
45
+
46
+ .btn--icon {
47
+ padding: 4px;
48
+ margin-left: 4px;
49
+ border: 0;
50
+ border-radius: 0;
51
+ background: transparent;
52
+ display: inline-flex;
53
+
54
+ .icon-copy {
55
+ width: 14px;
56
+ height: auto;
57
+ color: $white;
58
+ }
59
+ }
60
+ }
61
+
62
+ &__description {
63
+ margin-top: 16px;
64
+ color: rgba(255, 255, 255, .80);
65
+
66
+ p {
67
+ font-size: 14px;
68
+ font-weight: 400;
69
+ line-height: 22px;
70
+ margin-bottom: 0;
71
+ }
72
+
73
+ .link {
74
+ color: inherit;
75
+ }
76
+ }
77
+ }
@@ -0,0 +1,51 @@
1
+ .discount {
2
+ background: rgba(255, 255, 255, .08);
3
+ border-radius: 4px;
4
+ padding: 16px;
5
+
6
+ .icon-wrap {
7
+ display: flex;
8
+ align-items: center;
9
+ justify-content: center;
10
+ width: 32px;
11
+ height: 32px;
12
+ }
13
+
14
+ .title {
15
+ margin-bottom: 0;
16
+ font-weight: 700;
17
+ font-size: 1rem;
18
+ line-height: 1.25rem;
19
+ }
20
+
21
+ .subtitle {
22
+ display: inline-block;
23
+ font-weight: 400;
24
+ font-size: .875rem;
25
+ line-height: 1.375rem;
26
+ }
27
+
28
+ &__content {
29
+ display: flex;
30
+
31
+ .subtitle {
32
+ margin: 4px 0 0;
33
+ }
34
+
35
+ .icon {
36
+ font-size: 1.44rem;
37
+ height: 18px;
38
+ color: $blue-satin;
39
+ }
40
+ }
41
+
42
+ .barcode__image {
43
+ svg {
44
+ margin: 8px 0;
45
+ }
46
+ }
47
+
48
+ &__code {
49
+ margin-left: 8px;
50
+ }
51
+ }
@@ -10,7 +10,7 @@
10
10
  }
11
11
 
12
12
  [data-logged-in='false'] {
13
- visibility: hidden;
13
+ display: none;
14
14
  }
15
15
 
16
16
  // sass-lint:disable no-important
@@ -147,3 +147,12 @@
147
147
  @mixin line-height($line-height-px) {
148
148
  line-height: #{$line-height-px / 16}rem;
149
149
  }
150
+
151
+ @mixin icon-wrap($width: 24px, $height: 24px, $font-size-px: 16) {
152
+ width: $width;
153
+ height: $height;
154
+ display: flex;
155
+ align-items: center;
156
+ justify-content: center;
157
+ font-size: #{$font-size-px / 16}rem;
158
+ }
@@ -253,8 +253,7 @@
253
253
  &__klarna,
254
254
  &__apple,
255
255
  &__google,
256
- &__clearpay,
257
- &__billie {
256
+ &__clearpay {
258
257
  display: flex;
259
258
  flex-direction: column;
260
259
  }
@@ -274,8 +273,7 @@
274
273
  }
275
274
 
276
275
  &__klarna,
277
- &__clearpay,
278
- &__billie {
276
+ &__clearpay {
279
277
  margin-bottom: 0;
280
278
  }
281
279
  }
@@ -327,16 +325,11 @@
327
325
  &__klarna,
328
326
  &__apple,
329
327
  &__google,
330
- &__clearpay,
331
- &__billie {
328
+ &__clearpay {
332
329
  flex-direction: row;
333
330
  justify-content: space-between;
334
331
  }
335
332
 
336
- &__billie {
337
- align-items: center;
338
- }
339
-
340
333
  &__paypal,
341
334
  &__apple,
342
335
  &__google {