solidus_backend 2.3.1 → 2.4.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 (270) hide show
  1. checksums.yaml +4 -4
  2. data/app/assets/javascripts/spree/backend/admin.js +0 -12
  3. data/app/assets/javascripts/spree/backend/number_field_updater.coffee +5 -5
  4. data/app/assets/javascripts/spree/backend/shipments.js +16 -14
  5. data/app/assets/javascripts/spree/backend/stock_transfers/count_update_forms.coffee +3 -3
  6. data/app/assets/javascripts/spree/backend/stock_transfers/transfer_item_deleting.coffee +1 -1
  7. data/app/assets/javascripts/spree/backend/taxonomy.js.coffee +1 -1
  8. data/app/assets/javascripts/spree/backend/templates/orders/details_adjustment_row.hbs +2 -2
  9. data/app/assets/javascripts/spree/backend/templates/orders/line_item.hbs +3 -3
  10. data/app/assets/javascripts/spree/backend/templates/stock_items/stock_location_stock_item.hbs +5 -5
  11. data/app/assets/javascripts/spree/backend/templates/stock_transfers/transfer_item.hbs +5 -5
  12. data/app/assets/javascripts/spree/backend/templates/taxons/_tree.hbs +7 -3
  13. data/app/assets/javascripts/spree/backend/templates/variants/line_items_autocomplete_stock.hbs +1 -1
  14. data/app/assets/javascripts/spree/backend/templates/variants/split.hbs +2 -2
  15. data/app/assets/javascripts/spree/backend/views/order/customer_details.js +1 -2
  16. data/app/assets/javascripts/spree/backend.js +1 -1
  17. data/app/assets/stylesheets/spree/backend/_bootstrap_custom.scss +27 -906
  18. data/app/assets/stylesheets/spree/backend/components/_actions.scss +13 -15
  19. data/app/assets/stylesheets/spree/backend/components/_date-picker.scss +1 -1
  20. data/app/assets/stylesheets/spree/backend/components/_editable_table.scss +0 -1
  21. data/app/assets/stylesheets/spree/backend/components/_messages.scss +8 -8
  22. data/app/assets/stylesheets/spree/backend/components/_navigation.scss +1 -1
  23. data/app/assets/stylesheets/spree/backend/components/_number_field_update.scss +1 -1
  24. data/app/assets/stylesheets/spree/backend/components/_number_with_currency.scss +1 -1
  25. data/app/assets/stylesheets/spree/backend/components/_pills.scss +92 -0
  26. data/app/assets/stylesheets/spree/backend/components/_sidebar.scss +7 -32
  27. data/app/assets/stylesheets/spree/backend/components/_states.scss +5 -27
  28. data/app/assets/stylesheets/spree/backend/components/_stock_table.scss +0 -12
  29. data/app/assets/stylesheets/spree/backend/globals/_variables.scss +58 -139
  30. data/app/assets/stylesheets/spree/backend/plugins/_bootstrap_tooltip.scss +11 -15
  31. data/app/assets/stylesheets/spree/backend/plugins/_select2.scss +7 -5
  32. data/app/assets/stylesheets/spree/backend/sections/_orders.scss +6 -6
  33. data/app/assets/stylesheets/spree/backend/sections/_products.scss +5 -1
  34. data/app/assets/stylesheets/spree/backend/sections/_promotions.scss +4 -2
  35. data/app/assets/stylesheets/spree/backend/sections/_stock_management.scss +4 -35
  36. data/app/assets/stylesheets/spree/backend/sections/_style_guide.scss +14 -15
  37. data/app/assets/stylesheets/spree/backend/sections/_taxonomies.scss +9 -16
  38. data/app/assets/stylesheets/spree/backend/shared/_forms.scss +23 -20
  39. data/app/assets/stylesheets/spree/backend/shared/_header.scss +1 -5
  40. data/app/assets/stylesheets/spree/backend/shared/_layout.scss +3 -23
  41. data/app/assets/stylesheets/spree/backend/shared/_tables.scss +40 -92
  42. data/app/assets/stylesheets/spree/backend/shared/_typography.scss +6 -6
  43. data/app/assets/stylesheets/spree/backend/spree_admin.scss +1 -1
  44. data/app/controllers/spree/admin/adjustments_controller.rb +1 -1
  45. data/app/controllers/spree/admin/customer_returns_controller.rb +0 -1
  46. data/app/controllers/spree/admin/promotion_actions_controller.rb +1 -1
  47. data/app/controllers/spree/admin/shipping_methods_controller.rb +1 -1
  48. data/app/controllers/spree/admin/style_guide_controller.rb +3 -2
  49. data/app/controllers/spree/admin/tax_rates_controller.rb +1 -1
  50. data/app/controllers/spree/admin/users_controller.rb +9 -4
  51. data/app/helpers/spree/admin/base_helper.rb +32 -35
  52. data/app/helpers/spree/admin/stock_transfers_helper.rb +0 -4
  53. data/app/models/spree/backend_configuration.rb +1 -1
  54. data/app/views/spree/admin/adjustment_reasons/index.html.erb +6 -4
  55. data/app/views/spree/admin/adjustments/_adjustment.html.erb +5 -5
  56. data/app/views/spree/admin/adjustments/_adjustments_table.html.erb +7 -7
  57. data/app/views/spree/admin/cancellations/index.html.erb +9 -5
  58. data/app/views/spree/admin/customer_returns/_reimbursements_table.html.erb +6 -3
  59. data/app/views/spree/admin/customer_returns/_return_item_decision.html.erb +12 -7
  60. data/app/views/spree/admin/customer_returns/_return_item_selection.html.erb +13 -8
  61. data/app/views/spree/admin/customer_returns/edit.html.erb +1 -1
  62. data/app/views/spree/admin/customer_returns/index.html.erb +5 -5
  63. data/app/views/spree/admin/images/_image_row.html.erb +14 -4
  64. data/app/views/spree/admin/images/index.html.erb +2 -1
  65. data/app/views/spree/admin/option_types/_option_value_fields.html.erb +6 -6
  66. data/app/views/spree/admin/option_types/edit.html.erb +2 -1
  67. data/app/views/spree/admin/option_types/index.html.erb +5 -5
  68. data/app/views/spree/admin/orders/_adjustments.html.erb +3 -3
  69. data/app/views/spree/admin/orders/_carton.html.erb +1 -1
  70. data/app/views/spree/admin/orders/_carton_manifest.html.erb +3 -3
  71. data/app/views/spree/admin/orders/_risk_analysis.html.erb +18 -16
  72. data/app/views/spree/admin/orders/_shipment.html.erb +26 -30
  73. data/app/views/spree/admin/orders/_shipment_manifest.html.erb +6 -6
  74. data/app/views/spree/admin/orders/confirm/_line_items.html.erb +3 -3
  75. data/app/views/spree/admin/orders/confirm/_payments.html.erb +6 -6
  76. data/app/views/spree/admin/orders/confirm/_shipment.html.erb +1 -1
  77. data/app/views/spree/admin/orders/confirm/_shipment_manifest.html.erb +3 -3
  78. data/app/views/spree/admin/orders/index.html.erb +25 -9
  79. data/app/views/spree/admin/payment_methods/_form.html.erb +4 -1
  80. data/app/views/spree/admin/payment_methods/index.html.erb +11 -7
  81. data/app/views/spree/admin/payments/_capture_events.html.erb +1 -1
  82. data/app/views/spree/admin/payments/_list.html.erb +9 -5
  83. data/app/views/spree/admin/payments/show.html.erb +2 -2
  84. data/app/views/spree/admin/prices/_master_variant_table.html.erb +2 -2
  85. data/app/views/spree/admin/prices/_table.html.erb +2 -2
  86. data/app/views/spree/admin/product_properties/_product_property_fields.html.erb +1 -1
  87. data/app/views/spree/admin/product_properties/index.html.erb +4 -2
  88. data/app/views/spree/admin/products/index.html.erb +10 -9
  89. data/app/views/spree/admin/promotions/actions/_create_item_adjustments.html.erb +1 -1
  90. data/app/views/spree/admin/promotions/actions/_promotion_calculators_with_custom_fields.html.erb +1 -1
  91. data/app/views/spree/admin/promotions/calculators/_default_fields.html.erb +3 -6
  92. data/app/views/spree/admin/promotions/calculators/tiered_flat_rate/_fields.html.erb +3 -8
  93. data/app/views/spree/admin/promotions/calculators/tiered_percent/_fields.html.erb +3 -8
  94. data/app/views/spree/admin/promotions/index.html.erb +24 -17
  95. data/app/views/spree/admin/promotions/rules/_user_role.html.erb +2 -2
  96. data/app/views/spree/admin/properties/index.html.erb +3 -3
  97. data/app/views/spree/admin/refund_reasons/index.html.erb +7 -5
  98. data/app/views/spree/admin/refunds/new.html.erb +1 -1
  99. data/app/views/spree/admin/reimbursement_types/index.html.erb +2 -2
  100. data/app/views/spree/admin/reimbursements/edit.html.erb +6 -6
  101. data/app/views/spree/admin/reimbursements/index.html.erb +9 -2
  102. data/app/views/spree/admin/reimbursements/show.html.erb +6 -6
  103. data/app/views/spree/admin/reports/index.html.erb +2 -2
  104. data/app/views/spree/admin/reports/sales_total.html.erb +1 -1
  105. data/app/views/spree/admin/return_authorizations/_form.html.erb +9 -5
  106. data/app/views/spree/admin/return_authorizations/edit.html.erb +9 -2
  107. data/app/views/spree/admin/return_authorizations/index.html.erb +11 -4
  108. data/app/views/spree/admin/search/products.json.jbuilder +10 -0
  109. data/app/views/spree/admin/search/users.json.jbuilder +37 -0
  110. data/app/views/spree/admin/shared/_calculator_fields.html.erb +4 -1
  111. data/app/views/spree/admin/shared/_modal.html.erb +18 -0
  112. data/app/views/spree/admin/shared/_number_field_update_actions.html.erb +2 -2
  113. data/app/views/spree/admin/shared/_number_field_update_cell.html.erb +1 -1
  114. data/app/views/spree/admin/shared/_order_summary.html.erb +21 -5
  115. data/app/views/spree/admin/shared/_refunds.html.erb +6 -6
  116. data/app/views/spree/admin/shared/_settings_sub_menu.html.erb +4 -4
  117. data/app/views/spree/admin/shared/named_types/_index.html.erb +7 -5
  118. data/app/views/spree/admin/shared/preference_fields/_boolean.html.erb +13 -0
  119. data/app/views/spree/admin/shared/preference_fields/_decimal.html.erb +12 -0
  120. data/app/views/spree/admin/shared/preference_fields/_integer.html.erb +12 -0
  121. data/app/views/spree/admin/shared/preference_fields/_password.html.erb +12 -0
  122. data/app/views/spree/admin/shared/preference_fields/_string.html.erb +12 -0
  123. data/app/views/spree/admin/shared/preference_fields/_text.html.erb +12 -0
  124. data/app/views/spree/admin/shipping_categories/index.html.erb +2 -2
  125. data/app/views/spree/admin/shipping_methods/index.html.erb +5 -5
  126. data/app/views/spree/admin/stock_items/_stock_management.html.erb +3 -3
  127. data/app/views/spree/admin/stock_locations/index.html.erb +9 -11
  128. data/app/views/spree/admin/stock_movements/index.html.erb +4 -4
  129. data/app/views/spree/admin/stock_transfers/_transfer_item_actions.html.erb +1 -1
  130. data/app/views/spree/admin/stock_transfers/_transfer_item_table.html.erb +2 -2
  131. data/app/views/spree/admin/stock_transfers/index.html.erb +10 -6
  132. data/app/views/spree/admin/stock_transfers/tracking_info.html.erb +1 -1
  133. data/app/views/spree/admin/store_credits/index.html.erb +53 -50
  134. data/app/views/spree/admin/store_credits/show.html.erb +5 -5
  135. data/app/views/spree/admin/stores/_form.html.erb +9 -0
  136. data/app/views/spree/admin/style_guide/topics/components/_modals.html.erb +50 -0
  137. data/app/views/spree/admin/style_guide/topics/components/_pills.html.erb +101 -0
  138. data/app/views/spree/admin/style_guide/topics/tables/_building_tables.html.erb +4 -4
  139. data/app/views/spree/admin/tax_categories/index.html.erb +5 -5
  140. data/app/views/spree/admin/tax_rates/index.html.erb +9 -9
  141. data/app/views/spree/admin/taxonomies/_list.html.erb +4 -4
  142. data/app/views/spree/admin/taxons/search.json.jbuilder +5 -0
  143. data/app/views/spree/admin/users/index.html.erb +64 -23
  144. data/app/views/spree/admin/users/items.html.erb +9 -13
  145. data/app/views/spree/admin/users/orders.html.erb +28 -12
  146. data/app/views/spree/admin/variants/_table.html.erb +6 -5
  147. data/app/views/spree/admin/variants/index.html.erb +12 -16
  148. data/app/views/spree/admin/variants/new.html.erb +1 -3
  149. data/app/views/spree/admin/zones/edit.html.erb +0 -3
  150. data/app/views/spree/admin/zones/index.html.erb +2 -6
  151. data/app/views/spree/admin/zones/new.html.erb +0 -3
  152. data/app/views/spree/layouts/admin.html.erb +9 -30
  153. data/config/routes.rb +0 -4
  154. data/lib/spree/backend.rb +2 -1
  155. data/solidus_backend.gemspec +3 -1
  156. data/spec/controllers/spree/admin/orders_controller_spec.rb +0 -5
  157. data/spec/controllers/spree/admin/payments_controller_spec.rb +1 -1
  158. data/spec/controllers/spree/admin/search_controller_spec.rb +2 -2
  159. data/spec/features/admin/configuration/payment_methods_spec.rb +1 -1
  160. data/spec/features/admin/configuration/zones_spec.rb +1 -1
  161. data/spec/features/admin/orders/adjustments_spec.rb +1 -1
  162. data/spec/features/admin/orders/cancelling_and_resuming_spec.rb +4 -4
  163. data/spec/features/admin/orders/cancelling_inventory_spec.rb +1 -1
  164. data/spec/features/admin/orders/customer_details_spec.rb +8 -1
  165. data/spec/features/admin/orders/listing_spec.rb +1 -1
  166. data/spec/features/admin/orders/new_order_spec.rb +3 -3
  167. data/spec/features/admin/orders/order_details_spec.rb +17 -16
  168. data/spec/features/admin/orders/payments_spec.rb +4 -4
  169. data/spec/features/admin/orders/risk_analysis_spec.rb +2 -2
  170. data/spec/features/admin/orders/shipments_spec.rb +1 -1
  171. data/spec/features/admin/products/edit/images_spec.rb +1 -1
  172. data/spec/features/admin/store_credits_spec.rb +3 -3
  173. data/spec/features/admin/stores_spec.rb +35 -0
  174. data/spec/features/admin/users_spec.rb +60 -13
  175. data/spec/spec_helper.rb +9 -4
  176. data/vendor/assets/javascripts/solidus_admin/bootstrap.js +657 -361
  177. data/vendor/assets/javascripts/solidus_admin/popover.js +4 -0
  178. data/vendor/assets/stylesheets/solidus_admin/bootstrap/_alert.scss +4 -11
  179. data/vendor/assets/stylesheets/solidus_admin/bootstrap/_badge.scss +4 -33
  180. data/vendor/assets/stylesheets/solidus_admin/bootstrap/_breadcrumb.scss +1 -1
  181. data/vendor/assets/stylesheets/solidus_admin/bootstrap/_button-group.scss +11 -15
  182. data/vendor/assets/stylesheets/solidus_admin/bootstrap/_buttons.scss +13 -42
  183. data/vendor/assets/stylesheets/solidus_admin/bootstrap/_card.scss +27 -80
  184. data/vendor/assets/stylesheets/solidus_admin/bootstrap/_carousel.scss +24 -17
  185. data/vendor/assets/stylesheets/solidus_admin/bootstrap/_close.scss +0 -2
  186. data/vendor/assets/stylesheets/solidus_admin/bootstrap/_custom-forms.scss +27 -36
  187. data/vendor/assets/stylesheets/solidus_admin/bootstrap/_dropdown.scss +15 -48
  188. data/vendor/assets/stylesheets/solidus_admin/bootstrap/_forms.scss +70 -68
  189. data/vendor/assets/stylesheets/solidus_admin/bootstrap/_functions.scss +90 -0
  190. data/vendor/assets/stylesheets/solidus_admin/bootstrap/_grid.scss +3 -2
  191. data/vendor/assets/stylesheets/solidus_admin/bootstrap/_images.scss +1 -1
  192. data/vendor/assets/stylesheets/solidus_admin/bootstrap/_input-group.scss +6 -8
  193. data/vendor/assets/stylesheets/solidus_admin/bootstrap/_jumbotron.scss +0 -4
  194. data/vendor/assets/stylesheets/solidus_admin/bootstrap/_list-group.scss +9 -36
  195. data/vendor/assets/stylesheets/solidus_admin/bootstrap/_media.scss +0 -4
  196. data/vendor/assets/stylesheets/solidus_admin/bootstrap/_mixins.scss +2 -18
  197. data/vendor/assets/stylesheets/solidus_admin/bootstrap/_modal.scss +3 -3
  198. data/vendor/assets/stylesheets/solidus_admin/bootstrap/_nav.scss +15 -16
  199. data/vendor/assets/stylesheets/solidus_admin/bootstrap/_navbar.scss +70 -54
  200. data/vendor/assets/stylesheets/solidus_admin/bootstrap/_pagination.scss +3 -4
  201. data/vendor/assets/stylesheets/solidus_admin/bootstrap/_popover.scss +96 -72
  202. data/vendor/assets/stylesheets/solidus_admin/bootstrap/_print.scss +1 -9
  203. data/vendor/assets/stylesheets/solidus_admin/bootstrap/_progress.scss +4 -4
  204. data/vendor/assets/stylesheets/solidus_admin/bootstrap/_reboot.scss +187 -95
  205. data/vendor/assets/stylesheets/solidus_admin/bootstrap/_tables.scss +34 -19
  206. data/vendor/assets/stylesheets/solidus_admin/bootstrap/_tooltip.scss +52 -35
  207. data/vendor/assets/stylesheets/solidus_admin/bootstrap/_type.scss +8 -28
  208. data/vendor/assets/stylesheets/solidus_admin/bootstrap/_utilities.scss +1 -0
  209. data/vendor/assets/stylesheets/solidus_admin/bootstrap/_variables.scss +286 -410
  210. data/vendor/assets/stylesheets/solidus_admin/bootstrap/bootstrap-grid.scss +2 -8
  211. data/vendor/assets/stylesheets/solidus_admin/bootstrap/bootstrap-reboot.scss +1 -2
  212. data/vendor/assets/stylesheets/solidus_admin/bootstrap/bootstrap.scss +2 -15
  213. data/vendor/assets/stylesheets/solidus_admin/bootstrap/mixins/_alert.scss +4 -5
  214. data/vendor/assets/stylesheets/solidus_admin/bootstrap/mixins/_badge.scss +6 -5
  215. data/vendor/assets/stylesheets/solidus_admin/bootstrap/mixins/_border-radius.scss +3 -3
  216. data/vendor/assets/stylesheets/solidus_admin/bootstrap/mixins/_box-shadow.scss +5 -0
  217. data/vendor/assets/stylesheets/solidus_admin/bootstrap/mixins/_breakpoints.scss +23 -13
  218. data/vendor/assets/stylesheets/solidus_admin/bootstrap/mixins/_buttons.scss +11 -14
  219. data/vendor/assets/stylesheets/solidus_admin/bootstrap/mixins/_clearfix.scss +1 -1
  220. data/vendor/assets/stylesheets/solidus_admin/bootstrap/mixins/_forms.scss +57 -55
  221. data/vendor/assets/stylesheets/solidus_admin/bootstrap/mixins/_gradients.scss +1 -1
  222. data/vendor/assets/stylesheets/solidus_admin/bootstrap/mixins/_grid-framework.scss +9 -18
  223. data/vendor/assets/stylesheets/solidus_admin/bootstrap/mixins/_grid.scss +12 -65
  224. data/vendor/assets/stylesheets/solidus_admin/bootstrap/mixins/_hover.scss +6 -6
  225. data/vendor/assets/stylesheets/solidus_admin/bootstrap/mixins/_list-group.scss +2 -4
  226. data/vendor/assets/stylesheets/solidus_admin/bootstrap/mixins/_nav-divider.scss +3 -3
  227. data/vendor/assets/stylesheets/solidus_admin/bootstrap/mixins/_pagination.scss +1 -0
  228. data/vendor/assets/stylesheets/solidus_admin/bootstrap/mixins/_reset-text.scss +4 -3
  229. data/vendor/assets/stylesheets/solidus_admin/bootstrap/mixins/_resize.scss +1 -1
  230. data/vendor/assets/stylesheets/solidus_admin/bootstrap/mixins/_screen-reader.scss +5 -2
  231. data/vendor/assets/stylesheets/solidus_admin/bootstrap/mixins/_text-truncate.scss +1 -1
  232. data/vendor/assets/stylesheets/solidus_admin/bootstrap/mixins/_transition.scss +9 -0
  233. data/vendor/assets/stylesheets/solidus_admin/bootstrap/mixins/_visibility.scss +2 -2
  234. data/vendor/assets/stylesheets/solidus_admin/bootstrap/utilities/_background.scss +4 -17
  235. data/vendor/assets/stylesheets/solidus_admin/bootstrap/utilities/_borders.scss +20 -5
  236. data/vendor/assets/stylesheets/solidus_admin/bootstrap/utilities/_display.scss +36 -1
  237. data/vendor/assets/stylesheets/solidus_admin/bootstrap/{_responsive-embed.scss → utilities/_embed.scss} +0 -0
  238. data/vendor/assets/stylesheets/solidus_admin/bootstrap/utilities/_flex.scss +0 -4
  239. data/vendor/assets/stylesheets/solidus_admin/bootstrap/utilities/_position.scss +5 -3
  240. data/vendor/assets/stylesheets/solidus_admin/bootstrap/utilities/_spacing.scss +10 -12
  241. data/vendor/assets/stylesheets/solidus_admin/bootstrap/utilities/_text.scss +5 -17
  242. data/vendor/assets/stylesheets/solidus_admin/bootstrap/utilities/_visibility.scss +4 -48
  243. metadata +73 -34
  244. data/app/assets/stylesheets/spree/backend/shared/_skeleton.scss +0 -242
  245. data/app/controllers/spree/admin/countries_controller.rb +0 -9
  246. data/app/controllers/spree/admin/states_controller.rb +0 -29
  247. data/app/helpers/spree/admin/reimbursements_helper.rb +0 -14
  248. data/app/views/spree/admin/countries/_form.html.erb +0 -22
  249. data/app/views/spree/admin/countries/edit.html.erb +0 -19
  250. data/app/views/spree/admin/countries/index.html.erb +0 -49
  251. data/app/views/spree/admin/countries/new.html.erb +0 -18
  252. data/app/views/spree/admin/search/products.rabl +0 -9
  253. data/app/views/spree/admin/search/users.rabl +0 -30
  254. data/app/views/spree/admin/shared/_areas_tabs.html.erb +0 -19
  255. data/app/views/spree/admin/states/_form.html.erb +0 -14
  256. data/app/views/spree/admin/states/_state_list.html.erb +0 -33
  257. data/app/views/spree/admin/states/edit.html.erb +0 -19
  258. data/app/views/spree/admin/states/index.html.erb +0 -39
  259. data/app/views/spree/admin/states/new.html.erb +0 -17
  260. data/app/views/spree/admin/style_guide/topics/typography/_tags.html.erb +0 -25
  261. data/app/views/spree/admin/taxons/search.rabl +0 -5
  262. data/app/views/spree/admin/variants/new.js.erb +0 -1
  263. data/spec/features/admin/configuration/countries_spec.rb +0 -22
  264. data/spec/features/admin/configuration/states_spec.rb +0 -64
  265. data/spec/helpers/admin/reimbursements_helper_spec.rb +0 -34
  266. data/vendor/assets/javascripts/solidus_admin/tether.js +0 -1726
  267. data/vendor/assets/stylesheets/solidus_admin/bootstrap/_custom.scss +0 -4
  268. data/vendor/assets/stylesheets/solidus_admin/bootstrap/_normalize.scss +0 -461
  269. data/vendor/assets/stylesheets/solidus_admin/bootstrap/mixins/_cards.scss +0 -47
  270. data/vendor/assets/stylesheets/solidus_admin/bootstrap/mixins/_transforms.scss +0 -14
