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
package/src/partials/header.hbs CHANGED
@@ -26,50 +26,49 @@
26
26
  {{/ifCond}}
27
27
  <span class="header-top-line__link-title">Hi Christopher</span>
28
28
  </a>
29
- {{#if tradepro-nav}}
30
- <div class="user__popover">
31
- <div class="user__popover-content user__popover-content_extended">
32
- <a href="#" class="user__action">My TradePro Account</a>
33
- <a href="#" class="user__action">Address Book</a>
34
- <a href="#" class="user__action">Payment Details</a>
35
- <a href="#" class="user__action">Order History</a>
36
- <a href="#" class="user__action">TradePro Discount Code</a>
37
- <a href="#" class="user__action">TradePro Rewards<span class="rewards-counter">3</span></a>
38
- <div class="user__logout">
39
- <a href="" class="user__action link-logout">
40
- Log out<span class="icon icon-logout"><i class="fas fa-sign-out"></i></span>
41
- </a>
42
- </div>
43
- </div>
44
- </div>
45
- {{else if installer-nav}}
46
- <div class="user__popover">
47
- <div class="user__popover-content user__popover-content_extended">
48
- <a href="#" class="user__action">My Installer Account</a>
49
- <a href="#" class="user__action">Address Book</a>
50
- <a href="#" class="user__action">Payment Details</a>
51
- <a href="#" class="user__action">Order History</a>
52
- <a href="#" class="user__action">Installer Discount Code</a>
53
- <div class="user__logout">
54
- <a href="" class="user__action link-logout">
55
- Log out<span class="icon icon-logout"><i class="fas fa-sign-out"></i></span>
56
- </a>
57
- </div>
58
- </div>
59
- </div>
60
- {{else}}
61
- <div class="user__popover">
29
+ <div class="user__popover">
30
+ <div class="user__popover-wrap">
62
31
  <div class="user__popover-content">
63
- <a href="./page_my-account.html" class="user__action">Your account</a>
64
- <a href="./page_my-account_order-history.html" class="user__action">Your orders</a>
65
- <div class="user__logout">
66
- <a href="" class="user__action link-logout">
67
- Log out<span class="icon icon-logout"><i class="fas fa-sign-out"></i></span>
68
- </a>
69
- </div>
32
+ {{#if tradepro-nav}}
33
+ {{#each header_menu.tradepro}}
34
+ {{#if (eq type "userActions")}}
35
+ {{> header-menu/user-actions items=items}}
36
+ {{/if}}
37
+ {{#if (eq type "popoverActions")}}
38
+ {{> header-menu/popover-actions items=items}}
39
+ {{/if}}
40
+ {{#if (eq type "logoutAction")}}
41
+ {{> header-menu/logout-action items=items}}
42
+ {{/if}}
43
+ {{/each}}
44
+ {{else if installer-nav}}
45
+ {{#each header_menu.installer}}
46
+ {{#if (eq type "userActions")}}
47
+ {{> header-menu/user-actions items=items}}
48
+ {{/if}}
49
+ {{#if (eq type "popoverActions")}}
50
+ {{> header-menu/popover-actions items=items}}
51
+ {{/if}}
52
+ {{#if (eq type "logoutAction")}}
53
+ {{> header-menu/logout-action items=items}}
54
+ {{/if}}
55
+ {{/each}}
56
+ {{else}}
57
+ {{#each header_menu.diy}}
58
+ {{#if (eq type "userActions")}}
59
+ {{> header-menu/user-actions items=items}}
60
+ {{/if}}
61
+ {{#if (eq type "popoverActions")}}
62
+ {{> header-menu/popover-actions items=items}}
63
+ {{/if}}
64
+ {{#if (eq type "logoutAction")}}
65
+ {{> header-menu/logout-action items=items}}
66
+ {{/if}}
67
+ {{/each}}
68
+ {{/if}}
70
69
  </div>
71
70
  </div>
72
- {{/if}}
71
+ </div>
73
72
  </div>
74
73
  {{else}}
75
74
  <a href="./page_login.html" class="header-top-line__link" data-logged-in="false">
package/src/partials/main-nav.hbs CHANGED
@@ -1,111 +1,38 @@
1
1
  <a id="skip-to-navigation"></a>
2
- <nav class="main-nav" id="main-nav" data-ssr="{{#unless oldNav}}true{{/unless}}">
3
- {{#if oldNav}}
4
- {{> skeleton-nav}}
5
- {{else}}
6
- {{> navigation/nav-wrapper }}
7
- {{/if }}
8
- {{#unless tradepro-nav}}
9
- <div class="main-nav__button" data-logged-in="false">
10
- <a href="/login.html" class="nav-button">
11
- <span class="nav-button__icon">
12
- <i class="fas fa-user"></i>
13
- </span>
14
- <span class="nav-button__text">Log In / Register</span>
15
- </a>
16
- </div>
2
+ <nav class="main-nav" id="main-nav">
3
+ {{>skeleton-nav}}
17
4
 
5
+ {{#if isLoggedIn}}
18
6
  <div class="nav-button-wrap" data-logged-in="true">
19
- <div class="main-nav__button">
20
- <a href="./page_my-account.html" class="nav-button">
21
- <span class="nav-button__icon">
22
- {{#ifCond iconUserClass '||' customIconUserClass}}
23
- {{#if customIconUserClass}}
24
- {{{customIconUserClass}}}
25
- {{else}}
26
- <i class="{{iconUserClass}} icon"></i>
27
- {{/if}}
28
- {{else}}
29
- <i class="fas fa-user"></i>
30
- {{/ifCond}}
31
- </span>
32
- <span class="nav-button__text">Hi Christopher</span>
33
- </a>
34
- </div>
35
- <div class="main-nav__button">
36
- <a href="./page_my-account.html" class="nav-button">
37
- <span class="nav-button__icon"></span>
38
- <span class="nav-button__text">My Account</span>
39
- <span class="rewards-counter">0</span>
40
- </a>
41
- </div>
42
- <div class="main-nav__button">
43
- <a href="./page_my-account.html" class="nav-button">
44
- <span class="nav-button__icon"></span>
45
- <span class="nav-button__text">Address Book</span>
46
- </a>
47
- </div>
48
- <div class="main-nav__button">
49
- <a href="./page_my-account_order-history.html" class="nav-button">
50
- <span class="nav-button__icon"></span>
51
- <span class="nav-button__text">Order History</span>
52
- </a>
53
- </div>
54
- <div class="main-nav__button">
55
- <a href="./page_my-account.html" class="nav-button">
56
- <span class="nav-button__icon"></span>
57
- <span class="nav-button__text">Log Out</span>
58
- </a>
59
- </div>
60
- </div>
61
- {{/unless}}
7
+ {{#if tradepro-nav}}
8
+ {{#each header_menu.tradepro}}
9
+ {{#if (eq type "userActions")}}
10
+ {{> header-menu/user-actions-mob items=items}}
11
+ {{/if}}
12
+ {{#if (eq type "popoverActions")}}
13
+ {{> header-menu/popover-actions-mob items=items}}
14
+ {{/if}}
15
+ {{/each}}
16
+ {{else if installer-nav}}
17
+ {{#each header_menu.installer}}
18
+ {{#if (eq type "userActions")}}
19
+ {{> header-menu/user-actions-mob items=items}}
20
+ {{/if}}
21
+ {{#if (eq type "popoverActions")}}
22
+ {{> header-menu/popover-actions-mob items=items}}
23
+ {{/if}}
24
+ {{/each}}
25
+ {{else}}
26
+ {{#each header_menu.diy}}
27
+ {{#if (eq type "userActions")}}
28
+ {{> header-menu/user-actions-mob items=items}}
29
+ {{/if}}
30
+ {{#if (eq type "popoverActions")}}
31
+ {{> header-menu/popover-actions-mob items=items}}
32
+ {{/if}}
33
+ {{/each}}
34
+ {{/if}}
62
35
 
63
- {{#if tradepro-nav}}
64
- <div class="nav-button-wrap" data-logged-in="false">
65
- <div class="main-nav__button">
66
- <a href="./page_my-account.html" class="nav-button">
67
- <span class="nav-button__icon">
68
- <i class="fas fa-user"></i>
69
- </span>
70
- <span class="nav-button__text">Hi, Test</span>
71
- </a>
72
- </div>
73
- <div class="main-nav__button">
74
- <a href="./page_my-account.html" class="nav-button">
75
- <span class="nav-button__icon"></span>
76
- <span class="nav-button__text">My TradePro Account</span>
77
- </a>
78
- </div>
79
- <div class="main-nav__button">
80
- <a href="./page_my-account_order-history.html" class="nav-button">
81
- <span class="nav-button__icon"></span>
82
- <span class="nav-button__text">Address Book</span>
83
- </a>
84
- </div>
85
- <div class="main-nav__button">
86
- <a href="./page_my-account.html" class="nav-button">
87
- <span class="nav-button__icon"></span>
88
- <span class="nav-button__text">Payment Details</span>
89
- </a>
90
- </div>
91
- <div class="main-nav__button">
92
- <a href="./page_my-account.html" class="nav-button">
93
- <span class="nav-button__icon"></span>
94
- <span class="nav-button__text">Order History</span>
95
- </a>
96
- </div>
97
- <div class="main-nav__button">
98
- <a href="./page_my-account.html" class="nav-button">
99
- <span class="nav-button__icon"></span>
100
- <span class="nav-button__text">TradePro Discount Code</span>
101
- </a>
102
- </div>
103
- <div class="main-nav__button">
104
- <a href="./page_my-account.html" class="nav-button">
105
- <span class="nav-button__icon"></span>
106
- <span class="nav-button__text">TradePro Rewards</span>
107
- </a>
108
- </div>
109
36
  <div class="main-nav__button">
110
37
  <a href="./page_my-account.html" class="nav-button">
111
38
  <span class="nav-button__icon"></span>
@@ -113,58 +40,14 @@
113
40
  </a>
114
41
  </div>
115
42
  </div>
116
-
117
- <div class="nav-button-wrap" data-logged-in="true">
118
- <div class="main-nav__button">
119
- <a href="./page_my-account.html" class="nav-button">
120
- <span class="nav-button__icon">
121
- <i class="fas fa-user"></i>
122
- </span>
123
- <span class="nav-button__text">Hi, Christopher</span>
124
- </a>
125
- </div>
126
- <div class="main-nav__button">
127
- <a href="./page_my-account.html" class="nav-button">
128
- <span class="nav-button__icon"></span>
129
- <span class="nav-button__text">My TradePro Account</span>
130
- </a>
131
- </div>
132
- <div class="main-nav__button">
133
- <a href="./page_my-account_order-history.html" class="nav-button">
134
- <span class="nav-button__icon"></span>
135
- <span class="nav-button__text">Address Book</span>
136
- </a>
137
- </div>
138
- <div class="main-nav__button">
139
- <a href="./page_my-account.html" class="nav-button">
140
- <span class="nav-button__icon"></span>
141
- <span class="nav-button__text">Payment Details</span>
142
- </a>
143
- </div>
144
- <div class="main-nav__button">
145
- <a href="./page_my-account.html" class="nav-button">
146
- <span class="nav-button__icon"></span>
147
- <span class="nav-button__text">Order History</span>
148
- </a>
149
- </div>
150
- <div class="main-nav__button">
151
- <a href="./page_my-account.html" class="nav-button">
152
- <span class="nav-button__icon"></span>
153
- <span class="nav-button__text">TradePro Discount Code</span>
154
- </a>
155
- </div>
156
- <div class="main-nav__button">
157
- <a href="./page_my-account.html" class="nav-button">
158
- <span class="nav-button__icon"></span>
159
- <span class="nav-button__text">TradePro Rewards</span>
160
- </a>
161
- </div>
162
- <div class="main-nav__button">
163
- <a href="./page_my-account.html" class="nav-button">
164
- <span class="nav-button__icon"></span>
165
- <span class="nav-button__text">Log Out</span>
166
- </a>
167
- </div>
43
+ {{else}}
44
+ <div class="main-nav__button main-nav__button--not-logged-in" data-logged-in="false">
45
+ <a href="/login.html" class="nav-button">
46
+ <span class="nav-button__icon">
47
+ <i class="fas fa-user"></i>
48
+ </span>
49
+ <span class="nav-button__text">Log In / Register</span>
50
+ </a>
168
51
  </div>
169
52
  {{/if}}
170
53
 
@@ -185,21 +68,18 @@
185
68
  </a>
186
69
  </div>
187
70
  <div class="main-nav__button">
188
- {{#if shopListEmpty}}
189
- <a href="./page_my-shopping-list.html" class="nav-button">
190
- <span class="nav-button__icon">
191
- <i class="fas fa-clipboard"></i>
192
- </span>
193
- <span class="nav-button__text">Project List</span>
194
- </a>
195
- {{else}}
196
- <a href="./page_my-shopping-list.html" class="nav-button">
197
- <span class="nav-button__icon">
198
- <i class="fas fa-clipboard-list"></i>
199
- </span>
200
- <span class="nav-button__text">Project List</span>
201
- </a>
202
- {{/if}}
71
+ <a href="./page_my-shopping-list.html" class="nav-button">
72
+ <span class="nav-button__icon">
73
+ <i class="fas {{#if shopListEmpty}}fa-clipboard{{else}}fa-clipboard-list{{/if}}"></i>
74
+ </span>
75
+ <span class="nav-button__text">
76
+ {{#if isLoggedIn}}
77
+ Project Lists
78
+ {{else}}
79
+ Project List
80
+ {{/if}}
81
+ </span>
82
+ </a>
203
83
  </div>
204
84
  </nav>
205
85
  <div class="main-nav__overlay"></div>
package/src/scss/common/_rewards-counter.scss CHANGED
@@ -3,7 +3,7 @@
3
3
  display: inline-block;
4
4
  min-width: 24px;
5
5
  border-radius: 13px;
6
- background-color: $red;
6
+ background-color: $blue-dark;
7
7
  color: $white;
8
8
  font-size: .725rem;
9
9
  font-weight: 700;