solidus_backend 2.4.2 → 2.5.0.beta1

Sign up to get free protection for your applications and to get access to all the features.

Potentially problematic release.


This version of solidus_backend might be problematic. Click here for more details.

Files changed (505) hide show
  1. checksums.yaml +5 -5
  2. data/README.md +7 -7
  3. data/Rakefile +19 -13
  4. data/app/assets/javascripts/spree/backend.js +5 -17
  5. data/app/assets/javascripts/spree/backend/adjustments.js +26 -0
  6. data/app/assets/javascripts/spree/backend/admin.js +14 -78
  7. data/app/assets/javascripts/spree/backend/backbone-overrides.js +25 -0
  8. data/app/assets/javascripts/spree/backend/calculator.js +1 -1
  9. data/app/assets/javascripts/spree/backend/checkouts/edit.js +1 -1
  10. data/app/assets/javascripts/spree/backend/collections/index.js +1 -0
  11. data/app/assets/javascripts/spree/backend/collections/shipments.js +6 -0
  12. data/app/assets/javascripts/spree/backend/components/editable_table.js +5 -0
  13. data/app/assets/javascripts/spree/backend/components/number_with_currency.js +1 -1
  14. data/app/assets/javascripts/spree/backend/components/sortable_table.js +29 -0
  15. data/app/assets/javascripts/spree/backend/components/tabs.js +67 -0
  16. data/app/assets/javascripts/spree/backend/components/tooltips.js +19 -24
  17. data/app/assets/javascripts/spree/backend/datepicker.js +55 -0
  18. data/app/assets/javascripts/spree/backend/flash.js +20 -0
  19. data/app/assets/javascripts/spree/backend/gateway.js +22 -0
  20. data/app/assets/javascripts/spree/backend/handlebars_extensions.js +8 -0
  21. data/app/assets/javascripts/spree/backend/images/index.js +8 -0
  22. data/app/assets/javascripts/spree/backend/models/index.js +3 -0
  23. data/app/assets/javascripts/spree/backend/models/line_item.js +4 -0
  24. data/app/assets/javascripts/spree/backend/models/order.js +2 -1
  25. data/app/assets/javascripts/spree/backend/models/payment.js +5 -0
  26. data/app/assets/javascripts/spree/backend/models/shipment.js +27 -0
  27. data/app/assets/javascripts/spree/backend/models/stock_item.js +6 -0
  28. data/app/assets/javascripts/spree/backend/namespaces.js +5 -1
  29. data/app/assets/javascripts/spree/backend/navigation.js +14 -0
  30. data/app/assets/javascripts/spree/backend/option_type_autocomplete.js +1 -1
  31. data/app/assets/javascripts/spree/backend/option_value_picker.js +1 -0
  32. data/app/assets/javascripts/spree/backend/orders/cart.js +1 -1
  33. data/app/assets/javascripts/spree/backend/orders/edit.js +2 -2
  34. data/app/assets/javascripts/spree/backend/payments/edit.js +16 -0
  35. data/app/assets/javascripts/spree/backend/payments/new.js +1 -1
  36. data/app/assets/javascripts/spree/backend/product_picker.js +1 -1
  37. data/app/assets/javascripts/spree/backend/progress.js +9 -0
  38. data/app/assets/javascripts/spree/backend/promotions.js +35 -0
  39. data/app/assets/javascripts/spree/backend/promotions/activation.js +1 -1
  40. data/app/assets/javascripts/spree/backend/returns/return_item_selection.js +1 -1
  41. data/app/assets/javascripts/spree/backend/routes.js +0 -12
  42. data/app/assets/javascripts/spree/backend/shipments.js +35 -68
  43. data/app/assets/javascripts/spree/backend/stock_location.js +23 -0
  44. data/app/assets/javascripts/spree/backend/stock_management.js +22 -0
  45. data/app/assets/javascripts/spree/backend/store_credits.js +25 -0
  46. data/app/assets/javascripts/spree/backend/style_guide.js +3 -0
  47. data/app/assets/javascripts/spree/backend/taxon_autocomplete.js +1 -1
  48. data/app/assets/javascripts/spree/backend/taxonomy.js +121 -0
  49. data/app/assets/javascripts/spree/backend/taxons.js +75 -0
  50. data/app/assets/javascripts/spree/backend/templates/index.js +2 -2
  51. data/app/assets/javascripts/spree/backend/templates/orders/line_item.hbs +7 -5
  52. data/app/assets/javascripts/spree/backend/templates/orders/shipment_tracking.hbs +24 -0
  53. data/app/assets/javascripts/spree/backend/templates/orders/shipping_method.hbs +34 -0
  54. data/app/assets/javascripts/spree/backend/templates/promotions/calculators/fields/tiered_flat_rate.hbs +7 -3
  55. data/app/assets/javascripts/spree/backend/templates/promotions/calculators/fields/tiered_percent.hbs +6 -2
  56. data/app/assets/javascripts/spree/backend/templates/stock_items/stock_location_stock_item.hbs +3 -1
  57. data/app/assets/javascripts/spree/backend/templates/variants/autocomplete_stock.hbs +10 -5
  58. data/app/assets/javascripts/spree/backend/templates/variants/split.hbs +5 -3
  59. data/app/assets/javascripts/spree/backend/translation.js +11 -0
  60. data/app/assets/javascripts/spree/backend/turbolinks-integration.js +21 -0
  61. data/app/assets/javascripts/spree/backend/user_picker.js +1 -1
  62. data/app/assets/javascripts/spree/backend/variant_autocomplete.js +60 -0
  63. data/app/assets/javascripts/spree/backend/views/calculators/tiered.js +54 -0
  64. data/app/assets/javascripts/spree/backend/views/cart/line_item_row.js +2 -1
  65. data/app/assets/javascripts/spree/backend/views/index.js +7 -0
  66. data/app/assets/javascripts/spree/backend/views/order/shipment_tracking.js +46 -0
  67. data/app/assets/javascripts/spree/backend/views/order/shipping_method.js +57 -0
  68. data/app/assets/javascripts/spree/backend/views/payment/payment_row.js +36 -0
  69. data/app/assets/javascripts/spree/backend/views/promotions/option_values_rule.js +79 -0
  70. data/app/assets/javascripts/spree/backend/views/state_select.js +6 -6
  71. data/app/assets/javascripts/spree/backend/views/stock/add_stock_item.js +63 -0
  72. data/app/assets/javascripts/spree/backend/views/stock/edit_stock_item_row.js +68 -0
  73. data/app/assets/javascripts/spree/backend/views/tables/editable_table.js +15 -0
  74. data/app/assets/javascripts/spree/backend/views/tables/editable_table_row.js +61 -0
  75. data/app/assets/javascripts/spree/backend/zone.js +1 -1
  76. data/app/assets/stylesheets/spree/backend.css +1 -2
  77. data/app/assets/stylesheets/spree/backend/components/_messages.scss +4 -1
  78. data/app/assets/stylesheets/spree/backend/components/_navigation.scss +4 -2
  79. data/app/assets/stylesheets/spree/backend/components/_number_with_currency.scss +8 -2
  80. data/app/assets/stylesheets/spree/backend/components/_progress.scss +4 -0
  81. data/app/assets/stylesheets/spree/backend/components/_tabs.scss +4 -2
  82. data/app/assets/stylesheets/spree/backend/globals/mixins/_line_through.scss +2 -1
  83. data/app/assets/stylesheets/spree/backend/plugins/_select2.scss +32 -7
  84. data/app/assets/stylesheets/spree/backend/plugins/_sortable.scss +3 -0
  85. data/app/assets/stylesheets/spree/backend/sections/_orders.scss +4 -20
  86. data/app/assets/stylesheets/spree/backend/sections/_products.scss +0 -1
  87. data/app/assets/stylesheets/spree/backend/sections/_promotions.scss +15 -7
  88. data/app/assets/stylesheets/spree/backend/sections/_store_credits.scss +17 -6
  89. data/app/assets/stylesheets/spree/backend/sections/_style_guide.scss +8 -4
  90. data/app/assets/stylesheets/spree/backend/sections/_taxonomies.scss +5 -19
  91. data/app/assets/stylesheets/spree/backend/sections/_variants.scss +5 -0
  92. data/app/assets/stylesheets/spree/backend/shared/_forms.scss +13 -17
  93. data/app/assets/stylesheets/spree/backend/shared/_layout.scss +9 -3
  94. data/app/assets/stylesheets/spree/backend/shared/_tables.scss +3 -27
  95. data/app/assets/stylesheets/spree/backend/spree_admin.scss +2 -6
  96. data/app/controllers/spree/admin/base_controller.rb +2 -3
  97. data/app/controllers/spree/admin/cancellations_controller.rb +3 -3
  98. data/app/controllers/spree/admin/images_controller.rb +1 -1
  99. data/app/controllers/spree/admin/option_types_controller.rb +1 -2
  100. data/app/controllers/spree/admin/orders/customer_details_controller.rb +2 -2
  101. data/app/controllers/spree/admin/orders_controller.rb +11 -11
  102. data/app/controllers/spree/admin/payment_methods_controller.rb +5 -6
  103. data/app/controllers/spree/admin/payments_controller.rb +5 -5
  104. data/app/controllers/spree/admin/products_controller.rb +4 -6
  105. data/app/controllers/spree/admin/promotion_actions_controller.rb +4 -4
  106. data/app/controllers/spree/admin/promotion_rules_controller.rb +3 -3
  107. data/app/controllers/spree/admin/promotions_controller.rb +5 -1
  108. data/app/controllers/spree/admin/reports_controller.rb +2 -2
  109. data/app/controllers/spree/admin/resource_controller.rb +17 -5
  110. data/app/controllers/spree/admin/return_authorizations_controller.rb +2 -2
  111. data/app/controllers/spree/admin/shipping_methods_controller.rb +1 -1
  112. data/app/controllers/spree/admin/stock_locations_controller.rb +1 -1
  113. data/app/controllers/spree/admin/store_credits_controller.rb +4 -4
  114. data/app/controllers/spree/admin/taxons_controller.rb +1 -1
  115. data/app/controllers/spree/admin/users_controller.rb +6 -6
  116. data/app/controllers/spree/admin/variants_controller.rb +0 -16
  117. data/app/helpers/spree/admin/adjustments_helper.rb +2 -2
  118. data/app/helpers/spree/admin/base_helper.rb +5 -11
  119. data/app/helpers/spree/admin/navigation_helper.rb +8 -8
  120. data/app/helpers/spree/admin/orders_helper.rb +2 -2
  121. data/app/helpers/spree/admin/products_helper.rb +0 -24
  122. data/app/helpers/spree/admin/store_credit_events_helper.rb +5 -5
  123. data/app/models/spree/backend_configuration.rb +1 -2
  124. data/app/views/spree/admin/adjustment_reasons/edit.html.erb +2 -2
  125. data/app/views/spree/admin/adjustment_reasons/index.html.erb +5 -5
  126. data/app/views/spree/admin/adjustment_reasons/new.html.erb +3 -3
  127. data/app/views/spree/admin/adjustments/_adjustments_table.html.erb +2 -2
  128. data/app/views/spree/admin/adjustments/_form.html.erb +1 -1
  129. data/app/views/spree/admin/adjustments/edit.html.erb +3 -3
  130. data/app/views/spree/admin/adjustments/index.html.erb +3 -3
  131. data/app/views/spree/admin/adjustments/new.html.erb +3 -3
  132. data/app/views/spree/admin/cancellations/index.html.erb +3 -3
  133. data/app/views/spree/admin/customer_returns/_reimbursements_table.html.erb +2 -2
  134. data/app/views/spree/admin/customer_returns/_return_item_decision.html.erb +7 -7
  135. data/app/views/spree/admin/customer_returns/_return_item_selection.html.erb +2 -2
  136. data/app/views/spree/admin/customer_returns/edit.html.erb +7 -7
  137. data/app/views/spree/admin/customer_returns/index.html.erb +4 -4
  138. data/app/views/spree/admin/customer_returns/new.html.erb +11 -11
  139. data/app/views/spree/admin/images/_image_row.html.erb +3 -3
  140. data/app/views/spree/admin/images/_new.html.erb +12 -0
  141. data/app/views/spree/admin/images/edit.html.erb +4 -4
  142. data/app/views/spree/admin/images/index.html.erb +7 -5
  143. data/app/views/spree/admin/images/new.html.erb +1 -12
  144. data/app/views/spree/admin/log_entries/index.html.erb +2 -2
  145. data/app/views/spree/admin/option_types/_option_value_fields.html.erb +1 -1
  146. data/app/views/spree/admin/option_types/edit.html.erb +1 -1
  147. data/app/views/spree/admin/option_types/index.html.erb +2 -2
  148. data/app/views/spree/admin/option_types/new.html.erb +1 -1
  149. data/app/views/spree/admin/orders/_add_product.html.erb +2 -2
  150. data/app/views/spree/admin/orders/_carton.html.erb +8 -8
  151. data/app/views/spree/admin/orders/_carton_manifest.html.erb +1 -1
  152. data/app/views/spree/admin/orders/_order_details.html.erb +4 -4
  153. data/app/views/spree/admin/orders/_risk_analysis.html.erb +10 -10
  154. data/app/views/spree/admin/orders/_shipment.html.erb +11 -69
  155. data/app/views/spree/admin/orders/_shipment_manifest.html.erb +3 -3
  156. data/app/views/spree/admin/orders/cart.html.erb +2 -2
  157. data/app/views/spree/admin/orders/confirm.html.erb +6 -6
  158. data/app/views/spree/admin/orders/confirm/_customer_details.html.erb +3 -3
  159. data/app/views/spree/admin/orders/confirm/_payments.html.erb +1 -1
  160. data/app/views/spree/admin/orders/confirm/_shipment.html.erb +2 -2
  161. data/app/views/spree/admin/orders/confirm/_shipment_manifest.html.erb +1 -1
  162. data/app/views/spree/admin/orders/confirm_advance.html.erb +3 -3
  163. data/app/views/spree/admin/orders/customer_details/_form.html.erb +19 -13
  164. data/app/views/spree/admin/orders/customer_details/edit.html.erb +2 -2
  165. data/app/views/spree/admin/orders/customer_details/show.html.erb +7 -7
  166. data/app/views/spree/admin/orders/edit.html.erb +2 -2
  167. data/app/views/spree/admin/orders/index.html.erb +30 -28
  168. data/app/views/spree/admin/payment_methods/_form.html.erb +24 -13
  169. data/app/views/spree/admin/payment_methods/edit.html.erb +2 -2
  170. data/app/views/spree/admin/payment_methods/index.html.erb +6 -6
  171. data/app/views/spree/admin/payment_methods/new.html.erb +3 -3
  172. data/app/views/spree/admin/payments/_capture_events.html.erb +2 -2
  173. data/app/views/spree/admin/payments/_list.html.erb +33 -13
  174. data/app/views/spree/admin/payments/credit.html.erb +1 -1
  175. data/app/views/spree/admin/payments/index.html.erb +3 -3
  176. data/app/views/spree/admin/payments/new.html.erb +4 -4
  177. data/app/views/spree/admin/payments/show.html.erb +2 -2
  178. data/app/views/spree/admin/payments/source_forms/_gateway.html.erb +22 -23
  179. data/app/views/spree/admin/payments/source_views/_gateway.html.erb +1 -1
  180. data/app/views/spree/admin/payments/source_views/_storecredit.html.erb +1 -1
  181. data/app/views/spree/admin/prices/_form.html.erb +1 -2
  182. data/app/views/spree/admin/prices/edit.html.erb +1 -1
  183. data/app/views/spree/admin/prices/index.html.erb +2 -2
  184. data/app/views/spree/admin/prices/new.html.erb +1 -1
  185. data/app/views/spree/admin/product_properties/_product_property_fields.html.erb +1 -1
  186. data/app/views/spree/admin/product_properties/index.html.erb +7 -14
  187. data/app/views/spree/admin/products/_form.html.erb +17 -14
  188. data/app/views/spree/admin/products/edit.html.erb +2 -2
  189. data/app/views/spree/admin/products/index.html.erb +6 -6
  190. data/app/views/spree/admin/products/new.html.erb +5 -59
  191. data/app/views/spree/admin/promotion_categories/index.html.erb +1 -1
  192. data/app/views/spree/admin/promotion_categories/new.html.erb +1 -1
  193. data/app/views/spree/admin/promotion_code_batches/index.html.erb +8 -8
  194. data/app/views/spree/admin/promotion_code_batches/new.html.erb +1 -1
  195. data/app/views/spree/admin/promotion_codes/index.html.erb +1 -1
  196. data/app/views/spree/admin/promotions/_actions.html.erb +6 -6
  197. data/app/views/spree/admin/promotions/_form.html.erb +13 -4
  198. data/app/views/spree/admin/promotions/_promotion_rule.html.erb +1 -1
  199. data/app/views/spree/admin/promotions/_rules.html.erb +8 -8
  200. data/app/views/spree/admin/promotions/actions/_create_quantity_adjustments.html.erb +4 -10
  201. data/app/views/spree/admin/promotions/actions/_promotion_calculators_with_custom_fields.html.erb +25 -29
  202. data/app/views/spree/admin/promotions/calculators/_default_fields.html.erb +5 -4
  203. data/app/views/spree/admin/promotions/calculators/distributed_amount/_fields.html.erb +6 -4
  204. data/app/views/spree/admin/promotions/calculators/flat_rate/_fields.html.erb +6 -4
  205. data/app/views/spree/admin/promotions/calculators/tiered_flat_rate/_fields.html.erb +5 -5
  206. data/app/views/spree/admin/promotions/calculators/tiered_percent/_fields.html.erb +5 -5
  207. data/app/views/spree/admin/promotions/edit.html.erb +1 -1
  208. data/app/views/spree/admin/promotions/index.html.erb +7 -7
  209. data/app/views/spree/admin/promotions/new.html.erb +1 -1
  210. data/app/views/spree/admin/promotions/rules/_item_total.html.erb +10 -12
  211. data/app/views/spree/admin/promotions/rules/_nth_order.html.erb +8 -10
  212. data/app/views/spree/admin/promotions/rules/_option_value.html.erb +10 -14
  213. data/app/views/spree/admin/promotions/rules/_product.html.erb +12 -10
  214. data/app/views/spree/admin/promotions/rules/_taxon.html.erb +9 -15
  215. data/app/views/spree/admin/promotions/rules/_user.html.erb +3 -5
  216. data/app/views/spree/admin/promotions/rules/_user_role.html.erb +3 -3
  217. data/app/views/spree/admin/properties/index.html.erb +5 -5
  218. data/app/views/spree/admin/properties/new.html.erb +1 -1
  219. data/app/views/spree/admin/refund_reasons/edit.html.erb +2 -2
  220. data/app/views/spree/admin/refund_reasons/index.html.erb +5 -5
  221. data/app/views/spree/admin/refund_reasons/new.html.erb +3 -3
  222. data/app/views/spree/admin/refund_reasons/shared/_form.html.erb +1 -1
  223. data/app/views/spree/admin/refunds/edit.html.erb +3 -3
  224. data/app/views/spree/admin/refunds/new.html.erb +4 -4
  225. data/app/views/spree/admin/reimbursement_types/index.html.erb +2 -2
  226. data/app/views/spree/admin/reimbursements/edit.html.erb +9 -9
  227. data/app/views/spree/admin/reimbursements/index.html.erb +4 -4
  228. data/app/views/spree/admin/reimbursements/show.html.erb +4 -4
  229. data/app/views/spree/admin/reports/index.html.erb +3 -3
  230. data/app/views/spree/admin/reports/sales_total.html.erb +7 -7
  231. data/app/views/spree/admin/return_authorizations/_form.html.erb +3 -3
  232. data/app/views/spree/admin/return_authorizations/edit.html.erb +5 -5
  233. data/app/views/spree/admin/return_authorizations/index.html.erb +4 -4
  234. data/app/views/spree/admin/return_authorizations/new.html.erb +3 -3
  235. data/app/views/spree/admin/return_reasons/edit.html.erb +2 -2
  236. data/app/views/spree/admin/return_reasons/index.html.erb +3 -3
  237. data/app/views/spree/admin/return_reasons/new.html.erb +3 -3
  238. data/app/views/spree/admin/shared/_address_form.html.erb +2 -0
  239. data/app/views/spree/admin/shared/_calculator_fields.html.erb +4 -3
  240. data/app/views/spree/admin/shared/_edit_resource_links.html.erb +2 -2
  241. data/app/views/spree/admin/shared/_head.html.erb +13 -5
  242. data/app/views/spree/admin/shared/_js_locale_data.html.erb +24 -32
  243. data/app/views/spree/admin/shared/_navigation_footer.html.erb +32 -2
  244. data/app/views/spree/admin/shared/_new_resource_links.html.erb +2 -2
  245. data/app/views/spree/admin/shared/_no_objects_found.html.erb +2 -2
  246. data/app/views/spree/admin/shared/_number_with_currency.html.erb +9 -5
  247. data/app/views/spree/admin/shared/_order_submenu.html.erb +6 -6
  248. data/app/views/spree/admin/shared/_order_summary.html.erb +5 -5
  249. data/app/views/spree/admin/shared/_order_tabs.html.erb +1 -1
  250. data/app/views/spree/admin/shared/_product_tabs.html.erb +3 -3
  251. data/app/views/spree/admin/shared/_rebuild_vat_prices_checkbox.html.erb +2 -2
  252. data/app/views/spree/admin/shared/_refunds.html.erb +2 -2
  253. data/app/views/spree/admin/shared/_report_order_criteria.html.erb +8 -6
  254. data/app/views/spree/admin/shared/_spinner.html.erb +1 -1
  255. data/app/views/spree/admin/shared/_variant_search.html.erb +3 -3
  256. data/app/views/spree/admin/shared/named_types/_form.html.erb +4 -2
  257. data/app/views/spree/admin/shared/named_types/_index.html.erb +4 -4
  258. data/app/views/spree/admin/shared/preference_fields/_boolean.html.erb +9 -8
  259. data/app/views/spree/admin/shipping_categories/edit.html.erb +3 -3
  260. data/app/views/spree/admin/shipping_categories/index.html.erb +5 -5
  261. data/app/views/spree/admin/shipping_categories/new.html.erb +3 -3
  262. data/app/views/spree/admin/shipping_methods/_form.html.erb +10 -8
  263. data/app/views/spree/admin/shipping_methods/edit.html.erb +2 -2
  264. data/app/views/spree/admin/shipping_methods/index.html.erb +5 -5
  265. data/app/views/spree/admin/shipping_methods/new.html.erb +3 -3
  266. data/app/views/spree/admin/stock_items/_stock_management.html.erb +7 -7
  267. data/app/views/spree/admin/stock_items/index.html.erb +4 -4
  268. data/app/views/spree/admin/stock_locations/_form.html.erb +105 -103
  269. data/app/views/spree/admin/stock_locations/edit.html.erb +4 -6
  270. data/app/views/spree/admin/stock_locations/index.html.erb +5 -11
  271. data/app/views/spree/admin/stock_locations/new.html.erb +5 -7
  272. data/app/views/spree/admin/stock_movements/index.html.erb +3 -3
  273. data/app/views/spree/admin/store_credits/_form.html.erb +3 -3
  274. data/app/views/spree/admin/store_credits/_update_reason_field.html.erb +7 -8
  275. data/app/views/spree/admin/store_credits/edit_amount.html.erb +10 -6
  276. data/app/views/spree/admin/store_credits/edit_validity.html.erb +7 -5
  277. data/app/views/spree/admin/store_credits/index.html.erb +13 -13
  278. data/app/views/spree/admin/store_credits/new.html.erb +2 -2
  279. data/app/views/spree/admin/store_credits/show.html.erb +24 -32
  280. data/app/views/spree/admin/stores/_form.html.erb +1 -1
  281. data/app/views/spree/admin/stores/edit.html.erb +1 -1
  282. data/app/views/spree/admin/stores/index.html.erb +1 -1
  283. data/app/views/spree/admin/stores/new.html.erb +1 -1
  284. data/app/views/spree/admin/style_guide/topics/forms/_building_forms.html.erb +5 -3
  285. data/app/views/spree/admin/style_guide/topics/messaging/_loading.html.erb +1 -1
  286. data/app/views/spree/admin/tax_categories/_form.html.erb +4 -2
  287. data/app/views/spree/admin/tax_categories/edit.html.erb +2 -2
  288. data/app/views/spree/admin/tax_categories/index.html.erb +5 -5
  289. data/app/views/spree/admin/tax_categories/new.html.erb +3 -3
  290. data/app/views/spree/admin/tax_rates/_form.html.erb +17 -11
  291. data/app/views/spree/admin/tax_rates/edit.html.erb +2 -2
  292. data/app/views/spree/admin/tax_rates/index.html.erb +8 -8
  293. data/app/views/spree/admin/tax_rates/new.html.erb +3 -3
  294. data/app/views/spree/admin/taxonomies/edit.erb +3 -3
  295. data/app/views/spree/admin/taxonomies/index.html.erb +2 -2
  296. data/app/views/spree/admin/taxonomies/new.html.erb +2 -2
  297. data/app/views/spree/admin/taxons/_form.html.erb +5 -1
  298. data/app/views/spree/admin/taxons/edit.html.erb +4 -4
  299. data/app/views/spree/admin/taxons/index.html.erb +7 -7
  300. data/app/views/spree/admin/users/_addresses_form.html.erb +2 -2
  301. data/app/views/spree/admin/users/_form.html.erb +10 -5
  302. data/app/views/spree/admin/users/_sidebar.html.erb +6 -6
  303. data/app/views/spree/admin/users/_tabs.html.erb +5 -5
  304. data/app/views/spree/admin/users/edit.html.erb +14 -15
  305. data/app/views/spree/admin/users/index.html.erb +14 -12
  306. data/app/views/spree/admin/users/items.html.erb +7 -7
  307. data/app/views/spree/admin/users/new.html.erb +1 -1
  308. data/app/views/spree/admin/users/orders.html.erb +7 -7
  309. data/app/views/spree/admin/variants/_form.html.erb +2 -2
  310. data/app/views/spree/admin/variants/_table.html.erb +2 -2
  311. data/app/views/spree/admin/variants/_table_filter.html.erb +5 -5
  312. data/app/views/spree/admin/variants/index.html.erb +8 -8
  313. data/app/views/spree/admin/variants/new.html.erb +1 -1
  314. data/app/views/spree/admin/zones/_form.html.erb +10 -6
  315. data/app/views/spree/admin/zones/edit.html.erb +1 -1
  316. data/app/views/spree/admin/zones/index.html.erb +3 -3
  317. data/app/views/spree/admin/zones/new.html.erb +2 -2
  318. data/app/views/spree/layouts/admin.html.erb +1 -1
  319. data/app/views/spree/layouts/admin_style_guide.html.erb +2 -2
  320. data/config/routes.rb +1 -11
  321. data/lib/spree/backend.rb +1 -2
  322. data/solidus_backend.gemspec +1 -3
  323. data/spec/controllers/spree/admin/cancellations_controller_spec.rb +3 -3
  324. data/spec/controllers/spree/admin/orders_controller_spec.rb +9 -9
  325. data/spec/controllers/spree/admin/payment_methods_controller_spec.rb +1 -1
  326. data/spec/controllers/spree/admin/prices_controller_spec.rb +2 -2
  327. data/spec/controllers/spree/admin/products_controller_spec.rb +2 -1
  328. data/spec/controllers/spree/admin/promotion_codes_controller_spec.rb +1 -1
  329. data/spec/controllers/spree/admin/promotions_controller_spec.rb +7 -0
  330. data/spec/controllers/spree/admin/reports_controller_spec.rb +1 -1
  331. data/spec/controllers/spree/admin/resource_controller_spec.rb +2 -2
  332. data/spec/controllers/spree/admin/search_controller_spec.rb +1 -1
  333. data/spec/controllers/spree/admin/stock_locations_controller_spec.rb +4 -4
  334. data/spec/controllers/spree/admin/users_controller_spec.rb +1 -1
  335. data/spec/controllers/spree/admin/variants_controller_spec.rb +13 -3
  336. data/spec/features/admin/configuration/payment_methods_spec.rb +55 -16
  337. data/spec/features/admin/configuration/shipping_methods_spec.rb +40 -0
  338. data/spec/features/admin/homepage_spec.rb +25 -8
  339. data/spec/features/admin/orders/adjustments_spec.rb +2 -2
  340. data/spec/features/admin/orders/customer_details_spec.rb +24 -9
  341. data/spec/features/admin/orders/listing_spec.rb +6 -9
  342. data/spec/features/admin/orders/log_entries_spec.rb +0 -1
  343. data/spec/features/admin/orders/new_order_spec.rb +8 -2
  344. data/spec/features/admin/orders/order_details_spec.rb +116 -74
  345. data/spec/features/admin/orders/payments_spec.rb +7 -10
  346. data/spec/features/admin/orders/shipments_spec.rb +9 -5
  347. data/spec/features/admin/payments/store_credits_spec.rb +2 -2
  348. data/spec/features/admin/products/edit/images_spec.rb +0 -79
  349. data/spec/features/admin/products/products_spec.rb +3 -6
  350. data/spec/features/admin/products/variant_spec.rb +17 -0
  351. data/spec/features/admin/promotion_adjustments_spec.rb +105 -52
  352. data/spec/features/admin/promotions/option_value_rule_spec.rb +6 -3
  353. data/spec/features/admin/promotions/tiered_calculator_spec.rb +4 -2
  354. data/spec/features/admin/users_spec.rb +14 -11
  355. data/spec/javascripts/translation_spec.js +8 -0
  356. data/spec/javascripts/views/number_with_currency_spec.js +6 -6
  357. data/spec/spec_helper.rb +28 -37
  358. data/spec/teaspoon_env.rb +61 -14
  359. data/spec/views/spree/admin/shared/navigation_footer_spec.rb +41 -0
  360. data/vendor/assets/javascripts/solidus_admin/Sortable.js +1540 -0
  361. data/vendor/assets/javascripts/solidus_admin/bootstrap.js +1878 -1816
  362. data/vendor/assets/javascripts/solidus_admin/flatpickr/flatpickr.js +2218 -0
  363. data/vendor/assets/javascripts/solidus_admin/select2_locales/select2_locale_es-MX.js +19 -0
  364. data/vendor/assets/stylesheets/solidus_admin/bootstrap/_alert.scss +7 -4
  365. data/vendor/assets/stylesheets/solidus_admin/bootstrap/_badge.scss +1 -2
  366. data/vendor/assets/stylesheets/solidus_admin/bootstrap/_breadcrumb.scss +4 -4
  367. data/vendor/assets/stylesheets/solidus_admin/bootstrap/_button-group.scss +32 -64
  368. data/vendor/assets/stylesheets/solidus_admin/bootstrap/_buttons.scss +38 -36
  369. data/vendor/assets/stylesheets/solidus_admin/bootstrap/_card.scss +78 -31
  370. data/vendor/assets/stylesheets/solidus_admin/bootstrap/_carousel.scss +6 -0
  371. data/vendor/assets/stylesheets/solidus_admin/bootstrap/_close.scss +8 -3
  372. data/vendor/assets/stylesheets/solidus_admin/bootstrap/_code.scss +4 -12
  373. data/vendor/assets/stylesheets/solidus_admin/bootstrap/_custom-forms.scss +132 -89
  374. data/vendor/assets/stylesheets/solidus_admin/bootstrap/_dropdown.scss +46 -43
  375. data/vendor/assets/stylesheets/solidus_admin/bootstrap/_forms.scss +47 -104
  376. data/vendor/assets/stylesheets/solidus_admin/bootstrap/_functions.scss +8 -12
  377. data/vendor/assets/stylesheets/solidus_admin/bootstrap/_grid.scss +0 -1
  378. data/vendor/assets/stylesheets/solidus_admin/bootstrap/_images.scss +0 -1
  379. data/vendor/assets/stylesheets/solidus_admin/bootstrap/_input-group.scss +103 -120
  380. data/vendor/assets/stylesheets/solidus_admin/bootstrap/_list-group.scss +2 -1
  381. data/vendor/assets/stylesheets/solidus_admin/bootstrap/_mixins.scss +1 -0
  382. data/vendor/assets/stylesheets/solidus_admin/bootstrap/_modal.scss +36 -10
  383. data/vendor/assets/stylesheets/solidus_admin/bootstrap/_nav.scss +7 -7
  384. data/vendor/assets/stylesheets/solidus_admin/bootstrap/_navbar.scss +35 -8
  385. data/vendor/assets/stylesheets/solidus_admin/bootstrap/_pagination.scss +33 -22
  386. data/vendor/assets/stylesheets/solidus_admin/bootstrap/_popover.scss +106 -118
  387. data/vendor/assets/stylesheets/solidus_admin/bootstrap/_print.scss +19 -6
  388. data/vendor/assets/stylesheets/solidus_admin/bootstrap/_progress.scss +5 -4
  389. data/vendor/assets/stylesheets/solidus_admin/bootstrap/_reboot.scss +39 -38
  390. data/vendor/assets/stylesheets/solidus_admin/bootstrap/_root.scss +19 -0
  391. data/vendor/assets/stylesheets/solidus_admin/bootstrap/_tables.scss +40 -28
  392. data/vendor/assets/stylesheets/solidus_admin/bootstrap/_tooltip.scss +65 -57
  393. data/vendor/assets/stylesheets/solidus_admin/bootstrap/_transitions.scss +2 -0
  394. data/vendor/assets/stylesheets/solidus_admin/bootstrap/_type.scss +4 -2
  395. data/vendor/assets/stylesheets/solidus_admin/bootstrap/_variables.scss +546 -489
  396. data/vendor/assets/stylesheets/solidus_admin/bootstrap/bootstrap-grid.scss +8 -13
  397. data/vendor/assets/stylesheets/solidus_admin/bootstrap/bootstrap-reboot.scss +7 -4
  398. data/vendor/assets/stylesheets/solidus_admin/bootstrap/bootstrap.scss +5 -4
  399. data/vendor/assets/stylesheets/solidus_admin/bootstrap/mixins/_alert.scss +1 -1
  400. data/vendor/assets/stylesheets/solidus_admin/bootstrap/mixins/_background-variant.scss +10 -1
  401. data/vendor/assets/stylesheets/solidus_admin/bootstrap/mixins/_badge.scss +2 -2
  402. data/vendor/assets/stylesheets/solidus_admin/bootstrap/mixins/_breakpoints.scss +25 -7
  403. data/vendor/assets/stylesheets/solidus_admin/bootstrap/mixins/_buttons.scss +50 -24
  404. data/vendor/assets/stylesheets/solidus_admin/bootstrap/mixins/_caret.scss +65 -0
  405. data/vendor/assets/stylesheets/solidus_admin/bootstrap/mixins/_float.scss +2 -0
  406. data/vendor/assets/stylesheets/solidus_admin/bootstrap/mixins/_forms.scss +72 -16
  407. data/vendor/assets/stylesheets/solidus_admin/bootstrap/mixins/_gradients.scss +8 -0
  408. data/vendor/assets/stylesheets/solidus_admin/bootstrap/mixins/_grid-framework.scss +15 -4
  409. data/vendor/assets/stylesheets/solidus_admin/bootstrap/mixins/_grid.scss +10 -5
  410. data/vendor/assets/stylesheets/solidus_admin/bootstrap/mixins/_hover.scss +25 -46
  411. data/vendor/assets/stylesheets/solidus_admin/bootstrap/mixins/_image.scss +3 -3
  412. data/vendor/assets/stylesheets/solidus_admin/bootstrap/mixins/_list-group.scss +10 -15
  413. data/vendor/assets/stylesheets/solidus_admin/bootstrap/mixins/_navbar-align.scss +2 -1
  414. data/vendor/assets/stylesheets/solidus_admin/bootstrap/mixins/_reset-text.scss +1 -2
  415. data/vendor/assets/stylesheets/solidus_admin/bootstrap/mixins/_screen-reader.scss +3 -3
  416. data/vendor/assets/stylesheets/solidus_admin/bootstrap/mixins/_text-emphasis.scss +2 -0
  417. data/vendor/assets/stylesheets/solidus_admin/bootstrap/mixins/_text-hide.scss +1 -0
  418. data/vendor/assets/stylesheets/solidus_admin/bootstrap/mixins/_visibility.scss +2 -0
  419. data/vendor/assets/stylesheets/solidus_admin/bootstrap/utilities/_align.scss +2 -0
  420. data/vendor/assets/stylesheets/solidus_admin/bootstrap/utilities/_background.scss +16 -3
  421. data/vendor/assets/stylesheets/solidus_admin/bootstrap/utilities/_borders.scss +10 -3
  422. data/vendor/assets/stylesheets/solidus_admin/bootstrap/utilities/_display.scss +13 -28
  423. data/vendor/assets/stylesheets/solidus_admin/bootstrap/utilities/_flex.scss +2 -0
  424. data/vendor/assets/stylesheets/solidus_admin/bootstrap/utilities/_position.scss +12 -1
  425. data/vendor/assets/stylesheets/solidus_admin/bootstrap/utilities/_sizing.scss +2 -0
  426. data/vendor/assets/stylesheets/solidus_admin/bootstrap/utilities/_spacing.scss +24 -14
  427. data/vendor/assets/stylesheets/solidus_admin/bootstrap/utilities/_text.scss +7 -4
  428. data/vendor/assets/stylesheets/solidus_admin/flatpickr/flatpickr.css +857 -0
  429. metadata +57 -127
  430. data/Gemfile +0 -9
  431. data/app/assets/javascripts/spree/backend/address_states.js +0 -35
  432. data/app/assets/javascripts/spree/backend/adjustments.js.coffee +0 -17
  433. data/app/assets/javascripts/spree/backend/backbone-overrides.js.coffee +0 -23
  434. data/app/assets/javascripts/spree/backend/components/editable_table.js.coffee +0 -3
  435. data/app/assets/javascripts/spree/backend/components/tabs.coffee +0 -79
  436. data/app/assets/javascripts/spree/backend/flash.coffee +0 -17
  437. data/app/assets/javascripts/spree/backend/gateway.js.coffee +0 -21
  438. data/app/assets/javascripts/spree/backend/images/index.js.coffee +0 -13
  439. data/app/assets/javascripts/spree/backend/navigation.coffee +0 -10
  440. data/app/assets/javascripts/spree/backend/number_field_updater.coffee +0 -41
  441. data/app/assets/javascripts/spree/backend/payments/edit.js.coffee +0 -33
  442. data/app/assets/javascripts/spree/backend/progress.coffee +0 -7
  443. data/app/assets/javascripts/spree/backend/promotions.js.coffee +0 -99
  444. data/app/assets/javascripts/spree/backend/select_payments.js.coffee +0 -0
  445. data/app/assets/javascripts/spree/backend/states.coffee +0 -22
  446. data/app/assets/javascripts/spree/backend/stock_management/index_add_forms.coffee +0 -61
  447. data/app/assets/javascripts/spree/backend/stock_management/index_update_forms.coffee +0 -66
  448. data/app/assets/javascripts/spree/backend/stock_management/stock_item.coffee +0 -4
  449. data/app/assets/javascripts/spree/backend/stock_transfers/count_update_forms.coffee +0 -44
  450. data/app/assets/javascripts/spree/backend/stock_transfers/edit.coffee +0 -6
  451. data/app/assets/javascripts/spree/backend/stock_transfers/receive.coffee +0 -5
  452. data/app/assets/javascripts/spree/backend/stock_transfers/received_counter.coffee +0 -9
  453. data/app/assets/javascripts/spree/backend/stock_transfers/stock_transfer.coffee +0 -17
  454. data/app/assets/javascripts/spree/backend/stock_transfers/transfer_item.coffee +0 -48
  455. data/app/assets/javascripts/spree/backend/stock_transfers/transfer_item_deleting.coffee +0 -22
  456. data/app/assets/javascripts/spree/backend/stock_transfers/variant_form.coffee +0 -128
  457. data/app/assets/javascripts/spree/backend/store_credits.js.coffee +0 -40
  458. data/app/assets/javascripts/spree/backend/style_guide.coffee +0 -2
  459. data/app/assets/javascripts/spree/backend/taxonomy.js.coffee +0 -108
  460. data/app/assets/javascripts/spree/backend/taxons.js.coffee +0 -73
  461. data/app/assets/javascripts/spree/backend/templates/promotions/rules/option_values_select.hbs +0 -1
  462. data/app/assets/javascripts/spree/backend/templates/stock_transfers/transfer_item.hbs +0 -48
  463. data/app/assets/javascripts/spree/backend/variant_autocomplete.js.coffee +0 -39
  464. data/app/assets/javascripts/spree/backend/views/tables/editable_table.js.coffee +0 -14
  465. data/app/assets/javascripts/spree/backend/views/tables/editable_table_row.js.coffee +0 -45
  466. data/app/assets/stylesheets/spree/backend/components/_date-picker.scss +0 -154
  467. data/app/assets/stylesheets/spree/backend/components/_number_field_update.scss +0 -13
  468. data/app/assets/stylesheets/spree/backend/sections/_stock_transfers.scss +0 -7
  469. data/app/assets/stylesheets/spree/backend/sections/_transfer_items.scss +0 -49
  470. data/app/controllers/spree/admin/stock_transfers_controller.rb +0 -151
  471. data/app/helpers/spree/admin/general_settings_helper.rb +0 -13
  472. data/app/helpers/spree/admin/inventory_settings_helper.rb +0 -9
  473. data/app/helpers/spree/admin/stock_transfers_helper.rb +0 -35
  474. data/app/helpers/spree/admin/tables_helper.rb +0 -13
  475. data/app/helpers/spree/admin/taxons_helper.rb +0 -9
  476. data/app/views/spree/admin/products/new.js.erb +0 -4
  477. data/app/views/spree/admin/promotions/rules/_landing_page.html.erb +0 -7
  478. data/app/views/spree/admin/shared/_number_field_update_actions.html.erb +0 -5
  479. data/app/views/spree/admin/shared/_number_field_update_cell.html.erb +0 -4
  480. data/app/views/spree/admin/shared/_stock_sub_menu.html.erb +0 -8
  481. data/app/views/spree/admin/stock_transfers/_location.html.erb +0 -7
  482. data/app/views/spree/admin/stock_transfers/_transfer_item_actions.html.erb +0 -9
  483. data/app/views/spree/admin/stock_transfers/_transfer_item_table.html.erb +0 -72
  484. data/app/views/spree/admin/stock_transfers/edit.html.erb +0 -52
  485. data/app/views/spree/admin/stock_transfers/index.html.erb +0 -123
  486. data/app/views/spree/admin/stock_transfers/new.html.erb +0 -26
  487. data/app/views/spree/admin/stock_transfers/receive.html.erb +0 -38
  488. data/app/views/spree/admin/stock_transfers/show.html.erb +0 -50
  489. data/app/views/spree/admin/stock_transfers/tracking_info.html.erb +0 -46
  490. data/spec/controllers/spree/admin/stock_transfers_controller_spec.rb +0 -365
  491. data/spec/features/admin/stock_transfer_spec.rb +0 -115
  492. data/vendor/assets/images/jquery-ui/ui-bg_flat_0_aaaaaa_40x100.png +0 -0
  493. data/vendor/assets/images/jquery-ui/ui-bg_flat_0_eeeeee_40x100.png +0 -0
  494. data/vendor/assets/images/jquery-ui/ui-bg_flat_55_ffffff_40x100.png +0 -0
  495. data/vendor/assets/images/jquery-ui/ui-bg_flat_75_ffffff_40x100.png +0 -0
  496. data/vendor/assets/images/jquery-ui/ui-bg_glass_65_ffffff_1x400.png +0 -0
  497. data/vendor/assets/images/jquery-ui/ui-bg_highlight-soft_100_f6f6f6_1x100.png +0 -0
  498. data/vendor/assets/images/jquery-ui/ui-bg_highlight-soft_25_0073ea_1x100.png +0 -0
  499. data/vendor/assets/images/jquery-ui/ui-bg_highlight-soft_50_dddddd_1x100.png +0 -0
  500. data/vendor/assets/images/jquery-ui/ui-icons_0073ea_256x240.png +0 -0
  501. data/vendor/assets/images/jquery-ui/ui-icons_454545_256x240.png +0 -0
  502. data/vendor/assets/images/jquery-ui/ui-icons_666666_256x240.png +0 -0
  503. data/vendor/assets/images/jquery-ui/ui-icons_ff0084_256x240.png +0 -0
  504. data/vendor/assets/images/jquery-ui/ui-icons_ffffff_256x240.png +0 -0
  505. data/vendor/assets/stylesheets/jquery-ui.datepicker.css.erb +0 -357