@@ -1,86 +1,62 @@
1
- // scss-lint:disable QualifyingElement, DuplicateProperty
1
+ // scss-lint:disable QualifyingElement, DuplicateProperty, VendorPrefix
2
2
 
3
3
  // Reboot
4
4
  //
5
- // Global resets to common HTML elements and more for easier usage by Bootstrap.
6
- // Adds additional rules on top of Normalize.css, including several overrides.
5
+ // Normalization of HTML elements, manually forked from Normalize.css to remove
6
+ // styles targeting irrelevant browsers while applying new styles.
7
+ //
8
+ // Normalize is licensed MIT. https://github.com/necolas/normalize.css
7
9
 
8
10
 
9
- // Reset the box-sizing
10
- //
11
- // Change from `box-sizing: content-box` to `border-box` so that when you add
12
- // `padding` or `border`s to an element, the overall declared `width` does not
13
- // change. For example, `width: 100px;` will always be `100px` despite the
14
- // `border: 10px solid red;` and `padding: 20px;`.
15
- //
16
- // Heads up! This reset may cause conflicts with some third-party widgets. For
17
- // recommendations on resolving such conflicts, see
18
- // https://getbootstrap.com/getting-started/#third-box-sizing.
11
+ // Document
19
12
  //
20
- // Credit: https://css-tricks.com/inheriting-box-sizing-probably-slightly-better-best-practice/
13
+ // 1. Change from `box-sizing: content-box` so that `width` is not affected by `padding` or `border`.
14
+ // 2. Change the default font family in all browsers.
15
+ // 3. Correct the line height in all browsers.
16
+ // 4. Prevent adjustments of font size after orientation changes in IE on Windows Phone and in iOS.
17
+ // 5. Setting @viewport causes scrollbars to overlap content in IE11 and Edge, so
18
+ // we force a non-overlapping, non-auto-hiding scrollbar to counteract.
19
+ // 6. Change the default tap highlight to be completely transparent in iOS.
21
20
 
