spree_frontend 4.7.0 → 4.8.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (135) hide show
  1. checksums.yaml +4 -4
  2. data/.circleci/config.yml +37 -42
  3. data/.gem_release.yml +1 -1
  4. data/.github/CONTRIBUTING.md +1 -1
  5. data/.github/dependabot.yml +9 -30
  6. data/.rubocop.yml +10 -183
  7. data/.ruby-version +1 -0
  8. data/Gemfile +4 -4
  9. data/LICENSE +1 -1
  10. data/README.md +31 -38
  11. data/SECURITY.md +1 -1
  12. data/app/assets/config/spree_frontend_manifest.js +2 -1
  13. data/app/assets/images/favicon.ico +0 -0
  14. data/app/assets/images/logo/spree_50.png +0 -0
  15. data/app/assets/images/noimage/large.png +0 -0
  16. data/app/assets/images/noimage/mini.png +0 -0
  17. data/app/assets/images/noimage/product.png +0 -0
  18. data/app/assets/images/noimage/small.png +0 -0
  19. data/app/assets/javascripts/spree/frontend/{account.js → account.es6} +2 -5
  20. data/app/assets/javascripts/spree/frontend/{api_tokens.js → api_tokens.es6} +2 -5
  21. data/app/assets/javascripts/spree/frontend/cart.js +1 -1
  22. data/app/assets/javascripts/spree/frontend/checkout/address.js +1 -1
  23. data/app/assets/javascripts/spree/frontend/checkout/address_book.js +1 -1
  24. data/app/assets/javascripts/spree/frontend/checkout/payment.js +1 -1
  25. data/app/assets/javascripts/spree/frontend/checkout/shipment.js +1 -1
  26. data/app/assets/javascripts/spree/frontend/checkout.js +1 -1
  27. data/app/assets/javascripts/spree/frontend/login.js +1 -1
  28. data/app/assets/javascripts/spree/frontend/main_nav_bar.js +1 -1
  29. data/app/assets/javascripts/spree/frontend/views/spree/layouts/spree_application.js +1 -1
  30. data/app/assets/javascripts/spree/frontend/views/spree/products/cart_form.js +9 -2
  31. data/app/assets/javascripts/spree/frontend/views/spree/products/index.js +1 -1
  32. data/app/assets/javascripts/spree/frontend/views/spree/products/modal_carousel.js +1 -1
  33. data/app/assets/javascripts/spree/frontend/views/spree/products/price_filters.es6 +1 -1
  34. data/app/assets/javascripts/spree/frontend/views/spree/shared/carousel/single.js +1 -1
  35. data/app/assets/javascripts/spree/frontend/views/spree/shared/carousel/swipes.js +1 -1
  36. data/app/assets/javascripts/spree/frontend/views/spree/shared/carousel/thumbnails.js +1 -1
  37. data/app/assets/javascripts/spree/frontend/views/spree/shared/carousel.js +1 -1
  38. data/app/assets/javascripts/spree/frontend/views/spree/shared/delete_address_popup.js +1 -1
  39. data/app/assets/javascripts/spree/frontend/views/spree/shared/mobile_navigation.js +1 -1
  40. data/app/assets/javascripts/spree/frontend/views/spree/shared/quantity_select.js +1 -1
  41. data/app/assets/javascripts/spree/lazysizes.config.js +1 -1
  42. data/app/assets/stylesheets/spree/frontend/components-custom/headers.scss +0 -2
  43. data/app/assets/stylesheets/spree/frontend/components-custom/inputs.scss +4 -146
  44. data/app/assets/stylesheets/spree/frontend/fonts.scss +0 -136
  45. data/app/assets/stylesheets/spree/frontend/variables/variables.scss +21 -7
  46. data/app/assets/stylesheets/spree/frontend/views/spree/checkout/edit.scss +0 -3
  47. data/app/assets/stylesheets/spree/frontend/views/spree/layouts/spree_application.scss +1 -1
  48. data/app/assets/stylesheets/spree/frontend/views/spree/orders/edit.scss +0 -20
  49. data/app/assets/stylesheets/spree/frontend/views/spree/products/index.scss +2 -2
  50. data/app/assets/stylesheets/spree/frontend/views/spree/products/show.scss +0 -20
  51. data/app/assets/stylesheets/spree/frontend/views/spree/shared/cart.scss +0 -14
  52. data/app/assets/stylesheets/spree/frontend/views/spree/shared/header.scss +0 -25
  53. data/app/assets/stylesheets/spree/frontend/views/spree/shared/login.scss +0 -16
  54. data/app/assets/stylesheets/spree/frontend/views/spree/shared/main_nav_bar.scss +1 -8
  55. data/app/assets/stylesheets/spree/frontend/views/spree/shared/nav_bar.scss +1 -14
  56. data/app/assets/stylesheets/spree/frontend/views/spree/shared/no_product_available.scss +1 -1
  57. data/app/assets/stylesheets/spree/frontend/views/spree/shared/order_details.scss +0 -1
  58. data/app/assets/stylesheets/spree/frontend/views/spree/taxons/show.scss +1 -1
  59. data/app/assets/stylesheets/spree/frontend/views/spree/users/show.scss +0 -28
  60. data/app/helpers/spree/addresses_helper.rb +6 -10
  61. data/app/helpers/spree/frontend_helper.rb +1 -1
  62. data/app/helpers/spree/navigation_helper.rb +1 -1
  63. data/app/helpers/spree/products_filters_helper.rb +3 -3
  64. data/app/javascript/spree/frontend/application.js +2 -0
  65. data/app/views/spree/addresses/_form.html.erb +4 -5
  66. data/app/views/spree/addresses/edit.html.erb +1 -1
  67. data/app/views/spree/addresses/new.html.erb +1 -1
  68. data/app/views/spree/checkout/_address.html.erb +1 -1
  69. data/app/views/spree/checkout/_delivery.html.erb +1 -1
  70. data/app/views/spree/checkout/_summary.html.erb +1 -1
  71. data/app/views/spree/checkout/edit.html.erb +1 -1
  72. data/app/views/spree/checkout/payment/_gateway.html.erb +4 -4
  73. data/app/views/spree/checkout/payment/_storecredit.html.erb +1 -1
  74. data/app/views/spree/checkout/registration.html.erb +1 -1
  75. data/app/views/spree/layouts/spree_application.html.erb +4 -1
  76. data/app/views/spree/orders/_line_item_data.html.erb +1 -1
  77. data/app/views/spree/orders/show.html.erb +1 -1
  78. data/app/views/spree/products/_cart_form.html.erb +2 -2
  79. data/app/views/spree/products/_color_option_type.html.erb +1 -1
  80. data/app/views/spree/products/_description.html.erb +1 -1
  81. data/app/views/spree/products/_filters_desktop.html.erb +1 -1
  82. data/app/views/spree/products/_filters_mobile.html.erb +3 -3
  83. data/app/views/spree/products/_option_type.html.erb +1 -1
  84. data/app/views/spree/products/_promotions.html.erb +1 -1
  85. data/app/views/spree/products/_properties.html.erb +1 -1
  86. data/app/views/spree/products/_sort_desktop.html.erb +9 -24
  87. data/app/views/spree/products/index.html.erb +1 -1
  88. data/app/views/spree/products/related.html.erb +1 -1
  89. data/app/views/spree/shared/_checkout_header.html.erb +1 -1
  90. data/app/views/spree/shared/_currency_dropdown.html.erb +1 -1
  91. data/app/views/spree/shared/_delete_address_popup.html.erb +2 -2
  92. data/app/views/spree/shared/_footer.html.erb +3 -3
  93. data/app/views/spree/shared/_head.html.erb +2 -1
  94. data/app/views/spree/shared/_internationalization_options.html.erb +3 -3
  95. data/app/views/spree/shared/_line_item.html.erb +1 -1
  96. data/app/views/spree/shared/_locale_dropdown.html.erb +1 -1
  97. data/app/views/spree/shared/_login.html.erb +2 -2
  98. data/app/views/spree/shared/_main_nav_bar.html.erb +2 -2
  99. data/app/views/spree/shared/_mobile_internationalization_options.html.erb +1 -1
  100. data/app/views/spree/shared/_mobile_navigation.html.erb +1 -1
  101. data/app/views/spree/shared/_nav_bar.html.erb +5 -5
  102. data/app/views/spree/shared/_no_product_available.html.erb +1 -1
  103. data/app/views/spree/shared/_order_details.html.erb +3 -3
  104. data/app/views/spree/shared/_product_added_modal.html.erb +2 -2
  105. data/app/views/spree/shared/_user_form.html.erb +3 -3
  106. data/app/views/spree/taxons/_header.html.erb +1 -1
  107. data/app/views/spree/taxons/_subcategories.html.erb +1 -1
  108. data/app/views/spree/taxons/product_carousel.html.erb +1 -1
  109. data/app/views/spree/users/edit.html.erb +1 -1
  110. data/app/views/spree/users/show.html.erb +1 -1
  111. data/config/importmap.rb +2 -0
  112. data/config/locales/en.yml +37 -0
  113. data/lib/generators/spree/frontend/install/install_generator.rb +0 -2
  114. data/lib/spree/frontend/configuration.rb +1 -1
  115. data/lib/spree/frontend/engine.rb +9 -5
  116. data/lib/spree/frontend/version.rb +3 -3
  117. data/lib/spree/frontend.rb +3 -1
  118. data/spree_frontend.gemspec +12 -10
  119. metadata +65 -50
  120. data/.deepsource.toml +0 -19
  121. data/.eslintignore +0 -7
  122. data/.eslintrc +0 -36
  123. data/.solargraph.yml +0 -20
  124. data/.stylelintignore +0 -4
  125. data/.stylelintrc +0 -6
  126. data/app/assets/images/logo-spree.png +0 -0
  127. data/app/assets/images/logo.png +0 -0
  128. data/app/assets/images/logo.svg +0 -10
  129. data/app/assets/images/logo@2x.png +0 -0
  130. data/app/assets/images/logo@3x.png +0 -0
  131. data/app/assets/images/noimage/plp.png +0 -0
  132. data/app/assets/images/noimage/plp.svg +0 -16
  133. data/app/views/spree/shared/_get_started.html.erb +0 -32
  134. data/lib/generators/spree/frontend/install/templates/app/assets/config/manifest.js +0 -2
  135. data/license.md +0 -13
