wickes-css2 2.98.0-develop.2 → 2.98.0-develop.4

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 (107) hide show
  1. package/build/css/category-main.css +1 -1
  2. package/build/css/components/legal-info.css +1 -1
  3. package/build/css/emulation.css +1 -1
  4. package/build/css/homepage-main.css +1 -1
  5. package/build/css/main.css +1 -1
  6. package/build/css/my-account-main-v2.css +1 -1
  7. package/build/css/my-account-main.css +1 -1
  8. package/build/css/pages/checkout-new.css +1 -1
  9. package/build/css/pages/my-account-v2.css +1 -1
  10. package/build/css/pages/page_address-book.css +1 -1
  11. package/build/css/pages/page_change-password.css +1 -1
  12. package/build/css/pages/page_default-store.css +1 -1
  13. package/build/css/pages/page_discount.css +1 -0
  14. package/build/css/pages/page_personal-details.css +1 -1
  15. package/build/css/pages/page_products-list-combined.css +1 -1
  16. package/build/css/pages/page_products-list.css +1 -1
  17. package/build/css/pages/page_track-my-order.css +1 -1
  18. package/build/css/pdp-main-before-combine.css +1 -1
  19. package/build/css/pdp-main-critical.css +1 -1
  20. package/build/css/pdp-main-non-critical.css +1 -1
  21. package/build/css/pdp-main.css +1 -1
  22. package/build/css/plp-main.css +1 -1
  23. package/build/css/store-locator-main.css +1 -1
  24. package/build/img/apps/app-lg.png +0 -0
  25. package/build/img/apps/app-md.png +0 -0
  26. package/build/js/basket.min.js +2 -2
  27. package/build/js/bundle.min.js +1 -1
  28. package/build/js/checkout.min.js +1 -1
  29. package/build/js/default-store.min.js +1 -1
  30. package/build/js/general.bundle.min.js +1 -1
  31. package/build/js/merged-checkout.min.js +1 -1
  32. package/build/js/my-account.min.js +1 -1
  33. package/build/js/page/basket-v2.js +6 -14
  34. package/build/js/page/components/charity.js +43 -58
  35. package/build/js/page/default-store.js +1 -4
  36. package/build/js/page/my-account.js +9 -2
  37. package/build/js/page/personal-details.js +22 -1
  38. package/build/js/pdp.bundle.min.js +1 -1
  39. package/build/js/personal-details.min.js +1 -1
  40. package/build/js/plp.bundle.min.js +1 -1
  41. package/build/js/project-list.min.js +1 -1
  42. package/package.json +2 -2
  43. package/src/components/header-menu/logout-action.hbs +8 -0
  44. package/src/components/header-menu/popover-actions-mob.hbs +11 -0
  45. package/src/components/header-menu/popover-actions.hbs +13 -0
  46. package/src/components/header-menu/user-actions-mob.hbs +18 -0
  47. package/src/components/header-menu/user-actions.hbs +12 -0
  48. package/src/components/legal-info.hbs +22 -25
  49. package/src/components/my-account/clipboard-code-card.hbs +13 -6
  50. package/src/components/my-account/discount.hbs +3 -1
  51. package/src/components/price-block-order.hbs +0 -1
  52. package/src/components/track-my-order-info.hbs +1 -3
  53. package/src/data/data_header-menu.json +153 -0
  54. package/src/data/data_page-category.json +2 -1
  55. package/src/data/data_shopping-cart-v2.json +0 -51
  56. package/src/data/my-account/data_discount.json +80 -0
  57. package/src/data/my-account/data_personal-details.json +22 -0
  58. package/src/img/apps/app-lg.png +0 -0
  59. package/src/img/apps/app-md.png +0 -0
  60. package/src/js/components/general/clamp-content.js +1 -0
  61. package/src/js/components/general/main-nav.js +5 -5
  62. package/src/js/page/basket-v2.js +6 -14
  63. package/src/js/page/components/charity.js +43 -58
  64. package/src/js/page/default-store.js +1 -4
  65. package/src/js/page/my-account.js +9 -2
  66. package/src/js/page/personal-details.js +22 -1
  67. package/src/page_my-account-installer.html +2 -1
  68. package/src/page_my-account-trade-pro.html +1 -0
  69. package/src/page_my-account.html +10 -1
  70. package/src/page_personal-details.html +5 -0
  71. package/src/page_plp_v2-vat.html +8 -2
  72. package/src/page_shopping-cart-charity.html +56 -0
  73. package/src/page_shopping-cart-v2.html +1 -1
  74. package/src/page_tradepro-discount-app.html +82 -0
  75. package/src/page_tradepro-discount.html +82 -0
  76. package/src/partials/header.hbs +40 -41
  77. package/src/partials/main-nav.hbs +51 -171
  78. package/src/scss/common/_rewards-counter.scss +1 -1
  79. package/src/scss/components/_charity-donations.scss +186 -114
  80. package/src/scss/components/_leave-modal.scss +6 -2
  81. package/src/scss/components/_price-block-critical.scss +3 -3
  82. package/src/scss/components/_price-block.scss +8 -3
  83. package/src/scss/components/legal-info.scss +61 -0
  84. package/src/scss/components/my-account/_barcode.scss +58 -0
  85. package/src/scss/components/my-account/_clipboard-code.scss +77 -0
  86. package/src/scss/components/my-account/_discount.scss +51 -0
  87. package/src/scss/emulation.scss +1 -1
  88. package/src/scss/helpers/_mixins.scss +9 -0
  89. package/src/scss/pages/checkout-new.scss +0 -1
  90. package/src/scss/pages/my-account-v2.scss +38 -171
  91. package/src/scss/pages/page_change-password.scss +1 -1
  92. package/src/scss/pages/page_default-store.scss +5 -4
  93. package/src/scss/pages/page_discount.scss +212 -0
  94. package/src/scss/pages/page_personal-details.scss +1 -74
  95. package/src/scss/pages/page_products-list-combined.scss +13 -3
  96. package/src/scss/pages/page_products-list.scss +9 -1
  97. package/src/scss/pages/page_track-my-order.scss +21 -0
  98. package/src/scss/partials/_header-critical.scss +2 -5
  99. package/src/scss/partials/_header.scss +58 -25
  100. package/src/scss/partials/_main-nav.scss +43 -29
  101. package/src/scss/plp-main.scss +1 -0
  102. package/src/sitemap.html +4 -0
  103. package/build/img/calm-primary-logo.png +0 -0
  104. package/src/components/basket-charity-donations-new.hbs +0 -40
  105. package/src/components/donation-cart-new.hbs +0 -38
  106. package/src/img/calm-primary-logo.png +0 -0
  107. package/src/scss/components/_donation-cart-new.scss +0 -192