@@ -90,9 +90,15 @@
90
90
  }
91
91
  .carousel-control-prev {
92
92
  left: 0;
93
+ @if $enable-gradients {
94
+ background: linear-gradient(90deg, rgba(0, 0, 0, .25), rgba(0, 0, 0, .001));
95
+ }
93
96
  }
94
97
  .carousel-control-next {
95
98
  right: 0;
99
+ @if $enable-gradients {
100
+ background: linear-gradient(270deg, rgba(0, 0, 0, .25), rgba(0, 0, 0, .001));
101
+ }
96
102
  }
97
103
 
98
104
  // Icons for within
@@ -12,6 +12,11 @@
12
12
  text-decoration: none;
13
13
  opacity: .75;
14
14
  }
15
+
16
+ // Opinionated: add "hand" cursor to non-disabled .close elements
17
+ &:not(:disabled):not(.disabled) {
18
+ cursor: pointer;
19
+ }
15
20
  }
16
21
 
17
22
  // Additional properties for button version
@@ -19,11 +24,11 @@
19
24
  // If you want the anchor version, it requires `href="#"`.
20
25
  // See https://developer.mozilla.org/en-US/docs/Web/Events/click#Safari_Mobile
21
26
 
22
- // scss-lint:disable QualifyingElement
27
+ // stylelint-disable property-no-vendor-prefix, selector-no-qualifying-type
23
28
  button.close {
24
29
  padding: 0;
25
- background: transparent;
30
+ background-color: transparent;
26
31
  border: 0;
27
32
  -webkit-appearance: none;
28
33
  }