@@ -60,7 +60,7 @@ ShippingTotalManager.prototype.bindEvent = function () {
60
60
  }.bind(this))
61
61
  }
62
62
 
63
- Spree.ready(function ($) {
63
+ document.addEventListener("turbo:load", function() {
64
64
  var input = {
65
65
  orderTotal: $('#summary-order-total'),
66
66
  taxTotal: $('[data-hook="tax-total"]'),
@@ -15,7 +15,7 @@ Spree.enableSave = function () {
15
15
  $('#checkout form').data('submitted', false).find(':submit, :image').attr('disabled', false).addClass('primary').removeClass('disabled')
16
16
  }
17
17
 
18
- Spree.ready(function () {
18
+ document.addEventListener("turbo:load", function() {
19
19
  Spree.Checkout = {}
20
20
 
21
21
  var formCheckoutConfirm = $('form#checkout_form_confirm')
@@ -1,4 +1,4 @@
1
- Spree.ready(function ($) {
1
+ document.addEventListener("turbo:load", function() {
2
2
  $('#new_spree_user').on('submit', function() {
3
3
  sessionStorage.setItem('page-invalidated', 'true')
4
4
  })
@@ -1,4 +1,4 @@
1
- Spree.ready(function () {
1
+ document.addEventListener("turbo:load", function() {
2
2
  var $navLinks = $('.main-nav-bar .nav-link.dropdown-toggle')
3
3
  var $dropdownMenu = $('.main-nav-bar .dropdown-menu')
4
4
  var SHOW_CLASS = 'show'
@@ -1,4 +1,4 @@
1
- Spree.ready(function ($) {
1
+ document.addEventListener("turbo:load", function() {
2
2
  document.getElementById('overlay').addEventListener('click', function () {
3
3
  var noProductElement = document.getElementById('no-product-available')
4
4
  document.getElementById("overlay").classList.remove('shown');
@@ -6,6 +6,7 @@ var ADD_TO_CART_FORM_SELECTOR = '.add-to-cart-form'
6
6
  var VARIANT_ID_SELECTOR = '[name="variant_id"]'
7
7
  var OPTION_VALUE_SELECTOR = '.product-variants-variant-values-radio'
8
8
  var ADD_TO_CART_SELECTOR = '.add-to-cart-button'
9
+ var CHECKED_OPTION_VALUE_APPLIED_EVENT = 'spreeCheckedOptionValueApplied'
9
10
 
10
11
  var AVAILABILITY_TEMPLATES = {
11
12
  notAvailableInCurrency: '.availability-template-not-available-in-currency',
@@ -81,6 +82,12 @@ function CartForm($, $cartForm) {
81
82
  }
82
83
 
83
84
  if (initialUpdate) $optionValue.prop('checked', true)
85
+
86
+ document.dispatchEvent(
87
+ new CustomEvent(CHECKED_OPTION_VALUE_APPLIED_EVENT, {
88
+ detail: { variant: this.selectedVariant() }
89
+ })
90
+ )
84
91
  }
85
92
 
86
93
  this.saveCheckedOptionValue = function($optionValue) {
@@ -263,13 +270,13 @@ function CartForm($, $cartForm) {
263
270
  var variant = this.selectedVariant()
264
271
  var variantId = (variant && variant.id) || ''
265
272
 
266
- this.$variantIdInput.val(variantId)
273
+ this.$variantIdInput.val(variantId).change()
267
274
  }
268
275
 
269
276
  this.constructor()
270
277
  }
271
278
 
272
- Spree.ready(function($) {
279
+ document.addEventListener("turbo:load", function() {
273
280
  Spree.variantById = function($cartForm, variantId) {
274
281
  var cartFormVariants = JSON.parse($cartForm.attr('data-variants'))
275
282
  return (
@@ -1,4 +1,4 @@
1
- Spree.ready(function ($) {
1
+ document.addEventListener("turbo:load", function() {
2
2
  $('#sort-by-overlay-show-button').click(function () {
3
3
  $('#sort-by-overlay').show();
4
4
  });
@@ -1,4 +1,4 @@
1
- Spree.ready(function($) {
1
+ document.addEventListener("turbo:load", function() {
2
2
  var modalCarousel = $('#productModalThumbnailsCarousel')
3
3
  if (modalCarousel.length) {
4
4
  ThumbnailsCarousel($, modalCarousel)
@@ -1,4 +1,4 @@
1
- Spree.ready(function() {
1
+ document.addEventListener("turbo:load", function() {
2
2
  class PriceRangeFilter {
3
3
  constructor(inputsContainer, filterButton) {
4
4
  this.inputsContainer = inputsContainer
@@ -1,4 +1,4 @@
1
- Spree.ready(function($) {
1
+ document.addEventListener("turbo:load", function() {
2
2
  // Adjust single carousel based on picked variant.
3
3
 
4
4
  var productDetailsPage = $('#product-details')
@@ -1,4 +1,4 @@
1
- Spree.ready(function($) {
1
+ document.addEventListener("turbo:load", function() {
2
2
  Spree.addSwipeEventListeners = function($carousel) {
3
3
  var touchStartX = 0
4
4
  var touchStartY = 0
@@ -83,7 +83,7 @@ function ThumbnailsCarousel($, carousel) {
83
83
  this.constructor()
84
84
  }
85
85
 
86
- Spree.ready(function($) {
86
+ document.addEventListener("turbo:load", function() {
87
87
  // Adjust thumbnails carousel based on picked variant.
88
88
 
89
89
  if ($('#product-details').length) {
@@ -1,4 +1,4 @@
1
- Spree.ready(function($) {
1
+ document.addEventListener("turbo:load", function() {
2
2
  // Synchronize carousels.
3
3
 
4
4
  var carouselGroupIdentifierAttributeName =
@@ -1,4 +1,4 @@
1
- Spree.ready(function($) {
1
+ document.addEventListener("turbo:load", function() {
2
2
  var deleteAddressLinks = document.querySelectorAll('.js-delete-address-link');
3
3
  if (deleteAddressLinks.length > 0) {
4
4
  deleteAddressLinks.forEach(function(deleteLink) {
@@ -1,4 +1,4 @@
1
- Spree.ready(function($) {
1
+ document.addEventListener("turbo:load", function() {
2
2
 
3
3
  function MobileNavigationManager() {
4
4
  this.mobileNavigation = document.querySelector('.mobile-navigation');
@@ -1,4 +1,4 @@
1
- Spree.ready(function($) {
1
+ document.addEventListener("turbo:load", function() {
2
2
  var quantitySelectSelector = '.quantity-select'
3
3
  var quantitySelectDecreaseSelector = '.quantity-select-decrease'
4
4
  var quantitySelectIncreaseSelector = '.quantity-select-increase'
@@ -3,6 +3,6 @@ window.lazySizesConfig.loadMode = 1
3
3
  window.lazySizesConfig.init = false
4
4
  window.lazySizesConfig.loadHidden = false
5
5
 
6
- Spree.ready(function ($) {
6
+ document.addEventListener("turbo:load", function() {
7
7
  window.lazySizes.init()
8
8
  })
@@ -1,6 +1,4 @@
1
1
  .spree-header {
2
- font-size: font-px-to-rem(18px);
3
- text-transform: uppercase;
4
2
  color: theme-color('dark-text');
5
3
  text-align: center;
6
4
 
@@ -1,53 +1,9 @@
1
1
  .spree-flat-input {
2
- color: theme-color("secondary");
3
- transition: basic-transition(border-color);
4
- padding: 15px;
5
- width: 100%;
6
- height: auto;
7
- border-width: 1px;
8
- border-style: solid;
9
- border-color: $second-global-border;
10
- border-radius: 0;
11
- outline: none;
12
- font-size: font-px-to-rem(12px);
13
- line-height: inherit;
14
- appearance: none;
15
- -webkit-appearance: none;
16
- -moz-appearance: none;
17
- @include media-breakpoint-up(sm) {
18
- padding: 25px;
19
- font-size: font-px-to-rem(23px);
20
- }
21
- @include media-breakpoint-up(lg) {
22
- padding: 20px;
23
- font-size: font-px-to-rem(14px);
24
- }
25
- &:focus {
26
- border-color: theme-color("secondary");
27
- }
28
- &::placeholder {
29
- text-transform: uppercase;
30
- }
2
+ @extend .form-control;
31
3
  }
32
4
 
33
5
  .spree-flat-select {
34
- @extend .spree-flat-input;
35
- appearance: none;
36
- padding-top:22px;
37
- padding-bottom:21px;
38
- -webkit-appearance: none;
39
- -moz-appearance: none;
40
- &-arrow {
41
- right: 10px;
42
- top: 50%;
43
- transform: translateY(-50%);
44
- @include media-breakpoint-up(sm) {
45
- right: 23px;
46
- }
47
- @include media-breakpoint-up(lg) {
48
- right: 20px;
49
- }
50
- }
6
+ @extend .custom-select;
51
7
  }
52
8
 
53
9
  .field_with_errors {
@@ -58,12 +14,6 @@
58
14
 
59
15
  .spree-flat-label {
60
16
  color: theme-color("secondary");
61
- text-transform: uppercase;
62
- font-size: font-px-to-rem(12px);
63
-
64
- @include media-breakpoint-up(sm) {
65
- font-size: font-px-to-rem(17px);
66
- }
67
17
  }
68
18
 
69
19
  .spree-checkbox-container {
@@ -80,16 +30,6 @@
80
30
  width: 22px;
81
31
  margin-right: 0.5rem;
82
32
 
83
- @include media-breakpoint-up(sm) {
84
- width: 32px;
85
- height: 32px;
86
- }
87
-
88
- @include media-breakpoint-up(lg) {
89
- width: 22px;
90
- height: 22px;
91
- }
92
-
93
33
  input[type="checkbox"] {
94
34
  opacity: 0;
95
35
  position: absolute;
@@ -105,20 +45,10 @@
105
45
  width: 22px;
106
46
  height: 22px;
107
47
  font-size: 0;
108
- border-radius: 0;
109
- border: 2px solid theme-color("secondary");
48
+ border-radius: $input-border-radius;
49
+ border: 1px solid $input-border-color;
110
50
  background-color: $input-background;
111
51
  cursor: pointer;
112
-
113
- @include media-breakpoint-up(sm) {
114
- width: 32px;
115
- height: 32px;
116
- }
117
-
118
- @include media-breakpoint-up(lg) {
119
- width: 22px;
120
- height: 22px;
121
- }
122
52
  }
123
53
 
124
54
  label:after {
@@ -135,20 +65,6 @@
135
65
  border-top: none;
136
66
  border-right: none;
137
67
  transform: rotate(-45deg);
138
-
139
- @include media-breakpoint-up(sm) {
140
- width: 15px;
141
- height: 10px;
142
- top: 6px;
143
- left: 6px;
144
- }
145
-
146
- @include media-breakpoint-up(lg) {
147
- width: 12px;
148
- height: 8px;
149
- top: 4px;
150
- left: 3px;
151
- }
152
68
  }
153
69
 
154
70
  input[type="checkbox"]:focus + label {
@@ -162,23 +78,6 @@
162
78
  opacity: 1;
163
79
  }
164
80
  }
165
-
166
- @include media-breakpoint-up(lg) {
167
- height: 28px;
168
- width: 28px;
169
-
170
- label {
171
- height: 28px;
172
- width: 28px;
173
- }
174
-
175
- label:after {
176
- width: 14px;
177
- height: 9px;
178
- top: 6px;
179
- left: 5px;
180
- }
181
- }
182
81
  }
183
82
 
184
83
  .spree-checkbox-label {
@@ -202,47 +101,6 @@
202
101
  }
203
102
  }
204
103
 
205
- .spree-btn {
206
- text-transform: uppercase;
207
- letter-spacing: 0.05rem;
208
- font-size: font-px-to-rem(14px);
209
- font-weight: bold;
210
-
211
- &.btn-primary {
212
- font-size: font-px-to-rem(17px);
213
- }
214
-
215
- &.btn-outline-primary {
216
- border-width: 2px;
217
- }
218
-
219
- @include media-breakpoint-up(sm) {
220
- padding-top: 14px;
221
- padding-bottom: 14px;
222
-
223
- &.btn-primary {
224
- font-size: font-px-to-rem(28px);
225
- }
226
-
227
- &.btn-outline-primary {
228
- font-size: font-px-to-rem(28px);
229
- }
230
- }
231
-
232
- @include media-breakpoint-up(lg) {
233
- padding-top: 6px;
234
- padding-bottom: 6px;
235
-
236
- &.btn-primary {
237
- font-size: font-px-to-rem(20px);
238
- }
239
-
240
- &.btn-outline-primary {
241
- font-size: font-px-to-rem(20px);
242
- }
243
- }
244
- }
245
-
246
104
  .spree-radio-label {
247
105
  position: relative;
248
106
  padding-left: 30px;
@@ -1,137 +1 @@
1
- // https://fonts.google.com/specimen/Montserrat?selection.family=Montserrat:400,500,700
2
1
 
3
- /* cyrillic-ext */
4
- @font-face {
5
- font-family: 'Montserrat';
6
- font-style: normal;
7
- font-weight: 400;
8
- font-display: swap;
9
- src: local('Montserrat Regular'), local('Montserrat-Regular'), url(https://fonts.gstatic.com/s/montserrat/v14/JTUSjIg1_i6t8kCHKm459WRhyyTh89ZNpQ.woff2) format('woff2');
10
- unicode-range: U+0460-052F, U+1C80-1C88, U+20B4, U+2DE0-2DFF, U+A640-A69F, U+FE2E-FE2F;
11
- }
12
- /* cyrillic */
13
- @font-face {
14
- font-family: 'Montserrat';
15
- font-style: normal;
16
- font-weight: 400;
17
- font-display: swap;
18
- src: local('Montserrat Regular'), local('Montserrat-Regular'), url(https://fonts.gstatic.com/s/montserrat/v14/JTUSjIg1_i6t8kCHKm459W1hyyTh89ZNpQ.woff2) format('woff2');
19
- unicode-range: U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116;
20
- }
21
- /* vietnamese */
22
- @font-face {
23
- font-family: 'Montserrat';
24
- font-style: normal;
25
- font-weight: 400;
26
- font-display: swap;
27
- src: local('Montserrat Regular'), local('Montserrat-Regular'), url(https://fonts.gstatic.com/s/montserrat/v14/JTUSjIg1_i6t8kCHKm459WZhyyTh89ZNpQ.woff2) format('woff2');
28
- unicode-range: U+0102-0103, U+0110-0111, U+1EA0-1EF9, U+20AB;
29
- }
30
- /* latin-ext */
31
- @font-face {
32
- font-family: 'Montserrat';
33
- font-style: normal;
34
- font-weight: 400;
35
- font-display: swap;
36
- src: local('Montserrat Regular'), local('Montserrat-Regular'), url(https://fonts.gstatic.com/s/montserrat/v14/JTUSjIg1_i6t8kCHKm459WdhyyTh89ZNpQ.woff2) format('woff2');
37
- unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF;
38
- }
39
- /* latin */
40
- @font-face {
41
- font-family: 'Montserrat';
42
- font-style: normal;
43
- font-weight: 400;
44
- font-display: swap;
45
- src: local('Montserrat Regular'), local('Montserrat-Regular'), url(https://fonts.gstatic.com/s/montserrat/v14/JTUSjIg1_i6t8kCHKm459WlhyyTh89Y.woff2) format('woff2');
46
- unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
47
- }
48
- /* cyrillic-ext */
49
- @font-face {
50
- font-family: 'Montserrat';
51
- font-style: normal;
52
- font-weight: 500;
53
- font-display: swap;
54
- src: local('Montserrat Medium'), local('Montserrat-Medium'), url(https://fonts.gstatic.com/s/montserrat/v14/JTURjIg1_i6t8kCHKm45_ZpC3gTD_vx3rCubqg.woff2) format('woff2');
55
- unicode-range: U+0460-052F, U+1C80-1C88, U+20B4, U+2DE0-2DFF, U+A640-A69F, U+FE2E-FE2F;
56
- }
57
- /* cyrillic */
58
- @font-face {
59
- font-family: 'Montserrat';
60
- font-style: normal;
61
- font-weight: 500;
62
- font-display: swap;
63
- src: local('Montserrat Medium'), local('Montserrat-Medium'), url(https://fonts.gstatic.com/s/montserrat/v14/JTURjIg1_i6t8kCHKm45_ZpC3g3D_vx3rCubqg.woff2) format('woff2');
64
- unicode-range: U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116;
65
- }
66
- /* vietnamese */
67
- @font-face {
68
- font-family: 'Montserrat';
69
- font-style: normal;
70
- font-weight: 500;
71
- font-display: swap;
72
- src: local('Montserrat Medium'), local('Montserrat-Medium'), url(https://fonts.gstatic.com/s/montserrat/v14/JTURjIg1_i6t8kCHKm45_ZpC3gbD_vx3rCubqg.woff2) format('woff2');
73
- unicode-range: U+0102-0103, U+0110-0111, U+1EA0-1EF9, U+20AB;
74
- }
75
- /* latin-ext */
76
- @font-face {
77
- font-family: 'Montserrat';
78
- font-style: normal;
79
- font-weight: 500;
80
- font-display: swap;
81
- src: local('Montserrat Medium'), local('Montserrat-Medium'), url(https://fonts.gstatic.com/s/montserrat/v14/JTURjIg1_i6t8kCHKm45_ZpC3gfD_vx3rCubqg.woff2) format('woff2');
82
- unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF;
83
- }
84
- /* latin */
85
- @font-face {
86
- font-family: 'Montserrat';
87
- font-style: normal;
88
- font-weight: 500;
89
- font-display: swap;
90
- src: local('Montserrat Medium'), local('Montserrat-Medium'), url(https://fonts.gstatic.com/s/montserrat/v14/JTURjIg1_i6t8kCHKm45_ZpC3gnD_vx3rCs.woff2) format('woff2');
91
- unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
92
- }
93
- /* cyrillic-ext */
94
- @font-face {
95
- font-family: 'Montserrat';
96
- font-style: normal;
97
- font-weight: 700;
98
- font-display: swap;
99
- src: local('Montserrat Bold'), local('Montserrat-Bold'), url(https://fonts.gstatic.com/s/montserrat/v14/JTURjIg1_i6t8kCHKm45_dJE3gTD_vx3rCubqg.woff2) format('woff2');
100
- unicode-range: U+0460-052F, U+1C80-1C88, U+20B4, U+2DE0-2DFF, U+A640-A69F, U+FE2E-FE2F;
101
- }
102
- /* cyrillic */
103
- @font-face {
104
- font-family: 'Montserrat';
105
- font-style: normal;
106
- font-weight: 700;
107
- font-display: swap;
108
- src: local('Montserrat Bold'), local('Montserrat-Bold'), url(https://fonts.gstatic.com/s/montserrat/v14/JTURjIg1_i6t8kCHKm45_dJE3g3D_vx3rCubqg.woff2) format('woff2');
109
- unicode-range: U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116;
110
- }
111
- /* vietnamese */
112
- @font-face {
113
- font-family: 'Montserrat';
114
- font-style: normal;
115
- font-weight: 700;
116
- font-display: swap;
117
- src: local('Montserrat Bold'), local('Montserrat-Bold'), url(https://fonts.gstatic.com/s/montserrat/v14/JTURjIg1_i6t8kCHKm45_dJE3gbD_vx3rCubqg.woff2) format('woff2');
118
- unicode-range: U+0102-0103, U+0110-0111, U+1EA0-1EF9, U+20AB;
119
- }
120
- /* latin-ext */
121
- @font-face {
122
- font-family: 'Montserrat';
123
- font-style: normal;
124
- font-weight: 700;
125
- font-display: swap;
126
- src: local('Montserrat Bold'), local('Montserrat-Bold'), url(https://fonts.gstatic.com/s/montserrat/v14/JTURjIg1_i6t8kCHKm45_dJE3gfD_vx3rCubqg.woff2) format('woff2');
127
- unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF;
128
- }
129
- /* latin */
130
- @font-face {
131
- font-family: 'Montserrat';
132
- font-style: normal;
133
- font-weight: 700;
134
- font-display: swap;
135
- src: local('Montserrat Bold'), local('Montserrat-Bold'), url(https://fonts.gstatic.com/s/montserrat/v14/JTURjIg1_i6t8kCHKm45_dJE3gnD_vx3rCs.woff2) format('woff2');
136
- unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
137
- }
@@ -1,11 +1,11 @@
1
1
  // main spree variables
2
- $primary-color: #0074c2;
2
+ $primary-color: #000;
3
3
  $secondary-color: #4c4c4c;
4
4
  $primary-background: #ffffff;
5
5
  $secondary-background: #f2f2f2;
6
6
  $input-background: #ffffff;
7
7
  $font-color: black;
8
- $font-family: "Montserrat", sans-serif;
8
+ $font-family: "Inter", "Helvetica Neue", Helvetica, Arial, sans-serif !default;
9
9
  $header-font-color: $font-color;
10
10
  $header-background: $primary-background;
11
11
  $meganav-font-color: $font-color;
@@ -17,8 +17,8 @@ $global-border-style: #e2e2e2;
17
17
  $second-global-border: #e2e2e2;
18
18
  $spree-header-max-width: 1440px;
19
19
  $spree-header-mobile-height: 50px;
20
- $spree-header-tablet-height: 75px;
21
- $spree-header-desktop-height: 75px;
20
+ $spree-header-tablet-height: 50px;
21
+ $spree-header-desktop-height: 50px;
22
22
 
23
23
  // bootstrap overrides
24
24
  $grid-gutter-width: 1rem;
@@ -38,9 +38,23 @@ $theme-colors: (
38
38
  "overlay": rgba(76, 76, 76, 0.5),
39
39
  "shadow": rgba(0, 0, 0, 0.16)
40
40
  );
41
- $enable-rounded: false;
42
- $enable-shadows: false;
43
- $enable-gradients: false;
41
+
42
+ $enable-responsive-font-sizes: true;
43
+ $font-size-base: 0.813rem !default;
44
+ $font-size-plus: 0.875rem !default;
45
+ $font-size-sm: 0.75rem !default;
46
+ $font-size-lg: 1rem !default;
47
+
48
+ $border-radius: 0.5rem !default;
49
+ $border-radius-sm: 0.4rem !default;
50
+ $border-radius-lg: 0.75rem !default;
51
+
52
+ $dropdown-item-padding-y: .5rem !default;
53
+ $dropdown-item-padding-x: 1rem !default;
54
+
55
+ $input-btn-padding-y: .7rem !default;
56
+ $input-btn-padding-x: .75rem !default;
57
+
44
58
  $font-family-sans-serif: $font-family;
45
59
  $font-weight-medium: 500;
46
60
  .font-weight-medium {
@@ -229,9 +229,6 @@
229
229
  }
230
230
 
231
231
  &-field {
232
- input::-webkit-input-placeholder {
233
- text-transform: uppercase;
234
- }
235
232
  @include media-breakpoint-up(sm) {
236
233
  margin-top: 33px;
237
234
  }
@@ -38,7 +38,7 @@ body {
38
38
 
39
39
  .form-control,
40
40
  .form-control:focus,
41
- .spree-flat-input {
41
+ .form-control {
42
42
  background: $input-background;
43
43
  color: color-yiq($input-background);
44
44
  }
@@ -91,19 +91,10 @@
91
91
  padding-right: 16px;
92
92
  }
93
93
  }
94
- &:last-child {
95
- @include media-breakpoint-up(lg) {
96
- padding: 40px 0 22px 16px;
97
- }
98
- }
99
94
  border-top: none;
100
95
  border-bottom: 1px solid $global-border-style;
101
96
  padding: 22px 0;
102
97
  vertical-align: top;
103
- @include media-breakpoint-up(lg) {
104
- padding: 22px 50px 0 0;
105
- vertical-align: middle;
106
- }
107
98
  }
108
99
  }
109
100
  }
@@ -153,19 +144,8 @@
153
144
  }
154
145
 
155
146
  .item-details {
156
- text-transform: uppercase;
157
- font-size: font-px-to-rem(12px);
158
147
  font-weight: 500;
159
148
  line-height: 1.4;
160
- @include media-breakpoint-up(sm) {
161
- font-size: font-px-to-rem(14px);
162
- margin-top: 3px;
163
- margin-bottom: 3px;
164
- }
165
- @include media-breakpoint-up(lg) {
166
- font-size: font-px-to-rem(12px);
167
- margin: 0;
168
- }
169
149
  }
170
150
  }
171
151
  &-price {
@@ -131,7 +131,7 @@
131
131
  font-size: font-px-to-rem(16px);
132
132
  font-weight: 500;
133
133
  &--selected {
134
- border: solid 2px $secondary-color;
134
+ border: solid 1px $secondary-color;
135
135
  }
136
136
  }
137
137
  }
@@ -308,7 +308,7 @@
308
308
  color: $font-color;
309
309
  font-size: font-px-to-rem(13px);
310
310
  &--selected {
311
- border: solid 2px $secondary-color;
311
+ border: solid 1px $secondary-color;
312
312
  }
313
313
  }
314
314
  &:last-of-type {
@@ -142,15 +142,6 @@
142
142
  }
143
143
 
144
144
  .product-description {
145
- font-size: font-px-to-rem(12px);
146
- @include media-breakpoint-up(sm) {
147
- font-size: font-px-to-rem(16px);
148
- }
149
- @include media-breakpoint-up(md) {
150
- font-size: font-px-to-rem(14px);
151
- line-height: font-px-to-rem(26px);
152
- }
153
-
154
145
  &-arrow {
155
146
  width: 44px;
156
147
  height: 44px;
@@ -161,17 +152,6 @@
161
152
  }
162
153
  }
163
154
 
164
- .product-properies {
165
- font-size: font-px-to-rem(12px);
166
- @include media-breakpoint-up(sm) {
167
- font-size: font-px-to-rem(16px);
168
- }
169
- @include media-breakpoint-up(md) {
170
- font-size: font-px-to-rem(14px);
171
- line-height: font-px-to-rem(26px);
172
- }
173
- }
174
-
175
155
  #product-details {
176
156
  .breadcrumb-item:last-of-type {
177
157
  display: none;