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
@@ -2,11 +2,13 @@
2
2
  //
3
3
  // Copy settings from this file into the provided `_custom.scss` to override
4
4
  // the Bootstrap defaults without modifying key, versioned files.
5
-
5
+ //
6
+ // Variables should follow the `$component-state-property-size` formula for
7
+ // consistent naming. Ex: $nav-link-disabled-color and $modal-content-box-shadow-xs.
6
8
 
7
9
  // Table of Contents
8
10
  //
9
- // Colors
11
+ // Color system
10
12
  // Options
11
13
  // Spacing
12
14
  // Body
@@ -21,8 +23,8 @@
21
23
  // Forms
22
24
  // Dropdowns
23
25
  // Z-index master list
24
- // Navbar
25
26
  // Navs
27
+ // Navbar
26
28
  // Pagination
27
29
  // Jumbotron
28
30
  // Form states and alerts
@@ -41,82 +43,75 @@
41
43
  // Close
42
44
  // Code
43
45
 
44
- @mixin _assert-ascending($map, $map-name) {
45
- $prev-key: null;
46
- $prev-num: null;
47
- @each $key, $num in $map {
48
- @if $prev-num == null {
49
- // Do nothing
50
- } @else if not comparable($prev-num, $num) {
51
- @warn "Potentially invalid value for #{$map-name}: This map must be in ascending order, but key '#{$key}' has value #{$num} whose unit makes it incomparable to #{$prev-num}, the value of the previous key '#{$prev-key}' !";
52
- } @else if $prev-num >= $num {
53
- @warn "Invalid value for #{$map-name}: This map must be in ascending order, but key '#{$key}' has value #{$num} which isn't greater than #{$prev-num}, the value of the previous key '#{$prev-key}' !";
54
- }
55
- $prev-key: $key;
56
- $prev-num: $num;
57
- }
58
- }
59
-
60
- // Replace `$search` with `$replace` in `$string`
61
- // @author Hugo Giraudel
62
- // @param {String} $string - Initial string
63
- // @param {String} $search - Substring to replace
64
- // @param {String} $replace ('') - New value
65
- // @return {String} - Updated string
66
- @function str-replace($string, $search, $replace: "") {
67
- $index: str-index($string, $search);
68
-
69
- @if $index {
70
- @return str-slice($string, 1, $index - 1) + $replace + str-replace(str-slice($string, $index + str-length($search)), $search, $replace);
71
- }
72
-
73
- @return $string;
74
- }
75
-
76
- @mixin _assert-starts-at-zero($map) {
77
- $values: map-values($map);
78
- $first-value: nth($values, 1);
79
- @if $first-value != 0 {
80
- @warn "First breakpoint in `$grid-breakpoints` must start at 0, but starts at #{$first-value}.";
81
- }
82
- }
83
-
84
-
85
- // General variable structure
86
- //
87
- // Variable format should follow the `$component-modifier-state-property` order.
88
46
 
89
-
90
- // Colors
91
47
  //
92
- // Grayscale and brand colors for use across Bootstrap.
48
+ // Color system
49
+ //
93
50
 
94
- // Start with assigning color names to specific hex values.
95
51
  $white: #fff !default;
52
+ $gray-100: #f8f9fa !default;
53
+ $gray-200: #e9ecef !default;
54
+ $gray-300: #dee2e6 !default;
55
+ $gray-400: #ced4da !default;
56
+ $gray-500: #adb5bd !default;
57
+ $gray-600: #868e96 !default;
58
+ $gray-700: #495057 !default;
59
+ $gray-800: #343a40 !default;
60
+ $gray-900: #212529 !default;
96
61
  $black: #000 !default;
97
- $red: #d9534f !default;
98
- $orange: #f0ad4e !default;
99
- $yellow: #ffd500 !default;
100
- $green: #5cb85c !default;
101
- $blue: #0275d8 !default;
102
- $teal: #5bc0de !default;
103
- $pink: #ff5b77 !default;
104
- $purple: #613d7c !default;
105
-
106
- // Create grayscale
107
- $gray-dark: #292b2c !default;
108
- $gray: #464a4c !default;
109
- $gray-light: #636c72 !default;
110
- $gray-lighter: #eceeef !default;
111
- $gray-lightest: #f7f7f9 !default;
112
-
113
- // Reassign color vars to semantic color scheme
114
- $brand-primary: $blue !default;
115
- $brand-success: $green !default;
116
- $brand-info: $teal !default;
117
- $brand-warning: $orange !default;
118
- $brand-danger: $red !default;
119
- $brand-inverse: $gray-dark !default;
62
+
63
+ $grays: (
64
+ 100: $gray-100,
65
+ 200: $gray-200,
66
+ 300: $gray-300,
67
+ 400: $gray-400,
68
+ 500: $gray-500,
69
+ 600: $gray-600,
70
+ 700: $gray-700,
71
+ 800: $gray-800,
72
+ 900: $gray-900
73
+ ) !default;
74
+
75
+ $blue: #007bff !default;
76
+ $indigo: #6610f2 !default;
77
+ $purple: #6f42c1 !default;
78
+ $pink: #e83e8c !default;
79
+ $red: #dc3545 !default;
80
+ $orange: #fd7e14 !default;
81
+ $yellow: #ffc107 !default;
82
+ $green: #28a745 !default;
83
+ $teal: #20c997 !default;
84
+ $cyan: #17a2b8 !default;
85
+
86
+ $colors: (
87
+ blue: $blue,
88
+ indigo: $indigo,
89
+ purple: $purple,
90
+ pink: $pink,
91
+ red: $red,
92
+ orange: $orange,
93
+ yellow: $yellow,
94
+ green: $green,
95
+ teal: $teal,
96
+ cyan: $cyan,
97
+ white: $white,
98
+ gray: $gray-600,
99
+ gray-dark: $gray-800
100
+ ) !default;
101
+
102
+ $theme-colors: (
103
+ primary: $blue,
104
+ secondary: $gray-600,
105
+ success: $green,
106
+ info: $cyan,
107
+ warning: $yellow,
108
+ danger: $red,
109
+ light: $gray-100,
110
+ dark: $gray-800
111
+ ) !default;
112
+
113
+ // Set a specific jump point for requesting color jumps
114
+ $theme-color-interval: 8% !default;
120
115
 
121
116
 
122
117
  // Options
@@ -138,36 +133,15 @@ $enable-print-styles: true !default;
138
133
  // variables. Mostly focused on spacing.
139
134
  // You can add more entries to the $spacers map, should you need more variation.
140
135
 
141
- $spacer: 1rem !default;
142
- $spacer-x: $spacer !default;
143
- $spacer-y: $spacer !default;
136
+ $spacer: 1rem !default;
144
137
  $spacers: (
145
- 0: (
146
- x: 0,
147
- y: 0
148
- ),
149
- 1: (
150
- x: ($spacer-x * .25),
151
- y: ($spacer-y * .25)
152
- ),
153
- 2: (
154
- x: ($spacer-x * .5),
155
- y: ($spacer-y * .5)
156
- ),
157
- 3: (
158
- x: $spacer-x,
159
- y: $spacer-y
160
- ),
161
- 4: (
162
- x: ($spacer-x * 1.5),
163
- y: ($spacer-y * 1.5)
164
- ),
165
- 5: (
166
- x: ($spacer-x * 3),
167
- y: ($spacer-y * 3)
168
- )
138
+ 0: 0,
139
+ 1: ($spacer * .25),
140
+ 2: ($spacer * .5),
141
+ 3: $spacer,
142
+ 4: ($spacer * 1.5),
143
+ 5: ($spacer * 3)
169
144
  ) !default;