22
21
  html {
23
- box-sizing: border-box;
22
+ box-sizing: border-box; // 1
23
+ font-family: sans-serif; // 2
24
+ line-height: 1.15; // 3
25
+ -webkit-text-size-adjust: 100%; // 4
26
+ -ms-text-size-adjust: 100%; // 4
27
+ -ms-overflow-style: scrollbar; // 5
28
+ -webkit-tap-highlight-color: rgba(0,0,0,0); // 6
24
29
  }
25
30
 
26
31
  *,
27
32
  *::before,
28
33
  *::after {
29
- box-sizing: inherit;
34
+ box-sizing: inherit; // 1
30
35
  }
31
36
 
32
-
33
- // Make viewport responsive
34
- //
35
- // @viewport is needed because IE 10+ doesn't honor <meta name="viewport"> in
36
- // some cases. See https://timkadlec.com/2012/10/ie10-snap-mode-and-responsive-design/.
37
- // Eventually @viewport will replace <meta name="viewport">.
38
- //
39
- // However, `device-width` is broken on IE 10 on Windows (Phone) 8,
40
- // (see https://timkadlec.com/2013/01/windows-phone-8-and-device-width/ and https://github.com/twbs/bootstrap/issues/10497)
41
- // and the fix for that involves a snippet of JavaScript to sniff the user agent
42
- // and apply some conditional CSS.
43
- //
44
- // See https://getbootstrap.com/getting-started/#support-ie10-width for the relevant hack.
45
- //
46
- // Wrap `@viewport` with `@at-root` for when folks do a nested import (e.g.,
47
- // `.class-name { @import "bootstrap"; }`).
37
+ // IE10+ doesn't honor `<meta name="viewport">` in some cases.
48
38
  @at-root {
49
39
  @-ms-viewport { width: device-width; }
50
40
  }