@@ -113,166 +113,238 @@
113
113
  max-width: 100%;
114
114
  }
115
115
  }
116
- }
117
116
 
118
- .charity-donation-new {
119
- background-color: $gray-bg;
120
- padding: 16px;
117
+ &.charity-multiple {
118
+ .checkout-info-wrap {
119
+ padding: 15px;
120
+ }
121
121
 
122
- &__wrapper {
123
- display: flex;
124
- flex-direction: column;
125
- }
122
+ .title {
123
+ margin-bottom: 15px;
124
+ }
126
125
 
127
- &__top {
128
- display: flex;
129
- align-items: flex-start;
130
- justify-content: space-between;
131
- flex-wrap: wrap;
132
- }
126
+ .definition {
127
+ font-size: .75rem;
128
+ font-weight: 400;
129
+ line-height: 14px;
130
+ margin-bottom: 25px;
131
+ }
133
132
 
134
- &__header {
135
- display: flex;
136
- gap: 12px;
137
- }
133
+ .descr {
134
+ margin-top: -10px;
135
+ }
138
136
 
139
- &__right {
140
- flex-shrink: 0;
141
- }
137
+ .checkout-order {
138
+ &__img {
139
+ img {
140
+ width: 100%;
141
+ height: 100%;
142
+ object-fit: contain;
143
+ object-position: top;
144
+ }
145
+ }
146
+ }
142
147
 
143
- &__image {
144
- width: 64px;
145
- }
148
+ .donation-cart {
149
+ &__definition {
150
+ display: none;
151
+ }
152
+ }
146
153
 
147
- &__title {
148
- width: 100%;
149
- font-size: .875rem;
150
- font-weight: 500;
151
- line-height: 1.375rem;
152
- margin-bottom: 12px;
154
+ &.charity-added {
155
+ .checkout-order {
156
+ &__charity {
157
+ border-bottom: 1px solid $gray;
158
+ padding-bottom: 15px;
159
+ }
160
+ }
161
+ }
153
162
  }
163
+ }
154
164
 
155
- &__description {
156
- width: 100%;
157
- font-size: 0.75rem;
158
- font-weight: 400;
159
- line-height: 1rem;
160
- margin-bottom: 16px;
161
- }
165
+ @include media-breakpoint-up(sm) {
166
+ .charity-new {
167
+ .checkout-order {
168
+ &__img {
169
+ img {
170
+ max-width: 155px;
171
+ max-height: 42px;
172
+ width: 155px;
173
+ height: 42px;
174
+ }
162
175
 
163
- &__message {
164
- font-size: 0.75rem;
165
- line-height: 1rem;
166
- }
176
+ .image {
177
+ width: 155px;
178
+ }
179
+ }
167
180
 
168
- &__body {
169
- width: 100%;
170
- }
171
- }
181
+ &__info-wrap {
182
+ padding-top: 0;
183
+ }
172
184
 
173
- @include media-breakpoint-up(sm) {
174
- .charity-donation-new {
175
- &__title {
176
- width: 100%;
177
- font-weight: 500;
178
- font-size: 1rem;
179
- line-height: 1.5rem;
180
- }
185
+ .price-wrap {
186
+ align-items: center;
181
187
 
182
- &__description {
183
- width: 100%;
184
- margin: 0;
185
- }
188
+ label {
189
+ margin-top: 0;
190
+ }
191
+ }
186
192
 
187
- &__message {
188
- display: block;
189
- }
193
+ .title-wrap {
194
+ max-width: 100%;
195
+ display: flex;
196
+ flex-direction: column;
197
+
198
+ .title {
199
+ order: 1;
200
+ }
201
+
202
+ .descr {
203
+ order: 2;
204
+ }
190
205
 
191
- &__image {
192
- width: 100px;
206
+ .definition {
207
+ order: 3;
208
+ }
209
+ }
193
210
  }
194
211
 
195
- &__body {
196
- margin-top: 16px;
212
+ &.charity-multiple {
213
+ .checkout-order {
214
+ &__img {
215
+ max-width: 184px;
216
+
217
+ img {
218
+ max-height: initial;
219
+ max-width: 100%;
220
+ }
221
+ }
222
+
223
+ &__info-wrap {
224
+ align-items: flex-start;
225
+ }
226
+ }
227
+
228
+ .price-wrap {
229
+ margin-top: 6px;
230
+
231
+ .order-item {
232
+ &__remove {
233
+ margin-top: 0;
234
+ }
235
+ }
236
+ }
237
+
238
+ .title-wrap {
239
+ .descr {
240
+ margin-bottom: 20px;
241
+ }
242
+ }
197
243
  }
198
244
  }
199
245
  }
200
246
 
201
247
  @include media-breakpoint-up(md) {
202
- .charity-donation-new {
203
- &__title {
204
- width: 100%;
205
- }
248
+ .charity-new {
249
+ .checkout-order {
250
+ &__info-wrap {
251
+ padding-left: 15px;
252
+ }
206
253
 
207
- &__body {
208
- margin-top: 16px;
209
- width: 668px;
254
+ .title-wrap {
255
+ max-width: 50%;
256
+ }
210
257
  }
211
258
 
212
- &__description {
213
- width: 488px;
214
- margin-top: -25px;
215
- }
259
+ &.charity-multiple {
260
+ .checkout-info-wrap {
261
+ padding-bottom: 20px;
262
+ }
216
263
 
217
- &__message {
218
- display: block;
264
+ .donation-cart {
265
+ &__definition {
266
+ display: block;
267
+ }
268
+ }
269
+
270
+ .definition.definition,
271
+ & p:last-of-type {
272
+ margin-bottom: 0;
273
+ }
219
274
  }
220
275
 
221
- &__image {
222
- width: 124px;
276
+ &.charity-multiple.charity-added {
277
+ .checkout-order {
278
+ .title-wrap {
279
+ max-width: none;
280
+ }
281
+
282
+ &__charity {
283
+ display: grid;
284
+ grid-template-columns: 1fr 1fr;
285
+
286
+ .definition {
287
+ display: none;
288
+ }
289
+ }
290
+ }
291
+
292
+ .title-wrap {
293
+ .descr {
294
+ margin-bottom: 0;
295
+ }
296
+ }
223
297
  }
224
298
  }
225
299
  }
226
300
 
227
301
  @include media-breakpoint-up(lg) {
228
- .charity-donation-new {
229
- &__cost {
230
- height: 24px;
231
- }
232
-
233
- &__title {
234
- width: 100%;
235
- margin-bottom: 8px;
236
- }
237
-
238
- &__body {
239
- margin-top: 16px;
240
- width: 588px;
302
+ .charity-new {
303
+ .checkout-order {
304
+ .title-wrap {
305
+ max-width: 50%;
306
+ }
241
307
  }
308
+ }
242
309
 
243
- &__message {
244
- margin: 0;
245
- display: block;
310
+ .charity {
311
+ &__msg {
312
+ margin-bottom: 0;
313
+ max-width: 50%;
246
314
  }
247
315
  }
248
316
  }
249
317
 
250
318
  @include media-breakpoint-up(xl) {
251
- .charity-donation-new {
252
- padding: 24px;
253
-
254
- &__title {
255
- width: 100%;
256
- margin-bottom: 8px;
257
- }
319
+ .charity-new {
320
+ &.charity-multiple {
321
+ .checkout-order {
322
+ .title-wrap {
323
+ @include make-col(7);
324
+ }
258
325
 
259
- &__body {
260
- margin-top: 15px;
261
- width: 747px;
326
+ &__info-wrap {
327
+ @include make-col(5);
328
+ }
329
+ }
262
330
  }
263
331
 
264
- &__description {
265
- width: 100%;
266
- margin-top: -30px;
267
- }
332
+ &.charity-multiple.charity-added {
333
+ .checkout-order {
334
+ &__info-wrap {
335
+ max-width: none;
336
+ }
268
337
 
269
- &__message {
270
- margin-left: 3px;
271
- display: inline;
338
+ &__charity {
339
+ grid-template-columns: 7fr 5fr;
340
+ }
341
+ }
272
342
  }
343
+ }
273
344
 
274
- &__image {
275
- width: 124px;
345
+ .charity {
346
+ &__msg {
347
+ max-width: 100%;
276
348
  }
277
349
  }
278
350
  }
@@ -30,7 +30,7 @@
30
30
 
31
31
  .modal-title {
32
32
  @include font-size(18);
33
- @include line-height(32);
33
+ @include line-height(24);
34
34
  margin-left: 15px;
35
35
  font-weight: 500;
36
36
  }
@@ -41,9 +41,13 @@
41
41
 
42
42
  .description {
43
43
  @include font-size(16);
44
- @include line-height(32);
44
+ @include line-height(24);
45
45
  margin-bottom: 0;
46
46
  font-weight: 400;
47
+
48
+ .new-email {
49
+ font-weight: 700;
50
+ }
47
51
  }
48
52
 
49
53
  .actions {
@@ -14,14 +14,14 @@
14
14
  }
15
15
  }
16
16
 
17
- .pdp-price__value,
18
17
  .pdp-price__oos,
19
18
  .pdp-price__in-store-only {
20
19
  border-bottom: 1px solid $gray;
21
20
  }
22
21
 
23
- .pdp-price__value {
24
- padding-bottom: 10px;
22
+ .pdp-price__oos {
23
+ border-top: 1px solid $gray;
24
+ margin-bottom: 8px;
25
25
  }
26
26
 
27
27
  .pdp-price__value_extended,
@@ -25,14 +25,19 @@
25
25
  background: $gray-bg;
26
26
  }
27
27
 
28
- .pdp-price__value,
29
28
  .pdp-price__oos,
30
29
  .pdp-price__in-store-only {
31
30
  border-bottom: 1px solid $gray;
32
31
  }
33
32
 
34
- .pdp-price__value {
35
- padding-bottom: 10px;
33
+ .pdp-price__oos {
34
+ border-top: 1px solid $gray;
35
+ margin-bottom: 8px;
36
+
37
+ & + .pdp-price__controls,
38
+ &:last-child {
39
+ margin-bottom: 0;
40
+ }
36
41
  }
37
42
 
38
43
  .pdp-price__value_extended,
@@ -1,3 +1,64 @@
1
+ @import '../helpers/helpers';
2
+
1
3
  .legal-info {
2
4
  margin-top: 40px;
5
+ border: 1px solid $gray;
6
+ border-radius: 4px;
7
+ padding: 16px;
8
+ position: relative;
9
+ font-size: 1rem;
10
+ font-weight: 400;
11
+ line-height: 1.5rem;
12
+
13
+ &__toggle {
14
+ margin-bottom: 0;
15
+ font-size: 1.125rem;
16
+ font-weight: 500;
17
+ line-height: 1.5rem;
18
+ display: flex;
19
+ align-items: center;
20
+ justify-content: space-between;
21
+
22
+ .icon-wrap {
23
+ cursor: pointer;
24
+ display: flex;
25
+ align-items: center;
26
+ justify-content: center;
27
+
28
+ &:after {
29
+ content: '+';
30
+ color: $blue;
31
+ font-size: 1.575rem;
32
+ }
33
+ }
34
+
35
+ &[aria-expanded='true'] {
36
+ .icon-wrap {
37
+ &:after {
38
+ content: '-';
39
+ font-size: 2.95rem;
40
+ }
41
+ }
42
+ }
43
+ }
44
+
45
+ .collapse-wrap {
46
+ margin-top: 16px;
47
+ }
48
+
49
+ .container {
50
+ padding: 0;
51
+ }
52
+ }
53
+
54
+ @include media-breakpoint-up(sm) {
55
+ .legal-info {
56
+ padding: 24px;
57
+ }
58
+ }
59
+
60
+ @include media-breakpoint-up(md) {
61
+ .legal-info {
62
+ padding: 24px 40px;
63
+ }
3
64
  }
@@ -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
+ }
@@ -6,7 +6,6 @@
6
6
  @import 'checkout-confirmation-new';
7
7
  @import '../components/checkout_order';
8
8
  @import '../components/payments-checkout';
9
- @import "../components/donation-cart-new";
10
9
  @import 'checkout-tradepro';
11
10
 
12
11
  @import 'checkout-sign-in';