29
- // scss-lint:enable QualifyingElement
34
+ // stylelint-enable
@@ -8,24 +8,20 @@ samp {
8
8
 
9
9
  // Inline code
10
10
  code {
11
- padding: $code-padding-y $code-padding-x;
12
11
  font-size: $code-font-size;
13
12
  color: $code-color;
14
- background-color: $code-bg;
15
- @include border-radius($border-radius);
13
+ word-break: break-word;
16
14
 
17
15
  // Streamline the style when inside anchors to avoid broken underline and more
18
16
  a > & {
19
- padding: 0;
20
17
  color: inherit;
21
- background-color: inherit;
22
18
  }
23
19
  }
24
20
 
25
21
  // User input typically entered via keyboard
26
22
  kbd {
27
- padding: $code-padding-y $code-padding-x;
28
- font-size: $code-font-size;
23
+ padding: $kbd-padding-y $kbd-padding-x;
24
+ font-size: $kbd-font-size;
29
25
  color: $kbd-color;
30
26
  background-color: $kbd-bg;
31
27
  @include border-radius($border-radius-sm);
@@ -42,18 +38,14 @@ kbd {
42
38
  // Blocks of code
43
39
  pre {
44
40
  display: block;
45
- margin-top: 0;
46
- margin-bottom: 1rem;
47
41
  font-size: $code-font-size;
48
42
  color: $pre-color;
49
43
 
50
44
  // Account for some code outputs that place code tags in pre tags
51
45
  code {
52
- padding: 0;
53
46
  font-size: inherit;
54
47
  color: inherit;
55
- background-color: transparent;
56
- border-radius: 0;
48
+ word-break: normal;
57
49
  }
58
50
  }
59
51
 
@@ -1,5 +1,3 @@
1
- // scss-lint:disable PropertyCount, VendorPrefix
2
-
3
1
  // Embedded icons from Open Iconic.
4
2
  // Released under MIT and copyright 2014 Waybury.
5
3
  // https://useiconic.com/open
@@ -11,9 +9,13 @@
11
9
 
12
10
  .custom-control {
13
11
  position: relative;
14
- display: inline-flex;
12
+ display: block;
15
13
  min-height: (1rem * $line-height-base);
16
14
  padding-left: $custom-control-gutter;
15
+ }
16
+
17
+ .custom-control-inline {
18
+ display: inline-flex;
17
19
  margin-right: $custom-control-spacer-x;
18
20
  }
19
21
 
@@ -22,71 +24,107 @@
22
24
  z-index: -1; // Put the input behind the label so it doesn't overlay text
23
25
  opacity: 0;
24
26
 
25
- &:checked ~ .custom-control-indicator {
27
+ &:checked ~ .custom-control-label::before {
26
28
  color: $custom-control-indicator-checked-color;
27
- background-color: $custom-control-indicator-checked-bg;
29
+ @include gradient-bg($custom-control-indicator-checked-bg);
28
30
  @include box-shadow($custom-control-indicator-checked-box-shadow);
29
31
  }
30
32
 
31
- &:focus ~ .custom-control-indicator {
33
+ &:focus ~ .custom-control-label::before {
32
34
  // the mixin is not used here to make sure there is feedback
33
35
  box-shadow: $custom-control-indicator-focus-box-shadow;
34
36
  }
35
37
 
36
- &:active ~ .custom-control-indicator {
38
+ &:active ~ .custom-control-label::before {
37
39
  color: $custom-control-indicator-active-color;
38
40
  background-color: $custom-control-indicator-active-bg;
39
41
  @include box-shadow($custom-control-indicator-active-box-shadow);
40
42
  }
41
43
 
42
44
  &:disabled {
43
- ~ .custom-control-indicator {
44
- background-color: $custom-control-indicator-disabled-bg;
45
- }
45
+ ~ .custom-control-label {
46
+ color: $custom-control-label-disabled-color;
46
47
 
47
- ~ .custom-control-description {
48
- color: $custom-control-description-disabled-color;
48
+ &::before {
49
+ background-color: $custom-control-indicator-disabled-bg;
50
+ }
49
51
  }
50
52
  }
51
53
  }
52
54
 
53
- // Custom indicator
55
+ // Custom control indicators
54
56
  //
55
- // Generates a shadow element to create our makeshift checkbox/radio background.
57
+ // Build the custom controls out of psuedo-elements.
56
58
 
57
- .custom-control-indicator {
58
- position: absolute;
59
- top: (($line-height-base - $custom-control-indicator-size) / 2);
60
- left: 0;
61
- display: block;
62
- width: $custom-control-indicator-size;
63
- height: $custom-control-indicator-size;
64
- pointer-events: none;
65
- user-select: none;
66
- background-color: $custom-control-indicator-bg;
67
- background-repeat: no-repeat;
68
- background-position: center center;
69
- background-size: $custom-control-indicator-bg-size;
70
- @include box-shadow($custom-control-indicator-box-shadow);
59
+ .custom-control-label {
60
+ margin-bottom: 0;
61
+
62
+ // Background-color and (when enabled) gradient
63
+ &::before {
64
+ position: absolute;
65
+ top: (($line-height-base - $custom-control-indicator-size) / 2);
66
+ left: 0;
67
+ display: block;
68
+ width: $custom-control-indicator-size;
69
+ height: $custom-control-indicator-size;
70
+ pointer-events: none;
71
+ content: "";
72
+ user-select: none;
73
+ background-color: $custom-control-indicator-bg;
74
+ @include box-shadow($custom-control-indicator-box-shadow);
75
+ }
76
+
77
+ // Foreground (icon)
78
+ &::after {
79
+ position: absolute;
80
+ top: (($line-height-base - $custom-control-indicator-size) / 2);
81
+ left: 0;
82
+ display: block;
83
+ width: $custom-control-indicator-size;
84
+ height: $custom-control-indicator-size;
85
+ content: "";
86
+ background-repeat: no-repeat;
87
+ background-position: center center;
88
+ background-size: $custom-control-indicator-bg-size;
89
+ }
71
90
  }
72
91
 
92
+
73
93
  // Checkboxes
74
94
  //
75
95
  // Tweak just a few things for checkboxes.
76
96
 
77
97
  .custom-checkbox {
78
- .custom-control-indicator {
98
+ .custom-control-label::before {
79
99
  @include border-radius($custom-checkbox-indicator-border-radius);
80
100
  }
81
101
 
82
- .custom-control-input:checked ~ .custom-control-indicator {
83
- background-image: $custom-checkbox-indicator-icon-checked;
102
+ .custom-control-input:checked ~ .custom-control-label {
103
+ &::before {
104
+ @include gradient-bg($custom-control-indicator-checked-bg);
105
+ }
106
+ &::after {
107
+ background-image: $custom-checkbox-indicator-icon-checked;
108
+ }
84
109
  }
85
110
 
86
- .custom-control-input:indeterminate ~ .custom-control-indicator {
87
- background-color: $custom-checkbox-indicator-indeterminate-bg;
88
- background-image: $custom-checkbox-indicator-icon-indeterminate;
89
- @include box-shadow($custom-checkbox-indicator-indeterminate-box-shadow);
111
+ .custom-control-input:indeterminate ~ .custom-control-label {
112
+ &::before {
113
+ @include gradient-bg($custom-checkbox-indicator-indeterminate-bg);
114
+ @include box-shadow($custom-checkbox-indicator-indeterminate-box-shadow);
115
+ }
116
+ &::after {
117
+ background-image: $custom-checkbox-indicator-icon-indeterminate;
118
+ }
119
+ }
120
+
121
+ .custom-control-input:disabled {
122
+ &:checked ~ .custom-control-label::before {
123
+ background-color: $custom-control-indicator-checked-disabled-bg;
124
+ }
125
+ &:indeterminate ~ .custom-control-label::before {
126
+ background-color: $custom-control-indicator-checked-disabled-bg;
127
+ }
90
128
  }
91
129
  }
92
130
 
@@ -95,30 +133,22 @@
95
133
  // Tweak just a few things for radios.
96
134
 
97
135
  .custom-radio {
98
- .custom-control-indicator {
136
+ .custom-control-label::before {
99
137
  border-radius: $custom-radio-indicator-border-radius;
100
138
  }
101
139
 
102
- .custom-control-input:checked ~ .custom-control-indicator {
103
- background-image: $custom-radio-indicator-icon-checked;
140
+ .custom-control-input:checked ~ .custom-control-label {
141
+ &::before {
142
+ @include gradient-bg($custom-control-indicator-checked-bg);
143
+ }
144
+ &::after {
145
+ background-image: $custom-radio-indicator-icon-checked;
146
+ }
104
147
  }
105
- }
106
-
107
-
108
- // Layout options
109
- //
110
- // By default radios and checkboxes are `inline-block` with no additional spacing
111
- // set. Use these optional classes to tweak the layout.
112
148
 
113
- .custom-controls-stacked {
114
- display: flex;
115
- flex-direction: column;
116
-
117
- .custom-control {
118
- margin-bottom: $custom-control-spacer-y;
119
-
120
- + .custom-control {
121
- margin-left: 0;
149
+ .custom-control-input:disabled {
150
+ &:checked ~ .custom-control-label::before {
151
+ background-color: $custom-control-indicator-checked-disabled-bg;
122
152
  }
123
153
  }
124
154
  }
@@ -132,8 +162,8 @@
132
162
 
133
163
  .custom-select {
134
164
  display: inline-block;
135
- max-width: 100%;
136
- height: $input-height;
165
+ width: 100%;
166
+ height: $custom-select-height;
137
167
  padding: $custom-select-padding-y ($custom-select-padding-x + $custom-select-indicator-padding) $custom-select-padding-y $custom-select-padding-x;
138
168
  line-height: $custom-select-line-height;
139
169
  color: $custom-select-color;
@@ -150,12 +180,12 @@
150
180
 
151
181
  &:focus {
152
182
  border-color: $custom-select-focus-border-color;
153
- outline: none;
154
- @include box-shadow($custom-select-focus-box-shadow);
183
+ outline: 0;
184
+ box-shadow: $custom-select-focus-box-shadow;
155
185
 
156
186
  &::-ms-value {
157
187
  // For visual consistency with other platforms/browsers,
158
- // supress the default white text on blue background highlight given to
188
+ // suppress the default white text on blue background highlight given to
159
189
  // the selected option text when the (still closed) <select> receives focus
160
190
  // in IE and (under certain conditions) Edge.
161
191
  // See https://github.com/twbs/bootstrap/issues/19398.
@@ -164,6 +194,13 @@
164
194
  }
165
195
  }
166
196
 
197
+ &[multiple],
198
+ &[size]:not([size="1"]) {
199
+ height: auto;
200
+ padding-right: $custom-select-padding-x;
201
+ background-image: none;
202
+ }
203
+
167
204
  &:disabled {
168
205
  color: $custom-select-disabled-color;
169
206
  background-color: $custom-select-disabled-bg;
@@ -182,6 +219,13 @@
182
219
  font-size: $custom-select-font-size-sm;
183
220
  }
184
221
 
222
+ .custom-select-lg {
223
+ height: $custom-select-height-lg;
224
+ padding-top: $custom-select-padding-y;
225
+ padding-bottom: $custom-select-padding-y;
226
+ font-size: $custom-select-font-size-lg;
227
+ }
228
+
185
229
 
186
230
  // File
187
231
  //
@@ -190,65 +234,64 @@
190
234
  .custom-file {
191
235
  position: relative;
192
236
  display: inline-block;
193
- max-width: 100%;
237
+ width: 100%;
194
238
  height: $custom-file-height;
195
239
  margin-bottom: 0;
196
240
  }
197
241
 
198
242
  .custom-file-input {
199
- min-width: $custom-file-width;
200
- max-width: 100%;
243
+ position: relative;
244
+ z-index: 2;
245
+ width: 100%;
201
246
  height: $custom-file-height;
202
247
  margin: 0;
203
248
  opacity: 0;
204
249
 
205
250
  &:focus ~ .custom-file-control {
206
- @include box-shadow($custom-file-focus-box-shadow);
251
+ border-color: $custom-file-focus-border-color;
252
+ box-shadow: $custom-file-focus-box-shadow;
253
+
254
+ &::before {
255
+ border-color: $custom-file-focus-border-color;
256
+ }
257
+ }
258
+
259
+ @each $lang, $value in $custom-file-text {
260
+ &:lang(#{$lang}) ~ .custom-file-label::after {
261
+ content: $value;
262
+ }
207
263
  }
208
264
  }
209
265
 
210
- .custom-file-control {
266
+ .custom-file-label {
211
267
  position: absolute;
212
268
  top: 0;
213
269
  right: 0;
214
270
  left: 0;
215
- z-index: 5;
271
+ z-index: 1;
216
272
  height: $custom-file-height;
217
- padding: $custom-file-padding-x $custom-file-padding-y;
273
+ padding: $custom-file-padding-y $custom-file-padding-x;
218
274
  line-height: $custom-file-line-height;
219
275
  color: $custom-file-color;
220
- pointer-events: none;
221
- user-select: none;
222
276
  background-color: $custom-file-bg;
223
277
  border: $custom-file-border-width solid $custom-file-border-color;
224
278
  @include border-radius($custom-file-border-radius);
225
279
  @include box-shadow($custom-file-box-shadow);
226
280
 
227
- @each $lang, $text in map-get($custom-file-text, placeholder) {
228
- &:lang(#{$lang}):empty::after {
229
- content: $text;
230
- }
231
- }
232
-
233
- &::before {
281
+ &::after {
234
282
  position: absolute;
235
- top: -$custom-file-border-width;
236
- right: -$custom-file-border-width;
237
- bottom: -$custom-file-border-width;
238
- z-index: 6;
283
+ top: 0;
284
+ right: 0;
285
+ bottom: 0;
286
+ z-index: 3;
239
287
  display: block;
240
- height: $custom-file-height;
241
- padding: $custom-file-padding-x $custom-file-padding-y;
288
+ height: calc(#{$custom-file-height} - #{$custom-file-border-width} * 2);
289
+ padding: $custom-file-padding-y $custom-file-padding-x;
242
290
  line-height: $custom-file-line-height;
243
291
  color: $custom-file-button-color;
244
- background-color: $custom-file-button-bg;
245
- border: $custom-file-border-width solid $custom-file-border-color;
292
+ content: "Browse";
293
+ @include gradient-bg($custom-file-button-bg);
294
+ border-left: $custom-file-border-width solid $custom-file-border-color;
246
295
  @include border-radius(0 $custom-file-border-radius $custom-file-border-radius 0);
247
296
  }
248
-
249
- @each $lang, $text in map-get($custom-file-text, button-label) {
250
- &:lang(#{$lang})::before {
251
- content: $text;
252
- }
253
- }
254
297
  }
@@ -6,37 +6,7 @@
6
6
 
7
7
  .dropdown-toggle {
8
8
  // Generate the caret automatically
9
- &::after {
10
- display: inline-block;
11
- width: 0;
12
- height: 0;
13
- margin-left: $caret-width * .85;
14
- vertical-align: $caret-width * .85;
15
- content: "";
16
- border-top: $caret-width solid;
17
- border-right: $caret-width solid transparent;
18
- border-left: $caret-width solid transparent;
19
- }
20
-
21
- &:empty::after {
22
- margin-left: 0;
23
- }
24
- }
25
-
26
- // Allow for dropdowns to go bottom up (aka, dropup-menu)
27
- // Just add .dropup after the standard .dropdown class and you're set.
28
- .dropup {
29
- .dropdown-menu {
30
- margin-top: 0;
31
- margin-bottom: $dropdown-spacer;
32
- }
33
-
34
- .dropdown-toggle {
35
- &::after {
36
- border-top: 0;
37
- border-bottom: $caret-width solid;
38
- }
39
- }
9
+ @include caret;
40
10
  }
41
11
 
42
12
  // The dropdown menu
@@ -57,10 +27,51 @@
57
27
  background-color: $dropdown-bg;
58
28
  background-clip: padding-box;
59
29
  border: $dropdown-border-width solid $dropdown-border-color;
60
- @include border-radius($border-radius);
30
+ @include border-radius($dropdown-border-radius);
61
31
  @include box-shadow($dropdown-box-shadow);
62
32
  }
63
33
 
34
+ // Allow for dropdowns to go bottom up (aka, dropup-menu)
35
+ // Just add .dropup after the standard .dropdown class and you're set.
36
+ .dropup {
37
+ .dropdown-menu {
38
+ margin-top: 0;
39
+ margin-bottom: $dropdown-spacer;
40
+ }
41
+
42
+ .dropdown-toggle {
43
+ @include caret(up);
44
+ }
45
+ }
46
+
47
+ .dropright {
48
+ .dropdown-menu {
49
+ margin-top: 0;
50
+ margin-left: $dropdown-spacer;
51
+ }
52
+
53
+ .dropdown-toggle {
54
+ @include caret(right);
55
+ &::after {
56
+ vertical-align: 0;
57
+ }
58
+ }
59
+ }
60
+
61
+ .dropleft {
62
+ .dropdown-menu {
63
+ margin-top: 0;
64
+ margin-right: $dropdown-spacer;
65
+ }
66
+
67
+ .dropdown-toggle {
68
+ @include caret(left);
69
+ &::before {
70
+ vertical-align: 0;
71
+ }
72
+ }
73
+ }
74
+
64
75
  // Dividers (basically an `<hr>`) within the dropdown
65
76
  .dropdown-divider {
66
77
  @include nav-divider($dropdown-divider-bg);
@@ -78,20 +89,20 @@
78
89
  color: $dropdown-link-color;
79
90
  text-align: inherit; // For `<button>`s
80
91
  white-space: nowrap; // prevent links from randomly breaking onto new lines
81
- background: none; // For `<button>`s
92
+ background-color: transparent; // For `<button>`s
82
93
  border: 0; // For `<button>`s
83
94
 
84
95
  @include hover-focus {
85
96
  color: $dropdown-link-hover-color;
86
97
  text-decoration: none;
87
- background-color: $dropdown-link-hover-bg;
98
+ @include gradient-bg($dropdown-link-hover-bg);
88
99
  }
89
100
 
90
101
  &.active,
91
102
  &:active {
92
103
  color: $dropdown-link-active-color;
93
104
  text-decoration: none;
94
- background-color: $dropdown-link-active-bg;
105
+ @include gradient-bg($dropdown-link-active-bg);
95
106
  }
96
107
 
97
108
  &.disabled,
@@ -105,14 +116,6 @@
105
116
  }
106
117
  }
107
118
 
108
- // Open state for the dropdown
109
- .show {
110
- // Remove the outline when :focus is triggered
111
- > a {
112
- outline: 0;
113
- }
114
- }
115
-
116
119
  .dropdown-menu.show {
117
120
  display: block;
118
121
  }