51
41
 
42
+ // Shim for "new" HTML5 structural elements to display correctly (IE10, older browsers)
43
+ article, aside, dialog, figcaption, figure, footer, header, hgroup, main, nav, section {
44
+ display: block;
45
+ }
52
46
 
47
+ // Body
53
48
  //
54
- // Reset HTML, body, and more
55
- //
56
-
57
- html {
58
- // We assume no initial pixel `font-size` for accessibility reasons. This
59
- // allows web visitors to customize their browser default font-size, making
60
- // your project more inclusive and accessible to everyone.
61
-
62
- // As a side-effect of setting the @viewport above,
63
- // IE11 & Edge make the scrollbar overlap the content and automatically hide itself when not in use.
64
- // Unfortunately, the auto-showing of the scrollbar is sometimes too sensitive,
65
- // thus making it hard to click on stuff near the right edge of the page.
66
- // So we add this style to force IE11 & Edge to use a "normal", non-overlapping, non-auto-hiding scrollbar.
67
- // See https://github.com/twbs/bootstrap/issues/18543
68
- // and https://developer.microsoft.com/en-us/microsoft-edge/platform/issues/7165383/
69
- -ms-overflow-style: scrollbar;
70
-
71
- // Changes the default tap highlight to be completely transparent in iOS.
72
- -webkit-tap-highlight-color: rgba(0,0,0,0);
73
- }
49
+ // 1. Remove the margin in all browsers.
50
+ // 2. As a best practice, apply a default `background-color`.
74
51
 