170
- $border-width: 1px !default;
171
145
 
172
146
  // This variable affects the `.h-*` and `.w-*` classes.
173
147
  $sizes: (
@@ -182,16 +156,13 @@ $sizes: (
182
156
  // Settings for the `<body>` element.
183
157
 
184
158
  $body-bg: $white !default;
185
- $body-color: $gray-dark !default;
186
- $inverse-bg: $gray-dark !default;
187
- $inverse-color: $gray-lighter !default;
188
-
159
+ $body-color: $gray-900 !default;
189
160
 
190
161
  // Links
191
162
  //
192
163
  // Style anchor elements.
193
164
 
194
- $link-color: $brand-primary !default;
165
+ $link-color: theme-color("primary") !default;
195
166
  $link-decoration: none !default;
196
167
  $link-hover-color: darken($link-color, 15%) !default;
197
168
  $link-hover-decoration: underline !default;
@@ -230,29 +201,43 @@ $container-max-widths: (
230
201
  //
231
202
  // Set the number of columns and specify the width of the gutters.
232
203
 
233
- $grid-columns: 12 !default;
234
- $grid-gutter-width-base: 30px !default;
235
- $grid-gutter-widths: (
236
- xs: $grid-gutter-width-base,
237
- sm: $grid-gutter-width-base,
238
- md: $grid-gutter-width-base,
239
- lg: $grid-gutter-width-base,
240
- xl: $grid-gutter-width-base
241
- ) !default;
204
+ $grid-columns: 12 !default;
205
+ $grid-gutter-width: 30px !default;
206
+
207
+ // Components
208
+ //
209
+ // Define common padding and border radius sizes and more.
210
+
211
+ $line-height-lg: 1.5 !default;
212
+ $line-height-sm: 1.5 !default;
213
+
214
+ $border-width: 1px !default;
215
+
216
+ $border-radius: .25rem !default;
217
+ $border-radius-lg: .3rem !default;
218
+ $border-radius-sm: .2rem !default;
219
+
220
+ $component-active-color: $white !default;
221
+ $component-active-bg: theme-color("primary") !default;
222
+
223
+ $caret-width: .3em !default;
224
+
225
+ $transition-base: all .2s ease-in-out !default;
226
+ $transition-fade: opacity .15s linear !default;
227
+ $transition-collapse: height .35s ease !default;
228
+
242
229
 
243
230
  // Fonts
244
231
  //
245
232
  // Font, line-height, and color for body text, headings, and more.
246
233
 
247
- $font-family-sans-serif: -apple-system, system-ui, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, sans-serif !default;
248
- $font-family-serif: Georgia, "Times New Roman", Times, serif !default;
234
+ $font-family-sans-serif: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, sans-serif !default;
249
235
  $font-family-monospace: Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace !default;
250
236
  $font-family-base: $font-family-sans-serif !default;
251
237
 
252
238
  $font-size-base: 1rem !default; // Assumes the browser default, typically `16px`
253
239
  $font-size-lg: 1.25rem !default;
254
240
  $font-size-sm: .875rem !default;
255
- $font-size-xs: .75rem !default;
256
241
 
257
242
  $font-weight-normal: normal !default;
258
243
  $font-weight-bold: bold !default;
@@ -260,12 +245,12 @@ $font-weight-bold: bold !default;
260
245
  $font-weight-base: $font-weight-normal !default;
261
246
  $line-height-base: 1.5 !default;
262
247
 
263
- $font-size-h1: 2.5rem !default;
264
- $font-size-h2: 2rem !default;
265
- $font-size-h3: 1.75rem !default;
266
- $font-size-h4: 1.5rem !default;
267
- $font-size-h5: 1.25rem !default;
268
- $font-size-h6: 1rem !default;
248
+ $h1-font-size: 2.5rem !default;
249
+ $h2-font-size: 2rem !default;
250
+ $h3-font-size: 1.75rem !default;
251
+ $h4-font-size: 1.5rem !default;
252
+ $h5-font-size: 1.25rem !default;
253
+ $h6-font-size: 1rem !default;
269
254
 
270
255
  $headings-margin-bottom: ($spacer / 2) !default;
271
256
  $headings-font-family: inherit !default;
@@ -289,14 +274,10 @@ $lead-font-weight: 300 !default;
289
274
 
290
275
  $small-font-size: 80% !default;
291
276
 
292
- $text-muted: $gray-light !default;
293
-
294
- $abbr-border-color: $gray-light !default;
277
+ $text-muted: $gray-600 !default;
295
278
 
296
- $blockquote-small-color: $gray-light !default;
279
+ $blockquote-small-color: $gray-600 !default;
297
280
  $blockquote-font-size: ($font-size-base * 1.25) !default;
298
- $blockquote-border-color: $gray-lighter !default;
299
- $blockquote-border-width: .25rem !default;
300
281
 
301
282
  $hr-border-color: rgba($black,.1) !default;
302
283
  $hr-border-width: $border-width !default;
@@ -310,26 +291,7 @@ $nested-kbd-font-weight: $font-weight-bold !default;
310
291
 
311
292
  $list-inline-padding: 5px !default;
312
293
 
313
-
314
- // Components
315
- //
316
- // Define common padding and border radius sizes and more.
317
-
318
- $line-height-lg: (4 / 3) !default;
319
- $line-height-sm: 1.5 !default;
320
-
321
- $border-radius: .25rem !default;
322
- $border-radius-lg: .3rem !default;
323
- $border-radius-sm: .2rem !default;
324
-
325
- $component-active-color: $white !default;
326
- $component-active-bg: $brand-primary !default;
327
-
328
- $caret-width: .3em !default;
329
-
330
- $transition-base: all .2s ease-in-out !default;
331
- $transition-fade: opacity .15s linear !default;
332
- $transition-collapse: height .35s ease !default;
294
+ $mark-bg: #fcf8e3 !default;
333
295
 
334
296
 
335
297
  // Tables
@@ -337,89 +299,65 @@ $transition-collapse: height .35s ease !default;
337
299
  // Customizes the `.table` component with basic values, each used across all table variations.
338
300
 
339
301
  $table-cell-padding: .75rem !default;
340
- $table-sm-cell-padding: .3rem !default;
302
+ $table-cell-padding-sm: .3rem !default;
341
303
 
342
304
  $table-bg: transparent !default;
305
+ $table-accent-bg: rgba($black,.05) !default;
306
+ $table-hover-bg: rgba($black,.075) !default;
307
+ $table-active-bg: $table-hover-bg !default;
343
308
 
344
- $table-inverse-bg: $gray-dark !default;
345
- $table-inverse-color: $body-bg !default;
346
-
347
- $table-bg-accent: rgba($black,.05) !default;
348
- $table-bg-hover: rgba($black,.075) !default;
349
- $table-bg-active: $table-bg-hover !default;
309
+ $table-border-width: $border-width !default;
310
+ $table-border-color: $gray-200 !default;
350
311
 
351
- $table-head-bg: $gray-lighter !default;
352
- $table-head-color: $gray !default;
312
+ $table-head-bg: $gray-200 !default;
313
+ $table-head-color: $gray-700 !default;
353
314
 
354
- $table-border-width: $border-width !default;
355
- $table-border-color: $gray-lighter !default;
315
+ $table-inverse-bg: $gray-900 !default;
316
+ $table-inverse-accent-bg: rgba($white, .05) !default;
317
+ $table-inverse-hover-bg: rgba($white, .075) !default;
318
+ $table-inverse-border-color: lighten($gray-900, 7.5%) !default;
319
+ $table-inverse-color: $body-bg !default;
356
320
 
357
321
 
358
322
  // Buttons
359
323
  //
360
324
  // For each of Bootstrap's buttons, define text, background and border color.
361
325
 
362
- $btn-padding-x: 1rem !default;
363
- $btn-padding-y: .5rem !default;
364
- $btn-line-height: 1.25 !default;
365
- $btn-font-weight: $font-weight-normal !default;
366
- $btn-box-shadow: inset 0 1px 0 rgba($white,.15), 0 1px 1px rgba($black,.075) !default;
367
- $btn-focus-box-shadow: 0 0 0 2px rgba($brand-primary, .25) !default;
368
- $btn-active-box-shadow: inset 0 3px 5px rgba($black,.125) !default;
369
-
370
- $btn-primary-color: $white !default;
371
- $btn-primary-bg: $brand-primary !default;
372
- $btn-primary-border: $btn-primary-bg !default;
326
+ $input-btn-padding-y: .5rem !default;
327
+ $input-btn-padding-x: .75rem !default;
328
+ $input-btn-line-height: 1.25 !default;
373
329
 
374
- $btn-secondary-color: $gray-dark !default;
375
- $btn-secondary-bg: $white !default;
376
- $btn-secondary-border: #ccc !default;
330
+ $input-btn-padding-y-sm: .25rem !default;
331
+ $input-btn-padding-x-sm: .5rem !default;
332
+ $input-btn-line-height-sm: 1.5 !default;
377
333
 
378
- $btn-info-color: $white !default;
379
- $btn-info-bg: $brand-info !default;
380
- $btn-info-border: $btn-info-bg !default;
334
+ $input-btn-padding-y-lg: .5rem !default;
335
+ $input-btn-padding-x-lg: 1rem !default;
336
+ $input-btn-line-height-lg: 1.5 !default;
381
337
 
382
- $btn-success-color: $white !default;
383
- $btn-success-bg: $brand-success !default;
384
- $btn-success-border: $btn-success-bg !default;
385
-
386
- $btn-warning-color: $white !default;
387
- $btn-warning-bg: $brand-warning !default;
388
- $btn-warning-border: $btn-warning-bg !default;
389
-
390
- $btn-danger-color: $white !default;
391
- $btn-danger-bg: $brand-danger !default;
392
- $btn-danger-border: $btn-danger-bg !default;
393
-
394
- $btn-link-disabled-color: $gray-light !default;
395
-
396
- $btn-padding-x-sm: .5rem !default;
397
- $btn-padding-y-sm: .25rem !default;
338
+ $btn-font-weight: $font-weight-normal !default;
339
+ $btn-box-shadow: inset 0 1px 0 rgba($white,.15), 0 1px 1px rgba($black,.075) !default;
340
+ $btn-focus-box-shadow: 0 0 0 3px rgba(theme-color("primary"), .25) !default;
341
+ $btn-active-box-shadow: inset 0 3px 5px rgba($black,.125) !default;
398
342
 
399
- $btn-padding-x-lg: 1.5rem !default;
400
- $btn-padding-y-lg: .75rem !default;
343
+ $btn-link-disabled-color: $gray-600 !default;
401
344
 
402
345
  $btn-block-spacing-y: .5rem !default;
403
- $btn-toolbar-margin: .5rem !default;
404
346
 
405
347
  // Allows for customizing button radius independently from global border radius
406
348
  $btn-border-radius: $border-radius !default;
407
349
  $btn-border-radius-lg: $border-radius-lg !default;
408
350
  $btn-border-radius-sm: $border-radius-sm !default;
409
351
 
410
- $btn-transition: all .2s ease-in-out !default;
352
+ $btn-transition: all .15s ease-in-out !default;
411
353
 
412
354
 
413
355
  // Forms
414
356
 
415
- $input-padding-x: .75rem !default;
416
- $input-padding-y: .5rem !default;
417
- $input-line-height: 1.25 !default;
418
-
419
357
  $input-bg: $white !default;
420
- $input-bg-disabled: $gray-lighter !default;
358
+ $input-disabled-bg: $gray-200 !default;
421
359
 
422
- $input-color: $gray !default;
360
+ $input-color: $gray-700 !default;
423
361
  $input-border-color: rgba($black,.15) !default;
424
362
  $input-btn-border-width: $border-width !default; // For form controls and buttons
425
363
  $input-box-shadow: inset 0 1px 1px rgba($black,.075) !default;
@@ -428,27 +366,27 @@ $input-border-radius: $border-radius !default;
428
366
  $input-border-radius-lg: $border-radius-lg !default;
429
367
  $input-border-radius-sm: $border-radius-sm !default;
430
368
 
431
- $input-bg-focus: $input-bg !default;
432
- $input-border-focus: lighten($brand-primary, 25%) !default;
433
- $input-box-shadow-focus: $input-box-shadow, rgba($input-border-focus, .6) !default;
434
- $input-color-focus: $input-color !default;
369
+ $input-focus-bg: $input-bg !default;
370
+ $input-focus-border-color: lighten(theme-color("primary"), 25%) !default;
371
+ $input-focus-box-shadow: $input-box-shadow, $btn-focus-box-shadow !default;
372
+ $input-focus-color: $input-color !default;
373
+
374
+ $input-placeholder-color: $gray-600 !default;
435
375
 
436
- $input-color-placeholder: $gray-light !default;
376
+ $input-height-border: $input-btn-border-width * 2 !default;
437
377
 
438
- $input-padding-x-sm: .5rem !default;
439
- $input-padding-y-sm: .25rem !default;
378
+ $input-height-inner: ($font-size-base * $input-btn-line-height) + ($input-btn-padding-y * 2) !default;
379
+ $input-height: calc(#{$input-height-inner} + #{$input-height-border}) !default;
440
380
 
441
- $input-padding-x-lg: 1.5rem !default;
442
- $input-padding-y-lg: .75rem !default;
381
+ $input-height-inner-sm: ($font-size-sm * $input-btn-line-height-sm) + ($input-btn-padding-y-sm * 2) !default;
382
+ $input-height-sm: calc(#{$input-height-inner-sm} + #{$input-height-border}) !default;
443
383
 
444
- $input-height: (($font-size-base * $input-line-height) + ($input-padding-y * 2)) !default;
445
- $input-height-lg: (($font-size-lg * $line-height-lg) + ($input-padding-y-lg * 2)) !default;
446
- $input-height-sm: (($font-size-sm * $line-height-sm) + ($input-padding-y-sm * 2)) !default;
384
+ $input-height-inner-lg: ($font-size-sm * $input-btn-line-height-lg) + ($input-btn-padding-y-lg * 2) !default;
385
+ $input-height-lg: calc(#{$input-height-inner-lg} + #{$input-height-border}) !default;
447
386
 
448
387
  $input-transition: border-color ease-in-out .15s, box-shadow ease-in-out .15s !default;
449
388
 
450
389
  $form-text-margin-top: .25rem !default;
451
- $form-feedback-margin-top: $form-text-margin-top !default;
452
390
 
453
391
  $form-check-margin-bottom: .5rem !default;
454
392
  $form-check-input-gutter: 1.25rem !default;
@@ -457,56 +395,53 @@ $form-check-input-margin-x: .25rem !default;
457
395
 
458
396
  $form-check-inline-margin-x: .75rem !default;
459
397
 
460
- $form-group-margin-bottom: $spacer-y !default;
398
+ $form-group-margin-bottom: 1rem !default;
461
399
 
462
- $input-group-addon-bg: $gray-lighter !default;
400
+ $input-group-addon-bg: $gray-200 !default;
463
401
  $input-group-addon-border-color: $input-border-color !default;
464
402
 
465
- $cursor-disabled: not-allowed !default;
466
-
467
403
  $custom-control-gutter: 1.5rem !default;
468
- $custom-control-spacer-x: 1rem !default;
469
404
  $custom-control-spacer-y: .25rem !default;
405
+ $custom-control-spacer-x: 1rem !default;
470
406
 
471
407
  $custom-control-indicator-size: 1rem !default;
472
- $custom-control-indicator-margin-y: (($line-height-base * 1rem) - $custom-control-indicator-size) / -2 !default;
473
408
  $custom-control-indicator-bg: #ddd !default;
474
409
  $custom-control-indicator-bg-size: 50% 50% !default;
475
410
  $custom-control-indicator-box-shadow: inset 0 .25rem .25rem rgba($black,.1) !default;
476
411
 
477
- $custom-control-disabled-cursor: $cursor-disabled !default;
478
- $custom-control-disabled-indicator-bg: $gray-lighter !default;
479
- $custom-control-disabled-description-color: $gray-light !default;
412
+ $custom-control-indicator-disabled-bg: $gray-200 !default;
413
+ $custom-control-description-disabled-color: $gray-600 !default;
480
414
 
481
- $custom-control-checked-indicator-color: $white !default;
482
- $custom-control-checked-indicator-bg: $brand-primary !default;
483
- $custom-control-checked-indicator-box-shadow: none !default;
415
+ $custom-control-indicator-checked-color: $white !default;
416
+ $custom-control-indicator-checked-bg: theme-color("primary") !default;
417
+ $custom-control-indicator-checked-box-shadow: none !default;
484
418
 
485
- $custom-control-focus-indicator-box-shadow: 0 0 0 1px $body-bg, 0 0 0 3px $brand-primary !default;
419
+ $custom-control-indicator-focus-box-shadow: 0 0 0 1px $body-bg, 0 0 0 3px theme-color("primary") !default;
486
420
 
487
- $custom-control-active-indicator-color: $white !default;
488
- $custom-control-active-indicator-bg: lighten($brand-primary, 35%) !default;
489
- $custom-control-active-indicator-box-shadow: none !default;
421
+ $custom-control-indicator-active-color: $white !default;
422
+ $custom-control-indicator-active-bg: lighten(theme-color("primary"), 35%) !default;
423
+ $custom-control-indicator-active-box-shadow: none !default;
490
424
 
491
- $custom-checkbox-radius: $border-radius !default;
492
- $custom-checkbox-checked-icon: str-replace(url("data:image/svg+xml;charset=utf8,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 8 8'%3E%3Cpath fill='#{$custom-control-checked-indicator-color}' d='M6.564.75l-3.59 3.612-1.538-1.55L0 4.26 2.974 7.25 8 2.193z'/%3E%3C/svg%3E"), "#", "%23") !default;
425
+ $custom-checkbox-indicator-border-radius: $border-radius !default;
426
+ $custom-checkbox-indicator-icon-checked: str-replace(url("data:image/svg+xml;charset=utf8,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 8 8'%3E%3Cpath fill='#{$custom-control-indicator-checked-color}' d='M6.564.75l-3.59 3.612-1.538-1.55L0 4.26 2.974 7.25 8 2.193z'/%3E%3C/svg%3E"), "#", "%23") !default;
493
427
 
494
- $custom-checkbox-indeterminate-bg: $brand-primary !default;
495
- $custom-checkbox-indeterminate-indicator-color: $custom-control-checked-indicator-color !default;
496
- $custom-checkbox-indeterminate-icon: str-replace(url("data:image/svg+xml;charset=utf8,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 4 4'%3E%3Cpath stroke='#{$custom-checkbox-indeterminate-indicator-color}' d='M0 2h4'/%3E%3C/svg%3E"), "#", "%23") !default;
497
- $custom-checkbox-indeterminate-box-shadow: none !default;
428
+ $custom-checkbox-indicator-indeterminate-bg: theme-color("primary") !default;
429
+ $custom-checkbox-indicator-indeterminate-color: $custom-control-indicator-checked-color !default;
430
+ $custom-checkbox-indicator-icon-indeterminate: str-replace(url("data:image/svg+xml;charset=utf8,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 4 4'%3E%3Cpath stroke='#{$custom-checkbox-indicator-indeterminate-color}' d='M0 2h4'/%3E%3C/svg%3E"), "#", "%23") !default;
431
+ $custom-checkbox-indicator-indeterminate-box-shadow: none !default;
498
432
 
499
- $custom-radio-radius: 50% !default;
500
- $custom-radio-checked-icon: str-replace(url("data:image/svg+xml;charset=utf8,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='-4 -4 8 8'%3E%3Ccircle r='3' fill='#{$custom-control-checked-indicator-color}'/%3E%3C/svg%3E"), "#", "%23") !default;
433
+ $custom-radio-indicator-border-radius: 50% !default;
434
+ $custom-radio-indicator-icon-checked: str-replace(url("data:image/svg+xml;charset=utf8,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='-4 -4 8 8'%3E%3Ccircle r='3' fill='#{$custom-control-indicator-checked-color}'/%3E%3C/svg%3E"), "#", "%23") !default;
501
435
 
502
- $custom-select-padding-x: .75rem !default;
503
436
  $custom-select-padding-y: .375rem !default;
437
+ $custom-select-padding-x: .75rem !default;
438
+ $custom-select-height: $input-height !default;
504
439
  $custom-select-indicator-padding: 1rem !default; // Extra padding to account for the presence of the background-image based indicator
505
- $custom-select-line-height: $input-line-height !default;
440
+ $custom-select-line-height: $input-btn-line-height !default;
506
441
  $custom-select-color: $input-color !default;
507
- $custom-select-disabled-color: $gray-light !default;
442
+ $custom-select-disabled-color: $gray-600 !default;
508
443
  $custom-select-bg: $white !default;
509
- $custom-select-disabled-bg: $gray-lighter !default;
444
+ $custom-select-disabled-bg: $gray-200 !default;
510
445
  $custom-select-bg-size: 8px 10px !default; // In pixels because image dimensions
511
446
  $custom-select-indicator-color: #333 !default;
512
447
  $custom-select-indicator: str-replace(url("data:image/svg+xml;charset=utf8,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 4 5'%3E%3Cpath fill='#{$custom-select-indicator-color}' d='M2 0L0 2h4zm0 5L0 3h4z'/%3E%3C/svg%3E"), "#", "%23") !default;
@@ -514,27 +449,27 @@ $custom-select-border-width: $input-btn-border-width !default;
514
449
  $custom-select-border-color: $input-border-color !default;
515
450
  $custom-select-border-radius: $border-radius !default;
516
451
 
517
- $custom-select-focus-border-color: lighten($brand-primary, 25%) !default;
452
+ $custom-select-focus-border-color: lighten(theme-color("primary"), 25%) !default;
518
453
  $custom-select-focus-box-shadow: inset 0 1px 2px rgba($black, .075), 0 0 5px rgba($custom-select-focus-border-color, .5) !default;
519
454
 
520
- $custom-select-sm-padding-y: .2rem !default;
521
- $custom-select-sm-font-size: 75% !default;
455
+ $custom-select-font-size-sm: 75% !default;
456
+ $custom-select-height-sm: $input-height-sm !default;
522
457
 
523
458
  $custom-file-height: 2.5rem !default;
524
459
  $custom-file-width: 14rem !default;
525
- $custom-file-focus-box-shadow: 0 0 0 .075rem $white, 0 0 0 .2rem $brand-primary !default;
460
+ $custom-file-focus-box-shadow: 0 0 0 .075rem $white, 0 0 0 .2rem theme-color("primary") !default;
526
461
 
527
- $custom-file-padding-x: .5rem !default;
528
462
  $custom-file-padding-y: 1rem !default;
463
+ $custom-file-padding-x: .5rem !default;
529
464
  $custom-file-line-height: 1.5 !default;
530
- $custom-file-color: $gray !default;
465
+ $custom-file-color: $gray-700 !default;
531
466
  $custom-file-bg: $white !default;
532
467
  $custom-file-border-width: $border-width !default;
533
468
  $custom-file-border-color: $input-border-color !default;
534
469
  $custom-file-border-radius: $border-radius !default;
535
470
  $custom-file-box-shadow: inset 0 .2rem .4rem rgba($black,.05) !default;
536
471
  $custom-file-button-color: $custom-file-color !default;
537
- $custom-file-button-bg: $gray-lighter !default;
472
+ $custom-file-button-bg: $gray-200 !default;
538
473
  $custom-file-text: (
539
474
  placeholder: (
540
475
  en: "Choose file..."
@@ -545,15 +480,9 @@ $custom-file-text: (
545
480
  ) !default;
546
481
 
547
482
 
548
- // Form validation icons
549
- $form-icon-success-color: $brand-success !default;
550
- $form-icon-success: str-replace(url("data:image/svg+xml;charset=utf8,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 8 8'%3E%3Cpath fill='#{$form-icon-success-color}' d='M2.3 6.73L.6 4.53c-.4-1.04.46-1.4 1.1-.8l1.1 1.4 3.4-3.8c.6-.63 1.6-.27 1.2.7l-4 4.6c-.43.5-.8.4-1.1.1z'/%3E%3C/svg%3E"), "#", "%23") !default;
551
-
552
- $form-icon-warning-color: $brand-warning !default;
553
- $form-icon-warning: str-replace(url("data:image/svg+xml;charset=utf8,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 8 8'%3E%3Cpath fill='#{$form-icon-warning-color}' d='M4.4 5.324h-.8v-2.46h.8zm0 1.42h-.8V5.89h.8zM3.76.63L.04 7.075c-.115.2.016.425.26.426h7.397c.242 0 .372-.226.258-.426C6.726 4.924 5.47 2.79 4.253.63c-.113-.174-.39-.174-.494 0z'/%3E%3C/svg%3E"), "#", "%23") !default;
554
-
555
- $form-icon-danger-color: $brand-danger !default;
556
- $form-icon-danger: str-replace(url("data:image/svg+xml;charset=utf8,%3Csvg xmlns='http://www.w3.org/2000/svg' fill='#{$form-icon-danger-color}' viewBox='-2 -2 7 7'%3E%3Cpath stroke='%23d9534f' d='M0 0l3 3m0-3L0 3'/%3E%3Ccircle r='.5'/%3E%3Ccircle cx='3' r='.5'/%3E%3Ccircle cy='3' r='.5'/%3E%3Ccircle cx='3' cy='3' r='.5'/%3E%3C/svg%3E"), "#", "%23") !default;
483
+ // Form validation
484
+ $form-feedback-valid-color: theme-color("success") !default;
485
+ $form-feedback-invalid-color: theme-color("danger") !default;
557
486
 
558
487
 
559
488
  // Dropdowns
@@ -562,25 +491,26 @@ $form-icon-danger: str-replace(url("data:image/svg+xml;charset=utf8,%3Csvg xmlns
562
491
 
563
492
  $dropdown-min-width: 10rem !default;
564
493
  $dropdown-padding-y: .5rem !default;
565
- $dropdown-margin-top: .125rem !default;
494
+ $dropdown-spacer: .125rem !default;
566
495
  $dropdown-bg: $white !default;
567
496
  $dropdown-border-color: rgba($black,.15) !default;
568
497
  $dropdown-border-width: $border-width !default;
569
- $dropdown-divider-bg: $gray-lighter !default;
498
+ $dropdown-divider-bg: $gray-200 !default;
570
499
  $dropdown-box-shadow: 0 .5rem 1rem rgba($black,.175) !default;
571
500
 
572
- $dropdown-link-color: $gray-dark !default;
573
- $dropdown-link-hover-color: darken($gray-dark, 5%) !default;
574
- $dropdown-link-hover-bg: $gray-lightest !default;
501
+ $dropdown-link-color: $gray-900 !default;
502
+ $dropdown-link-hover-color: darken($gray-900, 5%) !default;
503
+ $dropdown-link-hover-bg: $gray-100 !default;
575
504
 
576
505
  $dropdown-link-active-color: $component-active-color !default;
577
506
  $dropdown-link-active-bg: $component-active-bg !default;
578
507
 
579
- $dropdown-link-disabled-color: $gray-light !default;
508
+ $dropdown-link-disabled-color: $gray-600 !default;
580
509
 
510
+ $dropdown-item-padding-y: .25rem !default;
581
511
  $dropdown-item-padding-x: 1.5rem !default;
582
512
 
583
- $dropdown-header-color: $gray-light !default;
513
+ $dropdown-header-color: $gray-600 !default;
584
514
 
585
515
 
586
516
  // Z-index master list
@@ -588,75 +518,70 @@ $dropdown-header-color: $gray-light !default;
588
518
  // Warning: Avoid customizing these values. They're used for a bird's eye view
589
519
  // of components dependent on the z-axis and are designed to all work together.
590
520
 
591
- $zindex-dropdown-backdrop: 990 !default;
592
- $zindex-navbar: 1000 !default;
593
521
  $zindex-dropdown: 1000 !default;
522
+ $zindex-sticky: 1020 !default;
594
523
  $zindex-fixed: 1030 !default;
595
- $zindex-sticky: 1030 !default;
596
524
  $zindex-modal-backdrop: 1040 !default;
597
525
  $zindex-modal: 1050 !default;
598
526
  $zindex-popover: 1060 !default;
599
527
  $zindex-tooltip: 1070 !default;
600
528
 
529
+ // Navs
530
+
531
+ $nav-link-padding-y: .5rem !default;
532
+ $nav-link-padding-x: 1rem !default;
533
+ $nav-link-disabled-color: $gray-600 !default;
534
+
535
+ $nav-tabs-border-color: #ddd !default;
536
+ $nav-tabs-border-width: $border-width !default;
537
+ $nav-tabs-border-radius: $border-radius !default;
538
+ $nav-tabs-link-hover-border-color: $gray-200 !default;
539
+ $nav-tabs-link-active-color: $gray-700 !default;
540
+ $nav-tabs-link-active-bg: $body-bg !default;
541
+ $nav-tabs-link-active-border-color: #ddd !default;
542
+
543
+ $nav-pills-border-radius: $border-radius !default;
544
+ $nav-pills-link-active-color: $component-active-color !default;
545
+ $nav-pills-link-active-bg: $component-active-bg !default;
601
546
 
602
547
  // Navbar
603
548
 
604
- $navbar-border-radius: $border-radius !default;
605
- $navbar-padding-x: $spacer !default;
606
549
  $navbar-padding-y: ($spacer / 2) !default;
550
+ $navbar-padding-x: $spacer !default;
607
551
 
608
- $navbar-brand-padding-y: .25rem !default;
552
+ $navbar-brand-font-size: $font-size-lg !default;
553
+ // Compute the navbar-brand padding-y so the navbar-brand will have the same height as navbar-text and nav-link
554
+ $nav-link-height: $navbar-brand-font-size * $line-height-base !default;
555
+ $navbar-brand-height: ($font-size-base * $line-height-base + $nav-link-padding-y * 2) !default;
556
+ $navbar-brand-padding-y: ($navbar-brand-height - $nav-link-height) / 2 !default;
609
557
 
610
- $navbar-toggler-padding-x: .75rem !default;
611
558
  $navbar-toggler-padding-y: .25rem !default;
559
+ $navbar-toggler-padding-x: .75rem !default;
612
560
  $navbar-toggler-font-size: $font-size-lg !default;
613
561
  $navbar-toggler-border-radius: $btn-border-radius !default;
614
562
 
615
- $navbar-inverse-color: rgba($white,.5) !default;
616
- $navbar-inverse-hover-color: rgba($white,.75) !default;
617
- $navbar-inverse-active-color: rgba($white,1) !default;
618
- $navbar-inverse-disabled-color: rgba($white,.25) !default;
619
- $navbar-inverse-toggler-bg: str-replace(url("data:image/svg+xml;charset=utf8,%3Csvg viewBox='0 0 32 32' xmlns='http://www.w3.org/2000/svg'%3E%3Cpath stroke='#{$navbar-inverse-color}' stroke-width='2' stroke-linecap='round' stroke-miterlimit='10' d='M4 8h24M4 16h24M4 24h24'/%3E%3C/svg%3E"), "#", "%23") !default;
620
- $navbar-inverse-toggler-border: rgba($white,.1) !default;
563
+ $navbar-dark-color: rgba($white,.5) !default;
564
+ $navbar-dark-hover-color: rgba($white,.75) !default;
565
+ $navbar-dark-active-color: rgba($white,1) !default;
566
+ $navbar-dark-disabled-color: rgba($white,.25) !default;
567
+ $navbar-dark-toggler-icon-bg: str-replace(url("data:image/svg+xml;charset=utf8,%3Csvg viewBox='0 0 30 30' xmlns='http://www.w3.org/2000/svg'%3E%3Cpath stroke='#{$navbar-dark-color}' stroke-width='2' stroke-linecap='round' stroke-miterlimit='10' d='M4 7h22M4 15h22M4 23h22'/%3E%3C/svg%3E"), "#", "%23") !default;
568
+ $navbar-dark-toggler-border-color: rgba($white,.1) !default;
621
569
 
622
570
  $navbar-light-color: rgba($black,.5) !default;
623
571
  $navbar-light-hover-color: rgba($black,.7) !default;
624
572
  $navbar-light-active-color: rgba($black,.9) !default;
625
573
  $navbar-light-disabled-color: rgba($black,.3) !default;
626
- $navbar-light-toggler-bg: str-replace(url("data:image/svg+xml;charset=utf8,%3Csvg viewBox='0 0 32 32' xmlns='http://www.w3.org/2000/svg'%3E%3Cpath stroke='#{$navbar-light-color}' stroke-width='2' stroke-linecap='round' stroke-miterlimit='10' d='M4 8h24M4 16h24M4 24h24'/%3E%3C/svg%3E"), "#", "%23") !default;
627
- $navbar-light-toggler-border: rgba($black,.1) !default;
628
-
629
- // Navs
630
-
631
- $nav-item-margin: .2rem !default;
632
- $nav-item-inline-spacer: 1rem !default;
633
- $nav-link-padding: .5em 1em !default;
634
- $nav-link-hover-bg: $gray-lighter !default;
635
- $nav-disabled-link-color: $gray-light !default;
636
-
637
- $nav-tabs-border-color: #ddd !default;
638
- $nav-tabs-border-width: $border-width !default;
639
- $nav-tabs-border-radius: $border-radius !default;
640
- $nav-tabs-link-hover-border-color: $gray-lighter !default;
641
- $nav-tabs-active-link-hover-color: $gray !default;
642
- $nav-tabs-active-link-hover-bg: $body-bg !default;
643
- $nav-tabs-active-link-hover-border-color: #ddd !default;
644
- $nav-tabs-justified-link-border-color: #ddd !default;
645
- $nav-tabs-justified-active-link-border-color: $body-bg !default;
646
-
647
- $nav-pills-border-radius: $border-radius !default;
648
- $nav-pills-active-link-color: $component-active-color !default;
649
- $nav-pills-active-link-bg: $component-active-bg !default;
650
-
574
+ $navbar-light-toggler-icon-bg: str-replace(url("data:image/svg+xml;charset=utf8,%3Csvg viewBox='0 0 30 30' xmlns='http://www.w3.org/2000/svg'%3E%3Cpath stroke='#{$navbar-light-color}' stroke-width='2' stroke-linecap='round' stroke-miterlimit='10' d='M4 7h22M4 15h22M4 23h22'/%3E%3C/svg%3E"), "#", "%23") !default;
575
+ $navbar-light-toggler-border-color: rgba($black,.1) !default;
651
576
 
652
577
  // Pagination
653
578
 
654
- $pagination-padding-x: .75rem !default;
655
579
  $pagination-padding-y: .5rem !default;
656
- $pagination-padding-x-sm: .5rem !default;
580
+ $pagination-padding-x: .75rem !default;
657
581
  $pagination-padding-y-sm: .25rem !default;
658
- $pagination-padding-x-lg: 1.5rem !default;
582
+ $pagination-padding-x-sm: .5rem !default;
659
583
  $pagination-padding-y-lg: .75rem !default;
584
+ $pagination-padding-x-lg: 1.5rem !default;
660
585
  $pagination-line-height: 1.25 !default;
661
586
 
662
587
  $pagination-color: $link-color !default;
@@ -665,62 +590,38 @@ $pagination-border-width: $border-width !default;
665
590
  $pagination-border-color: #ddd !default;
666
591
 
667
592
  $pagination-hover-color: $link-hover-color !default;
668
- $pagination-hover-bg: $gray-lighter !default;
669
- $pagination-hover-border: #ddd !default;
593
+ $pagination-hover-bg: $gray-200 !default;
594
+ $pagination-hover-border-color: #ddd !default;
670
595
 
671
596
  $pagination-active-color: $white !default;
672
- $pagination-active-bg: $brand-primary !default;
673
- $pagination-active-border: $brand-primary !default;
597
+ $pagination-active-bg: theme-color("primary") !default;
598
+ $pagination-active-border-color: theme-color("primary") !default;
674
599
 
675
- $pagination-disabled-color: $gray-light !default;
600
+ $pagination-disabled-color: $gray-600 !default;
676
601
  $pagination-disabled-bg: $white !default;
677
- $pagination-disabled-border: #ddd !default;
602
+ $pagination-disabled-border-color: #ddd !default;
678
603
 
679
604
 
680
605
  // Jumbotron
681
606
 
682
607
  $jumbotron-padding: 2rem !default;
683
- $jumbotron-bg: $gray-lighter !default;
684
-
685
-
686
- // Form states and alerts
687
- //
688
- // Define colors for form feedback states and, by default, alerts.
689
-
690
- $state-success-text: #3c763d !default;
691
- $state-success-bg: #dff0d8 !default;
692
- $state-success-border: darken($state-success-bg, 5%) !default;
693
-
694
- $state-info-text: #31708f !default;
695
- $state-info-bg: #d9edf7 !default;
696
- $state-info-border: darken($state-info-bg, 7%) !default;
697
-
698
- $state-warning-text: #8a6d3b !default;
699
- $state-warning-bg: #fcf8e3 !default;
700
- $mark-bg: $state-warning-bg !default;
701
- $state-warning-border: darken($state-warning-bg, 5%) !default;
702
-
703
- $state-danger-text: #a94442 !default;
704
- $state-danger-bg: #f2dede !default;
705
- $state-danger-border: darken($state-danger-bg, 5%) !default;
608
+ $jumbotron-bg: $gray-200 !default;
706
609
 
707
610
 
708
611
  // Cards
709
612
 
710
- $card-spacer-x: 1.25rem !default;
711
613
  $card-spacer-y: .75rem !default;
614
+ $card-spacer-x: 1.25rem !default;
712
615
  $card-border-width: 1px !default;
713
616
  $card-border-radius: $border-radius !default;
714
617
  $card-border-color: rgba($black,.125) !default;
715
- $card-border-radius-inner: calc(#{$card-border-radius} - #{$card-border-width}) !default;
716
- $card-cap-bg: $gray-lightest !default;
618
+ $card-inner-border-radius: calc(#{$card-border-radius} - #{$card-border-width}) !default;
619
+ $card-cap-bg: rgba($black, .03) !default;
717
620
  $card-bg: $white !default;
718
621
 
719
- $card-link-hover-color: $white !default;
720
-
721
622
  $card-img-overlay-padding: 1.25rem !default;
722
623
 
723
- $card-deck-margin: ($grid-gutter-width-base / 2) !default;
624
+ $card-deck-margin: ($grid-gutter-width / 2) !default;
724
625
 
725
626
  $card-columns-count: 3 !default;
726
627
  $card-columns-gap: 1.25rem !default;
@@ -735,9 +636,11 @@ $tooltip-bg: $black !default;
735
636
  $tooltip-opacity: .9 !default;
736
637
  $tooltip-padding-y: 3px !default;
737
638
  $tooltip-padding-x: 8px !default;
738
- $tooltip-margin: 3px !default;
639
+ $tooltip-margin: 0 !default;
640
+
739
641
 
740
642
  $tooltip-arrow-width: 5px !default;
643
+ $tooltip-arrow-height: 5px !default;
741
644
  $tooltip-arrow-color: $tooltip-bg !default;
742
645
 
743
646
 
@@ -750,14 +653,17 @@ $popover-border-width: $border-width !default;
750
653
  $popover-border-color: rgba($black,.2) !default;
751
654
  $popover-box-shadow: 0 5px 10px rgba($black,.2) !default;
752
655
 
753
- $popover-title-bg: darken($popover-bg, 3%) !default;
754
- $popover-title-padding-x: 14px !default;
755
- $popover-title-padding-y: 8px !default;
656
+ $popover-header-bg: darken($popover-bg, 3%) !default;
657
+ $popover-header-color: $headings-color !default;
658
+ $popover-header-padding-y: 8px !default;
659
+ $popover-header-padding-x: 14px !default;
756
660
 
757
- $popover-content-padding-x: 14px !default;
758
- $popover-content-padding-y: 9px !default;
661
+ $popover-body-color: $body-color !default;
662
+ $popover-body-padding-y: 9px !default;
663
+ $popover-body-padding-x: 14px !default;
759
664
 
760
665
  $popover-arrow-width: 10px !default;
666
+ $popover-arrow-height: 5px !default;
761
667
  $popover-arrow-color: $popover-bg !default;
762
668
 
763
669
  $popover-arrow-outer-width: ($popover-arrow-width + 1px) !default;
@@ -766,19 +672,11 @@ $popover-arrow-outer-color: fade-in($popover-border-color, .05) !defau
766
672
 
767
673
  // Badges
768
674
 
769
- $badge-default-bg: $gray-light !default;
770
- $badge-primary-bg: $brand-primary !default;
771
- $badge-success-bg: $brand-success !default;
772
- $badge-info-bg: $brand-info !default;
773
- $badge-warning-bg: $brand-warning !default;
774
- $badge-danger-bg: $brand-danger !default;
775
-
776
675
  $badge-color: $white !default;
777
- $badge-link-hover-color: $white !default;
778
676
  $badge-font-size: 75% !default;
779
677
  $badge-font-weight: $font-weight-bold !default;
780
- $badge-padding-x: .4em !default;
781
678
  $badge-padding-y: .25em !default;
679
+ $badge-padding-x: .4em !default;
782
680
 
783
681
  $badge-pill-padding-x: .6em !default;
784
682
  // Use a higher than normal value to ensure completely rounded edges when
@@ -792,19 +690,19 @@ $badge-pill-border-radius: 10rem !default;
792
690
  $modal-inner-padding: 15px !default;
793
691
 
794
692
  $modal-dialog-margin: 10px !default;
795
- $modal-dialog-sm-up-margin-y: 30px !default;
693
+ $modal-dialog-margin-y-sm-up: 30px !default;
796
694
 
797
695
  $modal-title-line-height: $line-height-base !default;
798
696
 
799
697
  $modal-content-bg: $white !default;
800
698
  $modal-content-border-color: rgba($black,.2) !default;
801
699
  $modal-content-border-width: $border-width !default;
802
- $modal-content-xs-box-shadow: 0 3px 9px rgba($black,.5) !default;
803
- $modal-content-sm-up-box-shadow: 0 5px 15px rgba($black,.5) !default;
700
+ $modal-content-box-shadow-xs: 0 3px 9px rgba($black,.5) !default;
701
+ $modal-content-box-shadow-sm-up: 0 5px 15px rgba($black,.5) !default;
804
702
 
805
703
  $modal-backdrop-bg: $black !default;
806
704
  $modal-backdrop-opacity: .5 !default;
807
- $modal-header-border-color: $gray-lighter !default;
705
+ $modal-header-border-color: $gray-200 !default;
808
706
  $modal-footer-border-color: $modal-header-border-color !default;
809
707
  $modal-header-border-width: $modal-content-border-width !default;
810
708
  $modal-footer-border-width: $modal-header-border-width !default;
@@ -821,68 +719,49 @@ $modal-transition: transform .3s ease-out !default;
821
719
  //
822
720
  // Define alert colors, border radius, and padding.
823
721
 
824
- $alert-padding-x: 1.25rem !default;
825
722
  $alert-padding-y: .75rem !default;
826
- $alert-margin-bottom: $spacer-y !default;
723
+ $alert-padding-x: 1.25rem !default;
724
+ $alert-margin-bottom: 1rem !default;
827
725
  $alert-border-radius: $border-radius !default;
828
726
  $alert-link-font-weight: $font-weight-bold !default;
829
727
  $alert-border-width: $border-width !default;
830
728
 
831
- $alert-success-bg: $state-success-bg !default;
832
- $alert-success-text: $state-success-text !default;
833
- $alert-success-border: $state-success-border !default;
834
-
835
- $alert-info-bg: $state-info-bg !default;
836
- $alert-info-text: $state-info-text !default;
837
- $alert-info-border: $state-info-border !default;
838
-
839
- $alert-warning-bg: $state-warning-bg !default;
840
- $alert-warning-text: $state-warning-text !default;
841
- $alert-warning-border: $state-warning-border !default;
842
-
843
- $alert-danger-bg: $state-danger-bg !default;
844
- $alert-danger-text: $state-danger-text !default;
845
- $alert-danger-border: $state-danger-border !default;
846
-
847
729
 
848
730
  // Progress bars
849
731
 
850
732
  $progress-height: 1rem !default;
851
733
  $progress-font-size: .75rem !default;
852
- $progress-bg: $gray-lighter !default;
734
+ $progress-bg: $gray-200 !default;
853
735
  $progress-border-radius: $border-radius !default;
854
736
  $progress-box-shadow: inset 0 .1rem .1rem rgba($black,.1) !default;
855
737
  $progress-bar-color: $white !default;
856
- $progress-bar-bg: $brand-primary !default;
738
+ $progress-bar-bg: theme-color("primary") !default;
857
739
  $progress-bar-animation-timing: 1s linear infinite !default;
740
+ $progress-bar-transition: width .6s ease !default;
858
741
 
859
742
  // List group
860
743
 
861
- $list-group-color: $body-color !default;
862
744
  $list-group-bg: $white !default;
863
745
  $list-group-border-color: rgba($black,.125) !default;
864
746
  $list-group-border-width: $border-width !default;
865
747
  $list-group-border-radius: $border-radius !default;
866
748
 
867
- $list-group-item-padding-x: 1.25rem !default;
868
749
  $list-group-item-padding-y: .75rem !default;
750
+ $list-group-item-padding-x: 1.25rem !default;
869
751
 
870
- $list-group-hover-bg: $gray-lightest !default;
871
- $list-group-active-color: $component-active-color !default;
872
- $list-group-active-bg: $component-active-bg !default;
873
- $list-group-active-border: $list-group-active-bg !default;
874
- $list-group-active-text-color: lighten($list-group-active-bg, 50%) !default;
752
+ $list-group-hover-bg: $gray-100 !default;
753
+ $list-group-active-color: $component-active-color !default;
754
+ $list-group-active-bg: $component-active-bg !default;
755
+ $list-group-active-border-color: $list-group-active-bg !default;
875
756
 
876
- $list-group-disabled-color: $gray-light !default;
757
+ $list-group-disabled-color: $gray-600 !default;
877
758
  $list-group-disabled-bg: $list-group-bg !default;
878
- $list-group-disabled-text-color: $list-group-disabled-color !default;
879
759
 
880
- $list-group-link-color: $gray !default;
881
- $list-group-link-heading-color: $gray-dark !default;
882
- $list-group-link-hover-color: $list-group-link-color !default;
760
+ $list-group-action-color: $gray-700 !default;
761
+ $list-group-action-hover-color: $list-group-action-color !default;
883
762
 
884
- $list-group-link-active-color: $list-group-color !default;
885
- $list-group-link-active-bg: $gray-lighter !default;
763
+ $list-group-action-active-color: $body-color !default;
764
+ $list-group-action-active-bg: $gray-200 !default;
886
765
 
887
766
 
888
767
  // Image thumbnails
@@ -899,7 +778,7 @@ $thumbnail-transition: all .2s ease-in-out !default;
899
778
  // Figures
900
779
 
901
780
  $figure-caption-font-size: 90% !default;
902
- $figure-caption-color: $gray-light !default;
781
+ $figure-caption-color: $gray-600 !default;
903
782
 
904
783
 
905
784
  // Breadcrumbs
@@ -908,9 +787,9 @@ $breadcrumb-padding-y: .75rem !default;
908
787
  $breadcrumb-padding-x: 1rem !default;
909
788
  $breadcrumb-item-padding: .5rem !default;
910
789
 
911
- $breadcrumb-bg: $gray-lighter !default;
912
- $breadcrumb-divider-color: $gray-light !default;
913
- $breadcrumb-active-color: $gray-light !default;
790
+ $breadcrumb-bg: $gray-200 !default;
791
+ $breadcrumb-divider-color: $gray-600 !default;
792
+ $breadcrumb-active-color: $gray-600 !default;
914
793
  $breadcrumb-divider: "/" !default;
915
794
 
916
795
 
@@ -933,7 +812,7 @@ $carousel-control-icon-width: 20px !default;
933
812
  $carousel-control-prev-icon-bg: str-replace(url("data:image/svg+xml;charset=utf8,%3Csvg xmlns='http://www.w3.org/2000/svg' fill='#{$carousel-control-color}' viewBox='0 0 8 8'%3E%3Cpath d='M4 0l-4 4 4 4 1.5-1.5-2.5-2.5 2.5-2.5-1.5-1.5z'/%3E%3C/svg%3E"), "#", "%23") !default;
934
813
  $carousel-control-next-icon-bg: str-replace(url("data:image/svg+xml;charset=utf8,%3Csvg xmlns='http://www.w3.org/2000/svg' fill='#{$carousel-control-color}' viewBox='0 0 8 8'%3E%3Cpath d='M1.5 0l-1.5 1.5 2.5 2.5-2.5 2.5 1.5 1.5 4-4-4-4z'/%3E%3C/svg%3E"), "#", "%23") !default;
935
814
 
936
- $carousel-transition: transform .6s ease-in-out !default;
815
+ $carousel-transition: transform .6s ease !default;
937
816
 
938
817
 
939
818
  // Close
@@ -943,19 +822,16 @@ $close-font-weight: $font-weight-bold !default;
943
822
  $close-color: $black !default;
944
823
  $close-text-shadow: 0 1px 0 $white !default;
945
824
 
946
-
947
825
  // Code
948
826
 
949
827
  $code-font-size: 90% !default;
950
- $code-padding-x: .4rem !default;
951
828
  $code-padding-y: .2rem !default;
829
+ $code-padding-x: .4rem !default;
952
830
  $code-color: #bd4147 !default;
953
- $code-bg: $gray-lightest !default;
831
+ $code-bg: $gray-100 !default;
954
832
 
955
833
  $kbd-color: $white !default;
956
- $kbd-bg: $gray-dark !default;
834
+ $kbd-bg: $gray-900 !default;
957
835
 
958
- $pre-bg: $gray-lightest !default;
959
- $pre-color: $gray-dark !default;
960
- $pre-border-color: #ccc !default;
836
+ $pre-color: $gray-900 !default;
961
837
  $pre-scrollable-max-height: 340px !default;