75
52
  body {
53
+ margin: 0; // 1
76
54
  font-family: $font-family-base;
77
55
  font-size: $font-size-base;
78
56
  font-weight: $font-weight-base;
79
57
  line-height: $line-height-base;
80
- // Go easy on the eyes and use something other than `#000` for text
81
58
  color: $body-color;
82
- // By default, `<body>` has no `background-color` so we set one as a best practice.
83
- background-color: $body-bg;
59
+ background-color: $body-bg; // 2
84
60
  }
85
61
 
86
62
  // Suppress the focus outline on elements that cannot be accessed via keyboard.
@@ -93,6 +69,18 @@ body {
93
69
  }
94
70
 
95
71
 
72
+ // Content grouping
73
+ //
74
+ // 1. Add the correct box sizing in Firefox.
75
+ // 2. Show the overflow in Edge and IE.
76
+
77
+ hr {
78
+ box-sizing: content-box; // 1
79
+ height: 0; // 1
80
+ overflow: visible; // 2
81
+ }
82
+
83
+
96
84
  //
97
85
  // Typography
98
86
  //
@@ -116,10 +104,18 @@ p {
116
104
  }
117
105
 
118
106
  // Abbreviations
107
+ //
108
+ // 1. Remove the bottom border in Firefox 39-.
109
+ // 2. Add the correct text decoration in Chrome, Edge, IE, Opera, and Safari.
110
+ // 3. Add explicit cursor to indicate changed behavior.
111
+ // 4. Duplicate behavior to the data-* attribute for our tooltip plugin
112
+
119
113
  abbr[title],
120
- // Add data-* attribute to help out our tooltip plugin, per https://github.com/twbs/bootstrap/issues/5257
121
- abbr[data-original-title] {
122
- cursor: help;
114
+ abbr[data-original-title] { // 4
115
+ text-decoration: underline; // 2
116
+ text-decoration: underline dotted; // 2
117
+ cursor: help; // 3
118
+ border-bottom: 0; // 1
123
119
  }
124
120
 
125
121
  address {
@@ -155,6 +151,35 @@ blockquote {
155
151
  margin: 0 0 1rem;
156
152
  }
157
153
 
154
+ dfn {
155
+ font-style: italic; // Add the correct font style in Android 4.3-
156
+ }
157
+
158
+ b,
159
+ strong {
160
+ font-weight: bolder; // Add the correct font weight in Chrome, Edge, and Safari
161
+ }
162
+
163
+ small {
164
+ font-size: 80%; // Add the correct font size in all browsers
165
+ }
166
+
167
+ //
168
+ // Prevent `sub` and `sup` elements from affecting the line height in
169
+ // all browsers.
170
+ //
171
+
172
+ sub,
173
+ sup {
174
+ position: relative;
175
+ font-size: 75%;
176
+ line-height: 0;
177
+ vertical-align: baseline;
178
+ }
179
+
180
+ sub { bottom: -.25em; }
181
+ sup { top: -.5em; }
182
+
158
183
 
159
184
  //
160
185
  // Links
@@ -163,8 +188,10 @@ blockquote {
163
188
  a {
164
189
  color: $link-color;
165
190
  text-decoration: $link-decoration;
191
+ background-color: transparent; // Remove the gray background on active links in IE 10.
192
+ -webkit-text-decoration-skip: objects; // Remove gaps in links underline in iOS 8+ and Safari 8+.
166
193
 
167
- @include hover-focus {
194
+ @include hover {
168
195
  color: $link-hover-color;
169
196
  text-decoration: $link-hover-decoration;
170
197
  }
@@ -195,12 +222,20 @@ a:not([href]):not([tabindex]) {
195
222
  // Code
196
223
  //
197
224
 
225
+ pre,
226
+ code,
227
+ kbd,
228
+ samp {
229
+ font-family: monospace, monospace; // Correct the inheritance and scaling of font size in all browsers.
230
+ font-size: 1em; // Correct the odd `em` font sizing in all browsers.
231
+ }
232
+
198
233
  pre {
199
234
  // Remove browser default top margin
200
235
  margin-top: 0;
201
236
  // Reset browser default of `1em` to use `rem`s
202
237
  margin-bottom: 1rem;
203
- // Normalize v4 removed this property, causing `<pre>` content to break out of wrapping code snippets
238
+ // Don't allow content to break outside
204
239
  overflow: auto;
205
240
  }
206
241
 
@@ -210,33 +245,22 @@ pre {
210
245
  //
211
246
 
212
247
  figure {
213
- // Normalize adds `margin` to `figure`s as browsers apply it inconsistently.
214
- // We reset that to create a better flow in-page.
248
+ // Apply a consistent margin strategy (matches our type styles).
215
249
  margin: 0 0 1rem;
216
250
  }
217
251
 
218
252
 
219
253
  //
220
- // Images
254
+ // Images and content
221
255
  //
222
256
 
223
257
  img {
224
- // By default, `<img>`s are `inline-block`. This assumes that, and vertically
225
- // centers them. This won't apply should you reset them to `block` level.
226
258
  vertical-align: middle;
227
- // Note: `<img>`s are deliberately not made responsive by default.
228
- // For the rationale behind this, see the comments on the `.img-fluid` class.
259
+ border-style: none; // Remove the border on images inside links in IE 10-.
229
260
  }
230
261
 
231
-
232
- // iOS "clickable elements" fix for role="button"
233
- //
234
- // Fixes "clickability" issue (and more generally, the firing of events such as focus as well)
235
- // for traditionally non-focusable elements with role="button"
236
- // see https://developer.mozilla.org/en-US/docs/Web/Events/click#Safari_Mobile
237
-
238
- [role="button"] {
239
- cursor: pointer;
262
+ svg:not(:root) {
263
+ overflow: hidden; // Hide the overflow in IE
240
264
  }
241
265
 
242
266
 
@@ -268,10 +292,7 @@ textarea {
268
292
  //
269
293
 
270
294
  table {
271
- // No longer part of Normalize since v4
272
- border-collapse: collapse;
273
- // Reset for nesting within parents with `background-color`.
274
- background-color: $table-bg;
295
+ border-collapse: collapse; // Prevent double borders
275
296
  }
276
297
 
277
298
  caption {
@@ -283,7 +304,7 @@ caption {
283
304
  }
284
305
 
285
306
  th {
286
- // Centered by default, but left-align-ed to match the `td`s below.
307
+ // Matches default `<td>` alignment
287
308
  text-align: left;
288
309
  }
289
310
 
@@ -310,20 +331,47 @@ button:focus {
310
331
  input,
311
332
  button,
312
333
  select,
334
+ optgroup,
313
335
  textarea {
314
- // Normalize includes `font: inherit;`, so `font-family`. `font-size`, etc are
315
- // properly inherited. However, `line-height` isn't inherited there.
336
+ margin: 0; // Remove the margin in Firefox and Safari
337
+ font-family: inherit;
338
+ font-size: inherit;
316
339
  line-height: inherit;
317
340
  }
318
341
 
342
+ button,
343
+ input {
344
+ overflow: visible; // Show the overflow in Edge
345
+ }
346
+
347
+ button,
348
+ select {
349
+ text-transform: none; // Remove the inheritance of text transform in Firefox
350
+ }
351
+
352
+ // 1. Prevent a WebKit bug where (2) destroys native `audio` and `video`
353
+ // controls in Android 4.
354
+ // 2. Correct the inability to style clickable types in iOS and Safari.
355
+ button,
356
+ html [type="button"], // 1
357
+ [type="reset"],
358
+ [type="submit"] {
359
+ -webkit-appearance: button; // 2
360
+ }
361
+
362
+ // Remove inner border and padding from Firefox, but don't restore the outline like Normalize.
363
+ button::-moz-focus-inner,
364
+ [type="button"]::-moz-focus-inner,
365
+ [type="reset"]::-moz-focus-inner,
366
+ [type="submit"]::-moz-focus-inner {
367
+ padding: 0;
368
+ border-style: none;
369
+ }
370
+
319
371
  input[type="radio"],
320
372
  input[type="checkbox"] {
321
- // Apply a disabled cursor for radios and checkboxes.
322
- //
323
- // Note: Neither radios nor checkboxes can be readonly.
324
- &:disabled {
325
- cursor: $cursor-disabled;
326
- }
373
+ box-sizing: border-box; // 1. Add the correct box sizing in IE 10-
374
+ padding: 0; // 2. Remove the padding in IE 10-
327
375
  }
328
376
 
329
377
 
@@ -340,6 +388,7 @@ input[type="month"] {
340
388
  }
341
389
 
342
390
  textarea {
391
+ overflow: auto; // Remove the default vertical scrollbar in IE.
343
392
  // Textareas should really only resize vertically so they don't break their (horizontal) containers.
344
393
  resize: vertical;
345
394
  }
@@ -357,33 +406,76 @@ fieldset {
357
406
  border: 0;
358
407
  }
359
408
 
409
+ // 1. Correct the text wrapping in Edge and IE.
410
+ // 2. Correct the color inheritance from `fieldset` elements in IE.
360
411
  legend {
361
- // Reset the entire legend element to match the `fieldset`
362
412
  display: block;
363
413
  width: 100%;
414
+ max-width: 100%; // 1
364
415
  padding: 0;
365
416
  margin-bottom: .5rem;
366
417
  font-size: 1.5rem;
367
418
  line-height: inherit;
419
+ color: inherit; // 2
420
+ white-space: normal; // 1
421
+ }
422
+
423
+ progress {
424
+ vertical-align: baseline; // Add the correct vertical alignment in Chrome, Firefox, and Opera.
425
+ }
426
+
427
+ // Correct the cursor style of increment and decrement buttons in Chrome.
428
+ [type="number"]::-webkit-inner-spin-button,
429
+ [type="number"]::-webkit-outer-spin-button {
430
+ height: auto;
368
431
  }
369
432
 
370
- input[type="search"] {
433
+ [type="search"] {
371
434
  // This overrides the extra rounded corners on search inputs in iOS so that our
372
435
  // `.form-control` class can properly style them. Note that this cannot simply
373
436
  // be added to `.form-control` as it's not specific enough. For details, see
374
437
  // https://github.com/twbs/bootstrap/issues/11586.
438
+ outline-offset: -2px; // 2. Correct the outline style in Safari.
439
+ -webkit-appearance: none;
440
+ }
441
+
442
+ //
443
+ // Remove the inner padding and cancel buttons in Chrome and Safari on macOS.
444
+ //
445
+
446
+ [type="search"]::-webkit-search-cancel-button,
447
+ [type="search"]::-webkit-search-decoration {
375
448
  -webkit-appearance: none;
376
449
  }
377
450
 
378
- // todo: needed?
451
+ //
452
+ // 1. Correct the inability to style clickable types in iOS and Safari.
453
+ // 2. Change font properties to `inherit` in Safari.
454
+ //
455
+
456
+ ::-webkit-file-upload-button {
457
+ font: inherit; // 2
458
+ -webkit-appearance: button; // 1
459
+ }
460
+
461
+ //
462
+ // Correct element displays
463
+ //
464
+
379
465
  output {
380
466
  display: inline-block;
381
- // font-size: $font-size-base;
382
- // line-height: $line-height;
383
- // color: $input-color;
467
+ }
468
+
469
+ summary {
470
+ display: list-item; // Add the correct display in all browsers
471
+ }
472
+
473
+ template {
474
+ display: none; // Add the correct display in IE
384
475
  }
385
476
 
386
477
  // Always hide an element with the `hidden` HTML attribute (from PureCSS).
478
+ // Needed for proper display in IE 10-.
387
479
  [hidden] {
388
480
  display: none !important;
389
481
  }
@@ -6,6 +6,7 @@
6
6
  width: 100%;
7
7
  max-width: 100%;
8
8
  margin-bottom: $spacer;
9
+ background-color: $table-bg; // Reset for nesting within parents with `background-color`.
9
10
 
10
11
  th,
11
12
  td {
@@ -36,7 +37,7 @@
36
37
  .table-sm {
37
38
  th,
38
39
  td {
39
- padding: $table-sm-cell-padding;
40
+ padding: $table-cell-padding-sm;
40
41
  }
41
42
  }
42
43
 
@@ -68,7 +69,7 @@
68
69
 
69
70
  .table-striped {
70
71
  tbody tr:nth-of-type(odd) {
71
- background-color: $table-bg-accent;
72
+ background-color: $table-accent-bg;
72
73
  }
73
74
  }
74
75
 
@@ -80,7 +81,7 @@
80
81
  .table-hover {
81
82
  tbody tr {
82
83
  @include hover {
83
- background-color: $table-bg-hover;
84
+ background-color: $table-hover-bg;
84
85
  }
85
86
  }
86
87
  }
@@ -91,12 +92,11 @@
91
92
  // Exact selectors below required to override `.table-striped` and prevent
92
93
  // inheritance to nested tables.
93
94
 
94
- // Generate the contextual variants
95
- @include table-row-variant(active, $table-bg-active);
96
- @include table-row-variant(success, $state-success-bg);
97
- @include table-row-variant(info, $state-info-bg);
98
- @include table-row-variant(warning, $state-warning-bg);
99
- @include table-row-variant(danger, $state-danger-bg);
95
+ @each $color, $value in $theme-colors {
96
+ @include table-row-variant($color, theme-color-level($color, -9));
97
+ }
98
+
99
+ @include table-row-variant(active, $table-active-bg);
100
100
 
101
101
 
102
102
  // Inverse styles
@@ -124,14 +124,27 @@
124
124
  th,
125
125
  td,
126
126
  thead th {
127
- border-color: $body-bg;
127
+ border-color: $table-inverse-border-color;
128
128
  }
129
129
 
130
130
  &.table-bordered {
131
131
  border: 0;
132
132
  }
133
- }
134
133
 
134
+ &.table-striped {
135
+ tbody tr:nth-of-type(odd) {
136
+ background-color: $table-inverse-accent-bg;
137
+ }
138
+ }
139
+
140
+ &.table-hover {
141
+ tbody tr {
142
+ @include hover {
143
+ background-color: $table-inverse-hover-bg;
144
+ }
145
+ }
146
+ }
147
+ }
135
148
 
136
149
 
137
150
  // Responsive tables
@@ -141,13 +154,15 @@
141
154
  // will display normally.
142
155
 
143
156
  .table-responsive {
144
- display: block;
145
- width: 100%;
146
- overflow-x: auto;
147
- -ms-overflow-style: -ms-autohiding-scrollbar; // See https://github.com/twbs/bootstrap/pull/10057
148
-
149
- // Prevent double border on horizontal scroll due to use of `display: block;`
150
- &.table-bordered {
151
- border: 0;
157
+ @include media-breakpoint-down(md) {
158
+ display: block;
159
+ width: 100%;
160
+ overflow-x: auto;
161
+ -ms-overflow-style: -ms-autohiding-scrollbar; // See https://github.com/twbs/bootstrap/pull/10057
162
+
163
+ // Prevent double border on horizontal scroll due to use of `display: block;`
164
+ &.table-bordered {
165
+ border: 0;
166
+ }
152
167
  }
153
168
  }
@@ -3,6 +3,7 @@
3
3
  position: absolute;
4
4
  z-index: $zindex-tooltip;
5
5
  display: block;
6
+ margin: $tooltip-margin;
6
7
  // Our parent element can be arbitrary since tooltips are by default inserted as a sibling of their target element.
7
8
  // So reset our font and text properties to avoid inheriting weird values.
8
9
  @include reset-text();
@@ -13,62 +14,86 @@
13
14
 
14
15
  &.show { opacity: $tooltip-opacity; }
15
16
 
16
- &.tooltip-top,
17
- &.bs-tether-element-attached-bottom {
18
- padding: $tooltip-arrow-width 0;
19
- margin-top: -$tooltip-margin;
17
+ .arrow {
18
+ position: absolute;
19
+ display: block;
20
+ width: $tooltip-arrow-width;
21
+ height: $tooltip-arrow-height;
22
+ }
20
23
 
21
- .tooltip-inner::before {
24
+ &.bs-tooltip-top {
25
+ padding: $tooltip-arrow-width 0;
26
+ .arrow {
22
27
  bottom: 0;
23
- left: 50%;
24
- margin-left: -$tooltip-arrow-width;
28
+ }
29
+
30
+ .arrow::before {
31
+ margin-left: -($tooltip-arrow-width - 2);
25
32
  content: "";
26
33
  border-width: $tooltip-arrow-width $tooltip-arrow-width 0;
27
34
  border-top-color: $tooltip-arrow-color;
28
35
  }
29
36
  }
30
- &.tooltip-right,
31
- &.bs-tether-element-attached-left {
37
+ &.bs-tooltip-right {
32
38
  padding: 0 $tooltip-arrow-width;
33
- margin-left: $tooltip-margin;
34
-
35
- .tooltip-inner::before {
36
- top: 50%;
39
+ .arrow {
37
40
  left: 0;
38
- margin-top: -$tooltip-arrow-width;
41
+ }
42
+
43
+ .arrow::before {
44
+ margin-top: -($tooltip-arrow-width - 2);
39
45
  content: "";
40
46
  border-width: $tooltip-arrow-width $tooltip-arrow-width $tooltip-arrow-width 0;
41
47
  border-right-color: $tooltip-arrow-color;
42
48
  }
43
49
  }
44
- &.tooltip-bottom,
45
- &.bs-tether-element-attached-top {
50
+ &.bs-tooltip-bottom {
46
51
  padding: $tooltip-arrow-width 0;
47
- margin-top: $tooltip-margin;
48
-
49
- .tooltip-inner::before {
52
+ .arrow {
50
53
  top: 0;
51
- left: 50%;
52
- margin-left: -$tooltip-arrow-width;
54
+ }
55
+
56
+ .arrow::before {
57
+ margin-left: -($tooltip-arrow-width - 2);
53
58
  content: "";
54
59
  border-width: 0 $tooltip-arrow-width $tooltip-arrow-width;
55
60
  border-bottom-color: $tooltip-arrow-color;
56
61
  }
57
62
  }
58
- &.tooltip-left,
59
- &.bs-tether-element-attached-right {
63
+ &.bs-tooltip-left {
60
64
  padding: 0 $tooltip-arrow-width;
61
- margin-left: -$tooltip-margin;
65
+ .arrow {
66
+ right: 0;
67
+ }
62
68
 
63
- .tooltip-inner::before {
64
- top: 50%;
69
+ .arrow::before {
65
70
  right: 0;
66
- margin-top: -$tooltip-arrow-width;
71
+ margin-top: -($tooltip-arrow-width - 2);
67
72
  content: "";
68
73
  border-width: $tooltip-arrow-width 0 $tooltip-arrow-width $tooltip-arrow-width;
69
74
  border-left-color: $tooltip-arrow-color;
70
75
  }
71
76
  }
77
+ &.bs-tooltip-auto {
78
+ &[x-placement^="top"] {
79
+ @extend .bs-tooltip-top;
80
+ }
81
+ &[x-placement^="right"] {
82
+ @extend .bs-tooltip-right;
83
+ }
84
+ &[x-placement^="bottom"] {
85
+ @extend .bs-tooltip-bottom;
86
+ }
87
+ &[x-placement^="left"] {
88
+ @extend .bs-tooltip-left;
89
+ }
90
+ }
91
+
92
+ .arrow::before {
93
+ position: absolute;
94
+ border-color: transparent;
95
+ border-style: solid;
96
+ }
72
97
  }
73
98
 
74
99
  // Wrapper for the tooltip content
@@ -79,12 +104,4 @@
79
104
  text-align: center;
80
105
  background-color: $tooltip-bg;
81
106
  @include border-radius($border-radius);
82
-
83
- &::before {
84
- position: absolute;
85
- width: 0;
86
- height: 0;
87
- border-color: transparent;
88
- border-style: solid;
89
- }
90
107
  }