solidus_backend 2.4.2 → 2.5.0.beta1
Sign up to get free protection for your applications and to get access to all the features.
Potentially problematic release.
This version of solidus_backend might be problematic. Click here for more details.
- checksums.yaml +5 -5
- data/README.md +7 -7
- data/Rakefile +19 -13
- data/app/assets/javascripts/spree/backend.js +5 -17
- data/app/assets/javascripts/spree/backend/adjustments.js +26 -0
- data/app/assets/javascripts/spree/backend/admin.js +14 -78
- data/app/assets/javascripts/spree/backend/backbone-overrides.js +25 -0
- data/app/assets/javascripts/spree/backend/calculator.js +1 -1
- data/app/assets/javascripts/spree/backend/checkouts/edit.js +1 -1
- data/app/assets/javascripts/spree/backend/collections/index.js +1 -0
- data/app/assets/javascripts/spree/backend/collections/shipments.js +6 -0
- data/app/assets/javascripts/spree/backend/components/editable_table.js +5 -0
- data/app/assets/javascripts/spree/backend/components/number_with_currency.js +1 -1
- data/app/assets/javascripts/spree/backend/components/sortable_table.js +29 -0
- data/app/assets/javascripts/spree/backend/components/tabs.js +67 -0
- data/app/assets/javascripts/spree/backend/components/tooltips.js +19 -24
- data/app/assets/javascripts/spree/backend/datepicker.js +55 -0
- data/app/assets/javascripts/spree/backend/flash.js +20 -0
- data/app/assets/javascripts/spree/backend/gateway.js +22 -0
- data/app/assets/javascripts/spree/backend/handlebars_extensions.js +8 -0
- data/app/assets/javascripts/spree/backend/images/index.js +8 -0
- data/app/assets/javascripts/spree/backend/models/index.js +3 -0
- data/app/assets/javascripts/spree/backend/models/line_item.js +4 -0
- data/app/assets/javascripts/spree/backend/models/order.js +2 -1
- data/app/assets/javascripts/spree/backend/models/payment.js +5 -0
- data/app/assets/javascripts/spree/backend/models/shipment.js +27 -0
- data/app/assets/javascripts/spree/backend/models/stock_item.js +6 -0
- data/app/assets/javascripts/spree/backend/namespaces.js +5 -1
- data/app/assets/javascripts/spree/backend/navigation.js +14 -0
- data/app/assets/javascripts/spree/backend/option_type_autocomplete.js +1 -1
- data/app/assets/javascripts/spree/backend/option_value_picker.js +1 -0
- data/app/assets/javascripts/spree/backend/orders/cart.js +1 -1
- data/app/assets/javascripts/spree/backend/orders/edit.js +2 -2
- data/app/assets/javascripts/spree/backend/payments/edit.js +16 -0
- data/app/assets/javascripts/spree/backend/payments/new.js +1 -1
- data/app/assets/javascripts/spree/backend/product_picker.js +1 -1
- data/app/assets/javascripts/spree/backend/progress.js +9 -0
- data/app/assets/javascripts/spree/backend/promotions.js +35 -0
- data/app/assets/javascripts/spree/backend/promotions/activation.js +1 -1
- data/app/assets/javascripts/spree/backend/returns/return_item_selection.js +1 -1
- data/app/assets/javascripts/spree/backend/routes.js +0 -12
- data/app/assets/javascripts/spree/backend/shipments.js +35 -68
- data/app/assets/javascripts/spree/backend/stock_location.js +23 -0
- data/app/assets/javascripts/spree/backend/stock_management.js +22 -0
- data/app/assets/javascripts/spree/backend/store_credits.js +25 -0
- data/app/assets/javascripts/spree/backend/style_guide.js +3 -0
- data/app/assets/javascripts/spree/backend/taxon_autocomplete.js +1 -1
- data/app/assets/javascripts/spree/backend/taxonomy.js +121 -0
- data/app/assets/javascripts/spree/backend/taxons.js +75 -0
- data/app/assets/javascripts/spree/backend/templates/index.js +2 -2
- data/app/assets/javascripts/spree/backend/templates/orders/line_item.hbs +7 -5
- data/app/assets/javascripts/spree/backend/templates/orders/shipment_tracking.hbs +24 -0
- data/app/assets/javascripts/spree/backend/templates/orders/shipping_method.hbs +34 -0
- data/app/assets/javascripts/spree/backend/templates/promotions/calculators/fields/tiered_flat_rate.hbs +7 -3
- data/app/assets/javascripts/spree/backend/templates/promotions/calculators/fields/tiered_percent.hbs +6 -2
- data/app/assets/javascripts/spree/backend/templates/stock_items/stock_location_stock_item.hbs +3 -1
- data/app/assets/javascripts/spree/backend/templates/variants/autocomplete_stock.hbs +10 -5
- data/app/assets/javascripts/spree/backend/templates/variants/split.hbs +5 -3
- data/app/assets/javascripts/spree/backend/translation.js +11 -0
- data/app/assets/javascripts/spree/backend/turbolinks-integration.js +21 -0
- data/app/assets/javascripts/spree/backend/user_picker.js +1 -1
- data/app/assets/javascripts/spree/backend/variant_autocomplete.js +60 -0
- data/app/assets/javascripts/spree/backend/views/calculators/tiered.js +54 -0
- data/app/assets/javascripts/spree/backend/views/cart/line_item_row.js +2 -1
- data/app/assets/javascripts/spree/backend/views/index.js +7 -0
- data/app/assets/javascripts/spree/backend/views/order/shipment_tracking.js +46 -0
- data/app/assets/javascripts/spree/backend/views/order/shipping_method.js +57 -0
- data/app/assets/javascripts/spree/backend/views/payment/payment_row.js +36 -0
- data/app/assets/javascripts/spree/backend/views/promotions/option_values_rule.js +79 -0
- data/app/assets/javascripts/spree/backend/views/state_select.js +6 -6
- data/app/assets/javascripts/spree/backend/views/stock/add_stock_item.js +63 -0
- data/app/assets/javascripts/spree/backend/views/stock/edit_stock_item_row.js +68 -0
- data/app/assets/javascripts/spree/backend/views/tables/editable_table.js +15 -0
- data/app/assets/javascripts/spree/backend/views/tables/editable_table_row.js +61 -0
- data/app/assets/javascripts/spree/backend/zone.js +1 -1
- data/app/assets/stylesheets/spree/backend.css +1 -2
- data/app/assets/stylesheets/spree/backend/components/_messages.scss +4 -1
- data/app/assets/stylesheets/spree/backend/components/_navigation.scss +4 -2
- data/app/assets/stylesheets/spree/backend/components/_number_with_currency.scss +8 -2
- data/app/assets/stylesheets/spree/backend/components/_progress.scss +4 -0
- data/app/assets/stylesheets/spree/backend/components/_tabs.scss +4 -2
- data/app/assets/stylesheets/spree/backend/globals/mixins/_line_through.scss +2 -1
- data/app/assets/stylesheets/spree/backend/plugins/_select2.scss +32 -7
- data/app/assets/stylesheets/spree/backend/plugins/_sortable.scss +3 -0
- data/app/assets/stylesheets/spree/backend/sections/_orders.scss +4 -20
- data/app/assets/stylesheets/spree/backend/sections/_products.scss +0 -1
- data/app/assets/stylesheets/spree/backend/sections/_promotions.scss +15 -7
- data/app/assets/stylesheets/spree/backend/sections/_store_credits.scss +17 -6
- data/app/assets/stylesheets/spree/backend/sections/_style_guide.scss +8 -4
- data/app/assets/stylesheets/spree/backend/sections/_taxonomies.scss +5 -19
- data/app/assets/stylesheets/spree/backend/sections/_variants.scss +5 -0
- data/app/assets/stylesheets/spree/backend/shared/_forms.scss +13 -17
- data/app/assets/stylesheets/spree/backend/shared/_layout.scss +9 -3
- data/app/assets/stylesheets/spree/backend/shared/_tables.scss +3 -27
- data/app/assets/stylesheets/spree/backend/spree_admin.scss +2 -6
- data/app/controllers/spree/admin/base_controller.rb +2 -3
- data/app/controllers/spree/admin/cancellations_controller.rb +3 -3
- data/app/controllers/spree/admin/images_controller.rb +1 -1
- data/app/controllers/spree/admin/option_types_controller.rb +1 -2
- data/app/controllers/spree/admin/orders/customer_details_controller.rb +2 -2
- data/app/controllers/spree/admin/orders_controller.rb +11 -11
- data/app/controllers/spree/admin/payment_methods_controller.rb +5 -6
- data/app/controllers/spree/admin/payments_controller.rb +5 -5
- data/app/controllers/spree/admin/products_controller.rb +4 -6
- data/app/controllers/spree/admin/promotion_actions_controller.rb +4 -4
- data/app/controllers/spree/admin/promotion_rules_controller.rb +3 -3
- data/app/controllers/spree/admin/promotions_controller.rb +5 -1
- data/app/controllers/spree/admin/reports_controller.rb +2 -2
- data/app/controllers/spree/admin/resource_controller.rb +17 -5
- data/app/controllers/spree/admin/return_authorizations_controller.rb +2 -2
- data/app/controllers/spree/admin/shipping_methods_controller.rb +1 -1
- data/app/controllers/spree/admin/stock_locations_controller.rb +1 -1
- data/app/controllers/spree/admin/store_credits_controller.rb +4 -4
- data/app/controllers/spree/admin/taxons_controller.rb +1 -1
- data/app/controllers/spree/admin/users_controller.rb +6 -6
- data/app/controllers/spree/admin/variants_controller.rb +0 -16
- data/app/helpers/spree/admin/adjustments_helper.rb +2 -2
- data/app/helpers/spree/admin/base_helper.rb +5 -11
- data/app/helpers/spree/admin/navigation_helper.rb +8 -8
- data/app/helpers/spree/admin/orders_helper.rb +2 -2
- data/app/helpers/spree/admin/products_helper.rb +0 -24
- data/app/helpers/spree/admin/store_credit_events_helper.rb +5 -5
- data/app/models/spree/backend_configuration.rb +1 -2
- data/app/views/spree/admin/adjustment_reasons/edit.html.erb +2 -2
- data/app/views/spree/admin/adjustment_reasons/index.html.erb +5 -5
- data/app/views/spree/admin/adjustment_reasons/new.html.erb +3 -3
- data/app/views/spree/admin/adjustments/_adjustments_table.html.erb +2 -2
- data/app/views/spree/admin/adjustments/_form.html.erb +1 -1
- data/app/views/spree/admin/adjustments/edit.html.erb +3 -3
- data/app/views/spree/admin/adjustments/index.html.erb +3 -3
- data/app/views/spree/admin/adjustments/new.html.erb +3 -3
- data/app/views/spree/admin/cancellations/index.html.erb +3 -3
- data/app/views/spree/admin/customer_returns/_reimbursements_table.html.erb +2 -2
- data/app/views/spree/admin/customer_returns/_return_item_decision.html.erb +7 -7
- data/app/views/spree/admin/customer_returns/_return_item_selection.html.erb +2 -2
- data/app/views/spree/admin/customer_returns/edit.html.erb +7 -7
- data/app/views/spree/admin/customer_returns/index.html.erb +4 -4
- data/app/views/spree/admin/customer_returns/new.html.erb +11 -11
- data/app/views/spree/admin/images/_image_row.html.erb +3 -3
- data/app/views/spree/admin/images/_new.html.erb +12 -0
- data/app/views/spree/admin/images/edit.html.erb +4 -4
- data/app/views/spree/admin/images/index.html.erb +7 -5
- data/app/views/spree/admin/images/new.html.erb +1 -12
- data/app/views/spree/admin/log_entries/index.html.erb +2 -2
- data/app/views/spree/admin/option_types/_option_value_fields.html.erb +1 -1
- data/app/views/spree/admin/option_types/edit.html.erb +1 -1
- data/app/views/spree/admin/option_types/index.html.erb +2 -2
- data/app/views/spree/admin/option_types/new.html.erb +1 -1
- data/app/views/spree/admin/orders/_add_product.html.erb +2 -2
- data/app/views/spree/admin/orders/_carton.html.erb +8 -8
- data/app/views/spree/admin/orders/_carton_manifest.html.erb +1 -1
- data/app/views/spree/admin/orders/_order_details.html.erb +4 -4
- data/app/views/spree/admin/orders/_risk_analysis.html.erb +10 -10
- data/app/views/spree/admin/orders/_shipment.html.erb +11 -69
- data/app/views/spree/admin/orders/_shipment_manifest.html.erb +3 -3
- data/app/views/spree/admin/orders/cart.html.erb +2 -2
- data/app/views/spree/admin/orders/confirm.html.erb +6 -6
- data/app/views/spree/admin/orders/confirm/_customer_details.html.erb +3 -3
- data/app/views/spree/admin/orders/confirm/_payments.html.erb +1 -1
- data/app/views/spree/admin/orders/confirm/_shipment.html.erb +2 -2
- data/app/views/spree/admin/orders/confirm/_shipment_manifest.html.erb +1 -1
- data/app/views/spree/admin/orders/confirm_advance.html.erb +3 -3
- data/app/views/spree/admin/orders/customer_details/_form.html.erb +19 -13
- data/app/views/spree/admin/orders/customer_details/edit.html.erb +2 -2
- data/app/views/spree/admin/orders/customer_details/show.html.erb +7 -7
- data/app/views/spree/admin/orders/edit.html.erb +2 -2
- data/app/views/spree/admin/orders/index.html.erb +30 -28
- data/app/views/spree/admin/payment_methods/_form.html.erb +24 -13
- data/app/views/spree/admin/payment_methods/edit.html.erb +2 -2
- data/app/views/spree/admin/payment_methods/index.html.erb +6 -6
- data/app/views/spree/admin/payment_methods/new.html.erb +3 -3
- data/app/views/spree/admin/payments/_capture_events.html.erb +2 -2
- data/app/views/spree/admin/payments/_list.html.erb +33 -13
- data/app/views/spree/admin/payments/credit.html.erb +1 -1
- data/app/views/spree/admin/payments/index.html.erb +3 -3
- data/app/views/spree/admin/payments/new.html.erb +4 -4
- data/app/views/spree/admin/payments/show.html.erb +2 -2
- data/app/views/spree/admin/payments/source_forms/_gateway.html.erb +22 -23
- data/app/views/spree/admin/payments/source_views/_gateway.html.erb +1 -1
- data/app/views/spree/admin/payments/source_views/_storecredit.html.erb +1 -1
- data/app/views/spree/admin/prices/_form.html.erb +1 -2
- data/app/views/spree/admin/prices/edit.html.erb +1 -1
- data/app/views/spree/admin/prices/index.html.erb +2 -2
- data/app/views/spree/admin/prices/new.html.erb +1 -1
- data/app/views/spree/admin/product_properties/_product_property_fields.html.erb +1 -1
- data/app/views/spree/admin/product_properties/index.html.erb +7 -14
- data/app/views/spree/admin/products/_form.html.erb +17 -14
- data/app/views/spree/admin/products/edit.html.erb +2 -2
- data/app/views/spree/admin/products/index.html.erb +6 -6
- data/app/views/spree/admin/products/new.html.erb +5 -59
- data/app/views/spree/admin/promotion_categories/index.html.erb +1 -1
- data/app/views/spree/admin/promotion_categories/new.html.erb +1 -1
- data/app/views/spree/admin/promotion_code_batches/index.html.erb +8 -8
- data/app/views/spree/admin/promotion_code_batches/new.html.erb +1 -1
- data/app/views/spree/admin/promotion_codes/index.html.erb +1 -1
- data/app/views/spree/admin/promotions/_actions.html.erb +6 -6
- data/app/views/spree/admin/promotions/_form.html.erb +13 -4
- data/app/views/spree/admin/promotions/_promotion_rule.html.erb +1 -1
- data/app/views/spree/admin/promotions/_rules.html.erb +8 -8
- data/app/views/spree/admin/promotions/actions/_create_quantity_adjustments.html.erb +4 -10
- data/app/views/spree/admin/promotions/actions/_promotion_calculators_with_custom_fields.html.erb +25 -29
- data/app/views/spree/admin/promotions/calculators/_default_fields.html.erb +5 -4
- data/app/views/spree/admin/promotions/calculators/distributed_amount/_fields.html.erb +6 -4
- data/app/views/spree/admin/promotions/calculators/flat_rate/_fields.html.erb +6 -4
- data/app/views/spree/admin/promotions/calculators/tiered_flat_rate/_fields.html.erb +5 -5
- data/app/views/spree/admin/promotions/calculators/tiered_percent/_fields.html.erb +5 -5
- data/app/views/spree/admin/promotions/edit.html.erb +1 -1
- data/app/views/spree/admin/promotions/index.html.erb +7 -7
- data/app/views/spree/admin/promotions/new.html.erb +1 -1
- data/app/views/spree/admin/promotions/rules/_item_total.html.erb +10 -12
- data/app/views/spree/admin/promotions/rules/_nth_order.html.erb +8 -10
- data/app/views/spree/admin/promotions/rules/_option_value.html.erb +10 -14
- data/app/views/spree/admin/promotions/rules/_product.html.erb +12 -10
- data/app/views/spree/admin/promotions/rules/_taxon.html.erb +9 -15
- data/app/views/spree/admin/promotions/rules/_user.html.erb +3 -5
- data/app/views/spree/admin/promotions/rules/_user_role.html.erb +3 -3
- data/app/views/spree/admin/properties/index.html.erb +5 -5
- data/app/views/spree/admin/properties/new.html.erb +1 -1
- data/app/views/spree/admin/refund_reasons/edit.html.erb +2 -2
- data/app/views/spree/admin/refund_reasons/index.html.erb +5 -5
- data/app/views/spree/admin/refund_reasons/new.html.erb +3 -3
- data/app/views/spree/admin/refund_reasons/shared/_form.html.erb +1 -1
- data/app/views/spree/admin/refunds/edit.html.erb +3 -3
- data/app/views/spree/admin/refunds/new.html.erb +4 -4
- data/app/views/spree/admin/reimbursement_types/index.html.erb +2 -2
- data/app/views/spree/admin/reimbursements/edit.html.erb +9 -9
- data/app/views/spree/admin/reimbursements/index.html.erb +4 -4
- data/app/views/spree/admin/reimbursements/show.html.erb +4 -4
- data/app/views/spree/admin/reports/index.html.erb +3 -3
- data/app/views/spree/admin/reports/sales_total.html.erb +7 -7
- data/app/views/spree/admin/return_authorizations/_form.html.erb +3 -3
- data/app/views/spree/admin/return_authorizations/edit.html.erb +5 -5
- data/app/views/spree/admin/return_authorizations/index.html.erb +4 -4
- data/app/views/spree/admin/return_authorizations/new.html.erb +3 -3
- data/app/views/spree/admin/return_reasons/edit.html.erb +2 -2
- data/app/views/spree/admin/return_reasons/index.html.erb +3 -3
- data/app/views/spree/admin/return_reasons/new.html.erb +3 -3
- data/app/views/spree/admin/shared/_address_form.html.erb +2 -0
- data/app/views/spree/admin/shared/_calculator_fields.html.erb +4 -3
- data/app/views/spree/admin/shared/_edit_resource_links.html.erb +2 -2
- data/app/views/spree/admin/shared/_head.html.erb +13 -5
- data/app/views/spree/admin/shared/_js_locale_data.html.erb +24 -32
- data/app/views/spree/admin/shared/_navigation_footer.html.erb +32 -2
- data/app/views/spree/admin/shared/_new_resource_links.html.erb +2 -2
- data/app/views/spree/admin/shared/_no_objects_found.html.erb +2 -2
- data/app/views/spree/admin/shared/_number_with_currency.html.erb +9 -5
- data/app/views/spree/admin/shared/_order_submenu.html.erb +6 -6
- data/app/views/spree/admin/shared/_order_summary.html.erb +5 -5
- data/app/views/spree/admin/shared/_order_tabs.html.erb +1 -1
- data/app/views/spree/admin/shared/_product_tabs.html.erb +3 -3
- data/app/views/spree/admin/shared/_rebuild_vat_prices_checkbox.html.erb +2 -2
- data/app/views/spree/admin/shared/_refunds.html.erb +2 -2
- data/app/views/spree/admin/shared/_report_order_criteria.html.erb +8 -6
- data/app/views/spree/admin/shared/_spinner.html.erb +1 -1
- data/app/views/spree/admin/shared/_variant_search.html.erb +3 -3
- data/app/views/spree/admin/shared/named_types/_form.html.erb +4 -2
- data/app/views/spree/admin/shared/named_types/_index.html.erb +4 -4
- data/app/views/spree/admin/shared/preference_fields/_boolean.html.erb +9 -8
- data/app/views/spree/admin/shipping_categories/edit.html.erb +3 -3
- data/app/views/spree/admin/shipping_categories/index.html.erb +5 -5
- data/app/views/spree/admin/shipping_categories/new.html.erb +3 -3
- data/app/views/spree/admin/shipping_methods/_form.html.erb +10 -8
- data/app/views/spree/admin/shipping_methods/edit.html.erb +2 -2
- data/app/views/spree/admin/shipping_methods/index.html.erb +5 -5
- data/app/views/spree/admin/shipping_methods/new.html.erb +3 -3
- data/app/views/spree/admin/stock_items/_stock_management.html.erb +7 -7
- data/app/views/spree/admin/stock_items/index.html.erb +4 -4
- data/app/views/spree/admin/stock_locations/_form.html.erb +105 -103
- data/app/views/spree/admin/stock_locations/edit.html.erb +4 -6
- data/app/views/spree/admin/stock_locations/index.html.erb +5 -11
- data/app/views/spree/admin/stock_locations/new.html.erb +5 -7
- data/app/views/spree/admin/stock_movements/index.html.erb +3 -3
- data/app/views/spree/admin/store_credits/_form.html.erb +3 -3
- data/app/views/spree/admin/store_credits/_update_reason_field.html.erb +7 -8
- data/app/views/spree/admin/store_credits/edit_amount.html.erb +10 -6
- data/app/views/spree/admin/store_credits/edit_validity.html.erb +7 -5
- data/app/views/spree/admin/store_credits/index.html.erb +13 -13
- data/app/views/spree/admin/store_credits/new.html.erb +2 -2
- data/app/views/spree/admin/store_credits/show.html.erb +24 -32
- data/app/views/spree/admin/stores/_form.html.erb +1 -1
- data/app/views/spree/admin/stores/edit.html.erb +1 -1
- data/app/views/spree/admin/stores/index.html.erb +1 -1
- data/app/views/spree/admin/stores/new.html.erb +1 -1
- data/app/views/spree/admin/style_guide/topics/forms/_building_forms.html.erb +5 -3
- data/app/views/spree/admin/style_guide/topics/messaging/_loading.html.erb +1 -1
- data/app/views/spree/admin/tax_categories/_form.html.erb +4 -2
- data/app/views/spree/admin/tax_categories/edit.html.erb +2 -2
- data/app/views/spree/admin/tax_categories/index.html.erb +5 -5
- data/app/views/spree/admin/tax_categories/new.html.erb +3 -3
- data/app/views/spree/admin/tax_rates/_form.html.erb +17 -11
- data/app/views/spree/admin/tax_rates/edit.html.erb +2 -2
- data/app/views/spree/admin/tax_rates/index.html.erb +8 -8
- data/app/views/spree/admin/tax_rates/new.html.erb +3 -3
- data/app/views/spree/admin/taxonomies/edit.erb +3 -3
- data/app/views/spree/admin/taxonomies/index.html.erb +2 -2
- data/app/views/spree/admin/taxonomies/new.html.erb +2 -2
- data/app/views/spree/admin/taxons/_form.html.erb +5 -1
- data/app/views/spree/admin/taxons/edit.html.erb +4 -4
- data/app/views/spree/admin/taxons/index.html.erb +7 -7
- data/app/views/spree/admin/users/_addresses_form.html.erb +2 -2
- data/app/views/spree/admin/users/_form.html.erb +10 -5
- data/app/views/spree/admin/users/_sidebar.html.erb +6 -6
- data/app/views/spree/admin/users/_tabs.html.erb +5 -5
- data/app/views/spree/admin/users/edit.html.erb +14 -15
- data/app/views/spree/admin/users/index.html.erb +14 -12
- data/app/views/spree/admin/users/items.html.erb +7 -7
- data/app/views/spree/admin/users/new.html.erb +1 -1
- data/app/views/spree/admin/users/orders.html.erb +7 -7
- data/app/views/spree/admin/variants/_form.html.erb +2 -2
- data/app/views/spree/admin/variants/_table.html.erb +2 -2
- data/app/views/spree/admin/variants/_table_filter.html.erb +5 -5
- data/app/views/spree/admin/variants/index.html.erb +8 -8
- data/app/views/spree/admin/variants/new.html.erb +1 -1
- data/app/views/spree/admin/zones/_form.html.erb +10 -6
- data/app/views/spree/admin/zones/edit.html.erb +1 -1
- data/app/views/spree/admin/zones/index.html.erb +3 -3
- data/app/views/spree/admin/zones/new.html.erb +2 -2
- data/app/views/spree/layouts/admin.html.erb +1 -1
- data/app/views/spree/layouts/admin_style_guide.html.erb +2 -2
- data/config/routes.rb +1 -11
- data/lib/spree/backend.rb +1 -2
- data/solidus_backend.gemspec +1 -3
- data/spec/controllers/spree/admin/cancellations_controller_spec.rb +3 -3
- data/spec/controllers/spree/admin/orders_controller_spec.rb +9 -9
- data/spec/controllers/spree/admin/payment_methods_controller_spec.rb +1 -1
- data/spec/controllers/spree/admin/prices_controller_spec.rb +2 -2
- data/spec/controllers/spree/admin/products_controller_spec.rb +2 -1
- data/spec/controllers/spree/admin/promotion_codes_controller_spec.rb +1 -1
- data/spec/controllers/spree/admin/promotions_controller_spec.rb +7 -0
- data/spec/controllers/spree/admin/reports_controller_spec.rb +1 -1
- data/spec/controllers/spree/admin/resource_controller_spec.rb +2 -2
- data/spec/controllers/spree/admin/search_controller_spec.rb +1 -1
- data/spec/controllers/spree/admin/stock_locations_controller_spec.rb +4 -4
- data/spec/controllers/spree/admin/users_controller_spec.rb +1 -1
- data/spec/controllers/spree/admin/variants_controller_spec.rb +13 -3
- data/spec/features/admin/configuration/payment_methods_spec.rb +55 -16
- data/spec/features/admin/configuration/shipping_methods_spec.rb +40 -0
- data/spec/features/admin/homepage_spec.rb +25 -8
- data/spec/features/admin/orders/adjustments_spec.rb +2 -2
- data/spec/features/admin/orders/customer_details_spec.rb +24 -9
- data/spec/features/admin/orders/listing_spec.rb +6 -9
- data/spec/features/admin/orders/log_entries_spec.rb +0 -1
- data/spec/features/admin/orders/new_order_spec.rb +8 -2
- data/spec/features/admin/orders/order_details_spec.rb +116 -74
- data/spec/features/admin/orders/payments_spec.rb +7 -10
- data/spec/features/admin/orders/shipments_spec.rb +9 -5
- data/spec/features/admin/payments/store_credits_spec.rb +2 -2
- data/spec/features/admin/products/edit/images_spec.rb +0 -79
- data/spec/features/admin/products/products_spec.rb +3 -6
- data/spec/features/admin/products/variant_spec.rb +17 -0
- data/spec/features/admin/promotion_adjustments_spec.rb +105 -52
- data/spec/features/admin/promotions/option_value_rule_spec.rb +6 -3
- data/spec/features/admin/promotions/tiered_calculator_spec.rb +4 -2
- data/spec/features/admin/users_spec.rb +14 -11
- data/spec/javascripts/translation_spec.js +8 -0
- data/spec/javascripts/views/number_with_currency_spec.js +6 -6
- data/spec/spec_helper.rb +28 -37
- data/spec/teaspoon_env.rb +61 -14
- data/spec/views/spree/admin/shared/navigation_footer_spec.rb +41 -0
- data/vendor/assets/javascripts/solidus_admin/Sortable.js +1540 -0
- data/vendor/assets/javascripts/solidus_admin/bootstrap.js +1878 -1816
- data/vendor/assets/javascripts/solidus_admin/flatpickr/flatpickr.js +2218 -0
- data/vendor/assets/javascripts/solidus_admin/select2_locales/select2_locale_es-MX.js +19 -0
- data/vendor/assets/stylesheets/solidus_admin/bootstrap/_alert.scss +7 -4
- data/vendor/assets/stylesheets/solidus_admin/bootstrap/_badge.scss +1 -2
- data/vendor/assets/stylesheets/solidus_admin/bootstrap/_breadcrumb.scss +4 -4
- data/vendor/assets/stylesheets/solidus_admin/bootstrap/_button-group.scss +32 -64
- data/vendor/assets/stylesheets/solidus_admin/bootstrap/_buttons.scss +38 -36
- data/vendor/assets/stylesheets/solidus_admin/bootstrap/_card.scss +78 -31
- data/vendor/assets/stylesheets/solidus_admin/bootstrap/_carousel.scss +6 -0
- data/vendor/assets/stylesheets/solidus_admin/bootstrap/_close.scss +8 -3
- data/vendor/assets/stylesheets/solidus_admin/bootstrap/_code.scss +4 -12
- data/vendor/assets/stylesheets/solidus_admin/bootstrap/_custom-forms.scss +132 -89
- data/vendor/assets/stylesheets/solidus_admin/bootstrap/_dropdown.scss +46 -43
- data/vendor/assets/stylesheets/solidus_admin/bootstrap/_forms.scss +47 -104
- data/vendor/assets/stylesheets/solidus_admin/bootstrap/_functions.scss +8 -12
- data/vendor/assets/stylesheets/solidus_admin/bootstrap/_grid.scss +0 -1
- data/vendor/assets/stylesheets/solidus_admin/bootstrap/_images.scss +0 -1
- data/vendor/assets/stylesheets/solidus_admin/bootstrap/_input-group.scss +103 -120
- data/vendor/assets/stylesheets/solidus_admin/bootstrap/_list-group.scss +2 -1
- data/vendor/assets/stylesheets/solidus_admin/bootstrap/_mixins.scss +1 -0
- data/vendor/assets/stylesheets/solidus_admin/bootstrap/_modal.scss +36 -10
- data/vendor/assets/stylesheets/solidus_admin/bootstrap/_nav.scss +7 -7
- data/vendor/assets/stylesheets/solidus_admin/bootstrap/_navbar.scss +35 -8
- data/vendor/assets/stylesheets/solidus_admin/bootstrap/_pagination.scss +33 -22
- data/vendor/assets/stylesheets/solidus_admin/bootstrap/_popover.scss +106 -118
- data/vendor/assets/stylesheets/solidus_admin/bootstrap/_print.scss +19 -6
- data/vendor/assets/stylesheets/solidus_admin/bootstrap/_progress.scss +5 -4
- data/vendor/assets/stylesheets/solidus_admin/bootstrap/_reboot.scss +39 -38
- data/vendor/assets/stylesheets/solidus_admin/bootstrap/_root.scss +19 -0
- data/vendor/assets/stylesheets/solidus_admin/bootstrap/_tables.scss +40 -28
- data/vendor/assets/stylesheets/solidus_admin/bootstrap/_tooltip.scss +65 -57
- data/vendor/assets/stylesheets/solidus_admin/bootstrap/_transitions.scss +2 -0
- data/vendor/assets/stylesheets/solidus_admin/bootstrap/_type.scss +4 -2
- data/vendor/assets/stylesheets/solidus_admin/bootstrap/_variables.scss +546 -489
- data/vendor/assets/stylesheets/solidus_admin/bootstrap/bootstrap-grid.scss +8 -13
- data/vendor/assets/stylesheets/solidus_admin/bootstrap/bootstrap-reboot.scss +7 -4
- data/vendor/assets/stylesheets/solidus_admin/bootstrap/bootstrap.scss +5 -4
- data/vendor/assets/stylesheets/solidus_admin/bootstrap/mixins/_alert.scss +1 -1
- data/vendor/assets/stylesheets/solidus_admin/bootstrap/mixins/_background-variant.scss +10 -1
- data/vendor/assets/stylesheets/solidus_admin/bootstrap/mixins/_badge.scss +2 -2
- data/vendor/assets/stylesheets/solidus_admin/bootstrap/mixins/_breakpoints.scss +25 -7
- data/vendor/assets/stylesheets/solidus_admin/bootstrap/mixins/_buttons.scss +50 -24
- data/vendor/assets/stylesheets/solidus_admin/bootstrap/mixins/_caret.scss +65 -0
- data/vendor/assets/stylesheets/solidus_admin/bootstrap/mixins/_float.scss +2 -0
- data/vendor/assets/stylesheets/solidus_admin/bootstrap/mixins/_forms.scss +72 -16
- data/vendor/assets/stylesheets/solidus_admin/bootstrap/mixins/_gradients.scss +8 -0
- data/vendor/assets/stylesheets/solidus_admin/bootstrap/mixins/_grid-framework.scss +15 -4
- data/vendor/assets/stylesheets/solidus_admin/bootstrap/mixins/_grid.scss +10 -5
- data/vendor/assets/stylesheets/solidus_admin/bootstrap/mixins/_hover.scss +25 -46
- data/vendor/assets/stylesheets/solidus_admin/bootstrap/mixins/_image.scss +3 -3
- data/vendor/assets/stylesheets/solidus_admin/bootstrap/mixins/_list-group.scss +10 -15
- data/vendor/assets/stylesheets/solidus_admin/bootstrap/mixins/_navbar-align.scss +2 -1
- data/vendor/assets/stylesheets/solidus_admin/bootstrap/mixins/_reset-text.scss +1 -2
- data/vendor/assets/stylesheets/solidus_admin/bootstrap/mixins/_screen-reader.scss +3 -3
- data/vendor/assets/stylesheets/solidus_admin/bootstrap/mixins/_text-emphasis.scss +2 -0
- data/vendor/assets/stylesheets/solidus_admin/bootstrap/mixins/_text-hide.scss +1 -0
- data/vendor/assets/stylesheets/solidus_admin/bootstrap/mixins/_visibility.scss +2 -0
- data/vendor/assets/stylesheets/solidus_admin/bootstrap/utilities/_align.scss +2 -0
- data/vendor/assets/stylesheets/solidus_admin/bootstrap/utilities/_background.scss +16 -3
- data/vendor/assets/stylesheets/solidus_admin/bootstrap/utilities/_borders.scss +10 -3
- data/vendor/assets/stylesheets/solidus_admin/bootstrap/utilities/_display.scss +13 -28
- data/vendor/assets/stylesheets/solidus_admin/bootstrap/utilities/_flex.scss +2 -0
- data/vendor/assets/stylesheets/solidus_admin/bootstrap/utilities/_position.scss +12 -1
- data/vendor/assets/stylesheets/solidus_admin/bootstrap/utilities/_sizing.scss +2 -0
- data/vendor/assets/stylesheets/solidus_admin/bootstrap/utilities/_spacing.scss +24 -14
- data/vendor/assets/stylesheets/solidus_admin/bootstrap/utilities/_text.scss +7 -4
- data/vendor/assets/stylesheets/solidus_admin/flatpickr/flatpickr.css +857 -0
- metadata +57 -127
- data/Gemfile +0 -9
- data/app/assets/javascripts/spree/backend/address_states.js +0 -35
- data/app/assets/javascripts/spree/backend/adjustments.js.coffee +0 -17
- data/app/assets/javascripts/spree/backend/backbone-overrides.js.coffee +0 -23
- data/app/assets/javascripts/spree/backend/components/editable_table.js.coffee +0 -3
- data/app/assets/javascripts/spree/backend/components/tabs.coffee +0 -79
- data/app/assets/javascripts/spree/backend/flash.coffee +0 -17
- data/app/assets/javascripts/spree/backend/gateway.js.coffee +0 -21
- data/app/assets/javascripts/spree/backend/images/index.js.coffee +0 -13
- data/app/assets/javascripts/spree/backend/navigation.coffee +0 -10
- data/app/assets/javascripts/spree/backend/number_field_updater.coffee +0 -41
- data/app/assets/javascripts/spree/backend/payments/edit.js.coffee +0 -33
- data/app/assets/javascripts/spree/backend/progress.coffee +0 -7
- data/app/assets/javascripts/spree/backend/promotions.js.coffee +0 -99
- data/app/assets/javascripts/spree/backend/select_payments.js.coffee +0 -0
- data/app/assets/javascripts/spree/backend/states.coffee +0 -22
- data/app/assets/javascripts/spree/backend/stock_management/index_add_forms.coffee +0 -61
- data/app/assets/javascripts/spree/backend/stock_management/index_update_forms.coffee +0 -66
- data/app/assets/javascripts/spree/backend/stock_management/stock_item.coffee +0 -4
- data/app/assets/javascripts/spree/backend/stock_transfers/count_update_forms.coffee +0 -44
- data/app/assets/javascripts/spree/backend/stock_transfers/edit.coffee +0 -6
- data/app/assets/javascripts/spree/backend/stock_transfers/receive.coffee +0 -5
- data/app/assets/javascripts/spree/backend/stock_transfers/received_counter.coffee +0 -9
- data/app/assets/javascripts/spree/backend/stock_transfers/stock_transfer.coffee +0 -17
- data/app/assets/javascripts/spree/backend/stock_transfers/transfer_item.coffee +0 -48
- data/app/assets/javascripts/spree/backend/stock_transfers/transfer_item_deleting.coffee +0 -22
- data/app/assets/javascripts/spree/backend/stock_transfers/variant_form.coffee +0 -128
- data/app/assets/javascripts/spree/backend/store_credits.js.coffee +0 -40
- data/app/assets/javascripts/spree/backend/style_guide.coffee +0 -2
- data/app/assets/javascripts/spree/backend/taxonomy.js.coffee +0 -108
- data/app/assets/javascripts/spree/backend/taxons.js.coffee +0 -73
- data/app/assets/javascripts/spree/backend/templates/promotions/rules/option_values_select.hbs +0 -1
- data/app/assets/javascripts/spree/backend/templates/stock_transfers/transfer_item.hbs +0 -48
- data/app/assets/javascripts/spree/backend/variant_autocomplete.js.coffee +0 -39
- data/app/assets/javascripts/spree/backend/views/tables/editable_table.js.coffee +0 -14
- data/app/assets/javascripts/spree/backend/views/tables/editable_table_row.js.coffee +0 -45
- data/app/assets/stylesheets/spree/backend/components/_date-picker.scss +0 -154
- data/app/assets/stylesheets/spree/backend/components/_number_field_update.scss +0 -13
- data/app/assets/stylesheets/spree/backend/sections/_stock_transfers.scss +0 -7
- data/app/assets/stylesheets/spree/backend/sections/_transfer_items.scss +0 -49
- data/app/controllers/spree/admin/stock_transfers_controller.rb +0 -151
- data/app/helpers/spree/admin/general_settings_helper.rb +0 -13
- data/app/helpers/spree/admin/inventory_settings_helper.rb +0 -9
- data/app/helpers/spree/admin/stock_transfers_helper.rb +0 -35
- data/app/helpers/spree/admin/tables_helper.rb +0 -13
- data/app/helpers/spree/admin/taxons_helper.rb +0 -9
- data/app/views/spree/admin/products/new.js.erb +0 -4
- data/app/views/spree/admin/promotions/rules/_landing_page.html.erb +0 -7
- data/app/views/spree/admin/shared/_number_field_update_actions.html.erb +0 -5
- data/app/views/spree/admin/shared/_number_field_update_cell.html.erb +0 -4
- data/app/views/spree/admin/shared/_stock_sub_menu.html.erb +0 -8
- data/app/views/spree/admin/stock_transfers/_location.html.erb +0 -7
- data/app/views/spree/admin/stock_transfers/_transfer_item_actions.html.erb +0 -9
- data/app/views/spree/admin/stock_transfers/_transfer_item_table.html.erb +0 -72
- data/app/views/spree/admin/stock_transfers/edit.html.erb +0 -52
- data/app/views/spree/admin/stock_transfers/index.html.erb +0 -123
- data/app/views/spree/admin/stock_transfers/new.html.erb +0 -26
- data/app/views/spree/admin/stock_transfers/receive.html.erb +0 -38
- data/app/views/spree/admin/stock_transfers/show.html.erb +0 -50
- data/app/views/spree/admin/stock_transfers/tracking_info.html.erb +0 -46
- data/spec/controllers/spree/admin/stock_transfers_controller_spec.rb +0 -365
- data/spec/features/admin/stock_transfer_spec.rb +0 -115
- data/vendor/assets/images/jquery-ui/ui-bg_flat_0_aaaaaa_40x100.png +0 -0
- data/vendor/assets/images/jquery-ui/ui-bg_flat_0_eeeeee_40x100.png +0 -0
- data/vendor/assets/images/jquery-ui/ui-bg_flat_55_ffffff_40x100.png +0 -0
- data/vendor/assets/images/jquery-ui/ui-bg_flat_75_ffffff_40x100.png +0 -0
- data/vendor/assets/images/jquery-ui/ui-bg_glass_65_ffffff_1x400.png +0 -0
- data/vendor/assets/images/jquery-ui/ui-bg_highlight-soft_100_f6f6f6_1x100.png +0 -0
- data/vendor/assets/images/jquery-ui/ui-bg_highlight-soft_25_0073ea_1x100.png +0 -0
- data/vendor/assets/images/jquery-ui/ui-bg_highlight-soft_50_dddddd_1x100.png +0 -0
- data/vendor/assets/images/jquery-ui/ui-icons_0073ea_256x240.png +0 -0
- data/vendor/assets/images/jquery-ui/ui-icons_454545_256x240.png +0 -0
- data/vendor/assets/images/jquery-ui/ui-icons_666666_256x240.png +0 -0
- data/vendor/assets/images/jquery-ui/ui-icons_ff0084_256x240.png +0 -0
- data/vendor/assets/images/jquery-ui/ui-icons_ffffff_256x240.png +0 -0
- data/vendor/assets/stylesheets/jquery-ui.datepicker.css.erb +0 -357
@@ -1,14 +1,12 @@
|
|
1
|
-
|
2
|
-
|
3
|
-
|
4
|
-
|
5
|
-
|
6
|
-
|
7
|
-
// Box sizing, responsive, and more
|
8
|
-
//
|
1
|
+
/*!
|
2
|
+
* Bootstrap Grid v4.0.0 (https://getbootstrap.com)
|
3
|
+
* Copyright 2011-2018 The Bootstrap Authors
|
4
|
+
* Copyright 2011-2018 Twitter, Inc.
|
5
|
+
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
|
6
|
+
*/
|
9
7
|
|
10
8
|
@at-root {
|
11
|
-
@-ms-viewport { width: device-width; }
|
9
|
+
@-ms-viewport { width: device-width; } // stylelint-disable-line at-rule-no-vendor-prefix
|
12
10
|
}
|
13
11
|
|
14
12
|
html {
|
@@ -25,13 +23,10 @@ html {
|
|
25
23
|
@import "functions";
|
26
24
|
@import "variables";
|
27
25
|
|
28
|
-
//
|
29
|
-
// Grid mixins
|
30
|
-
//
|
31
|
-
|
32
26
|
@import "mixins/breakpoints";
|
33
27
|
@import "mixins/grid-framework";
|
34
28
|
@import "mixins/grid";
|
35
29
|
|
36
30
|
@import "grid";
|
31
|
+
@import "utilities/display";
|
37
32
|
@import "utilities/flex";
|
@@ -1,9 +1,12 @@
|
|
1
|
-
|
2
|
-
|
3
|
-
|
1
|
+
/*!
|
2
|
+
* Bootstrap Reboot v4.0.0 (https://getbootstrap.com)
|
3
|
+
* Copyright 2011-2018 The Bootstrap Authors
|
4
|
+
* Copyright 2011-2018 Twitter, Inc.
|
5
|
+
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
|
6
|
+
* Forked from Normalize.css, licensed MIT (https://github.com/necolas/normalize.css/blob/master/LICENSE.md)
|
7
|
+
*/
|
4
8
|
|
5
9
|
@import "functions";
|
6
10
|
@import "variables";
|
7
11
|
@import "mixins";
|
8
|
-
|
9
12
|
@import "reboot";
|
@@ -1,14 +1,14 @@
|
|
1
1
|
/*!
|
2
|
-
* Bootstrap v4.0.0
|
3
|
-
* Copyright 2011-
|
4
|
-
* Copyright 2011-
|
2
|
+
* Bootstrap v4.0.0 (https://getbootstrap.com)
|
3
|
+
* Copyright 2011-2018 The Bootstrap Authors
|
4
|
+
* Copyright 2011-2018 Twitter, Inc.
|
5
5
|
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
|
6
6
|
*/
|
7
7
|
|
8
8
|
@import "functions";
|
9
9
|
@import "variables";
|
10
10
|
@import "mixins";
|
11
|
-
@import "
|
11
|
+
@import "root";
|
12
12
|
@import "reboot";
|
13
13
|
@import "type";
|
14
14
|
@import "images";
|
@@ -39,3 +39,4 @@
|
|
39
39
|
@import "popover";
|
40
40
|
@import "carousel";
|
41
41
|
@import "utilities";
|
42
|
+
@import "print";
|
@@ -1,12 +1,21 @@
|
|
1
|
+
// stylelint-disable declaration-no-important
|
2
|
+
|
1
3
|
// Contextual backgrounds
|
2
4
|
|
3
5
|
@mixin bg-variant($parent, $color) {
|
4
6
|
#{$parent} {
|
5
7
|
background-color: $color !important;
|
6
8
|
}
|
7
|
-
a#{$parent}
|
9
|
+
a#{$parent},
|
10
|
+
button#{$parent} {
|
8
11
|
@include hover-focus {
|
9
12
|
background-color: darken($color, 10%) !important;
|
10
13
|
}
|
11
14
|
}
|
12
15
|
}
|
16
|
+
|
17
|
+
@mixin bg-gradient-variant($parent, $color) {
|
18
|
+
#{$parent} {
|
19
|
+
background: $color linear-gradient(180deg, mix($body-bg, $color, 15%), $color) repeat-x !important;
|
20
|
+
}
|
21
|
+
}
|
@@ -1,10 +1,10 @@
|
|
1
1
|
@mixin badge-variant($bg) {
|
2
|
-
|
2
|
+
color: color-yiq($bg);
|
3
3
|
background-color: $bg;
|
4
4
|
|
5
5
|
&[href] {
|
6
6
|
@include hover-focus {
|
7
|
-
|
7
|
+
color: color-yiq($bg);
|
8
8
|
text-decoration: none;
|
9
9
|
background-color: darken($bg, 10%);
|
10
10
|
}
|
@@ -29,13 +29,17 @@
|
|
29
29
|
}
|
30
30
|
|
31
31
|
// Maximum breakpoint width. Null for the largest (last) breakpoint.
|
32
|
-
// The maximum value is calculated as the minimum of the next one less 0.
|
32
|
+
// The maximum value is calculated as the minimum of the next one less 0.02px
|
33
|
+
// to work around the limitations of `min-` and `max-` prefixes and viewports with fractional widths.
|
34
|
+
// See https://www.w3.org/TR/mediaqueries-4/#mq-min-max
|
35
|
+
// Uses 0.02px rather than 0.01px to work around a current rounding bug in Safari.
|
36
|
+
// See https://bugs.webkit.org/show_bug.cgi?id=178261
|
33
37
|
//
|
34
38
|
// >> breakpoint-max(sm, (xs: 0, sm: 576px, md: 768px, lg: 992px, xl: 1200px))
|
35
|
-
//
|
39
|
+
// 767.98px
|
36
40
|
@function breakpoint-max($name, $breakpoints: $grid-breakpoints) {
|
37
41
|
$next: breakpoint-next($name, $breakpoints);
|
38
|
-
@return if($next, breakpoint-min($next, $breakpoints) -
|
42
|
+
@return if($next, breakpoint-min($next, $breakpoints) - .02px, null);
|
39
43
|
}
|
40
44
|
|
41
45
|
// Returns a blank string if smallest breakpoint, otherwise returns the name with a dash infront.
|
@@ -81,8 +85,18 @@
|
|
81
85
|
$min: breakpoint-min($lower, $breakpoints);
|
82
86
|
$max: breakpoint-max($upper, $breakpoints);
|
83
87
|
|
84
|
-
@
|
85
|
-
@
|
88
|
+
@if $min != null and $max != null {
|
89
|
+
@media (min-width: $min) and (max-width: $max) {
|
90
|
+
@content;
|
91
|
+
}
|
92
|
+
} @else if $max == null {
|
93
|
+
@include media-breakpoint-up($lower, $breakpoints) {
|
94
|
+
@content;
|
95
|
+
}
|
96
|
+
} @else if $min == null {
|
97
|
+
@include media-breakpoint-down($upper, $breakpoints) {
|
98
|
+
@content;
|
99
|
+
}
|
86
100
|
}
|
87
101
|
}
|
88
102
|
|
@@ -98,8 +112,12 @@
|
|
98
112
|
@content;
|
99
113
|
}
|
100
114
|
} @else if $max == null {
|
101
|
-
@include media-breakpoint-up($name)
|
115
|
+
@include media-breakpoint-up($name, $breakpoints) {
|
116
|
+
@content;
|
117
|
+
}
|
102
118
|
} @else if $min == null {
|
103
|
-
@include media-breakpoint-down($name)
|
119
|
+
@include media-breakpoint-down($name, $breakpoints) {
|
120
|
+
@content;
|
121
|
+
}
|
104
122
|
}
|
105
123
|
}
|
@@ -3,60 +3,72 @@
|
|
3
3
|
// Easily pump out default styles, as well as :hover, :focus, :active,
|
4
4
|
// and disabled options for all buttons
|
5
5
|
|
6
|
-
@mixin button-variant($background, $border, $
|
7
|
-
|
8
|
-
|
6
|
+
@mixin button-variant($background, $border, $hover-background: darken($background, 7.5%), $hover-border: darken($border, 10%), $active-background: darken($background, 10%), $active-border: darken($border, 12.5%)) {
|
7
|
+
color: color-yiq($background);
|
8
|
+
@include gradient-bg($background);
|
9
9
|
border-color: $border;
|
10
10
|
@include box-shadow($btn-box-shadow);
|
11
11
|
|
12
|
-
|
13
|
-
|
14
|
-
|
15
|
-
border-color: $
|
12
|
+
@include hover {
|
13
|
+
color: color-yiq($hover-background);
|
14
|
+
@include gradient-bg($hover-background);
|
15
|
+
border-color: $hover-border;
|
16
16
|
}
|
17
17
|
|
18
18
|
&:focus,
|
19
19
|
&.focus {
|
20
20
|
// Avoid using mixin so we can pass custom focus shadow properly
|
21
21
|
@if $enable-shadows {
|
22
|
-
box-shadow: $btn-box-shadow, 0 0 0
|
22
|
+
box-shadow: $btn-box-shadow, 0 0 0 $btn-focus-width rgba($border, .5);
|
23
23
|
} @else {
|
24
|
-
box-shadow: 0 0 0
|
24
|
+
box-shadow: 0 0 0 $btn-focus-width rgba($border, .5);
|
25
25
|
}
|
26
26
|
}
|
27
27
|
|
28
28
|
// Disabled comes first so active can properly restyle
|
29
29
|
&.disabled,
|
30
30
|
&:disabled {
|
31
|
+
color: color-yiq($background);
|
31
32
|
background-color: $background;
|
32
33
|
border-color: $border;
|
33
34
|
}
|
34
35
|
|
35
|
-
&:active,
|
36
|
-
|
36
|
+
&:not(:disabled):not(.disabled):active,
|
37
|
+
&:not(:disabled):not(.disabled).active,
|
37
38
|
.show > &.dropdown-toggle {
|
39
|
+
color: color-yiq($active-background);
|
38
40
|
background-color: $active-background;
|
39
|
-
|
41
|
+
@if $enable-gradients {
|
42
|
+
background-image: none; // Remove the gradient for the pressed/active state
|
43
|
+
}
|
40
44
|
border-color: $active-border;
|
41
|
-
|
45
|
+
|
46
|
+
&:focus {
|
47
|
+
// Avoid using mixin so we can pass custom focus shadow properly
|
48
|
+
@if $enable-shadows {
|
49
|
+
box-shadow: $btn-active-box-shadow, 0 0 0 $btn-focus-width rgba($border, .5);
|
50
|
+
} @else {
|
51
|
+
box-shadow: 0 0 0 $btn-focus-width rgba($border, .5);
|
52
|
+
}
|
53
|
+
}
|
42
54
|
}
|
43
55
|
}
|
44
56
|
|
45
|
-
@mixin button-outline-variant($color, $color-hover:
|
57
|
+
@mixin button-outline-variant($color, $color-hover: color-yiq($color), $active-background: $color, $active-border: $color) {
|
46
58
|
color: $color;
|
47
59
|
background-color: transparent;
|
48
60
|
background-image: none;
|
49
61
|
border-color: $color;
|
50
62
|
|
51
|
-
|
63
|
+
&:hover {
|
52
64
|
color: $color-hover;
|
53
|
-
background-color: $
|
54
|
-
border-color: $
|
65
|
+
background-color: $active-background;
|
66
|
+
border-color: $active-border;
|
55
67
|
}
|
56
68
|
|
57
69
|
&:focus,
|
58
70
|
&.focus {
|
59
|
-
box-shadow: 0 0 0
|
71
|
+
box-shadow: 0 0 0 $btn-focus-width rgba($color, .5);
|
60
72
|
}
|
61
73
|
|
62
74
|
&.disabled,
|
@@ -65,12 +77,21 @@
|
|
65
77
|
background-color: transparent;
|
66
78
|
}
|
67
79
|
|
68
|
-
&:active,
|
69
|
-
|
80
|
+
&:not(:disabled):not(.disabled):active,
|
81
|
+
&:not(:disabled):not(.disabled).active,
|
70
82
|
.show > &.dropdown-toggle {
|
71
|
-
color:
|
72
|
-
background-color: $
|
73
|
-
border-color: $
|
83
|
+
color: color-yiq($active-background);
|
84
|
+
background-color: $active-background;
|
85
|
+
border-color: $active-border;
|
86
|
+
|
87
|
+
&:focus {
|
88
|
+
// Avoid using mixin so we can pass custom focus shadow properly
|
89
|
+
@if $enable-shadows and $btn-active-box-shadow != none {
|
90
|
+
box-shadow: $btn-active-box-shadow, 0 0 0 $btn-focus-width rgba($color, .5);
|
91
|
+
} @else {
|
92
|
+
box-shadow: 0 0 0 $btn-focus-width rgba($color, .5);
|
93
|
+
}
|
94
|
+
}
|
74
95
|
}
|
75
96
|
}
|
76
97
|
|
@@ -79,5 +100,10 @@
|
|
79
100
|
padding: $padding-y $padding-x;
|
80
101
|
font-size: $font-size;
|
81
102
|
line-height: $line-height;
|
82
|
-
|
103
|
+
// Manually declare to provide an override to the browser default
|
104
|
+
@if $enable-rounded {
|
105
|
+
border-radius: $border-radius;
|
106
|
+
} @else {
|
107
|
+
border-radius: 0;
|
108
|
+
}
|
83
109
|
}
|
@@ -0,0 +1,65 @@
|
|
1
|
+
@mixin caret-down {
|
2
|
+
border-top: $caret-width solid;
|
3
|
+
border-right: $caret-width solid transparent;
|
4
|
+
border-bottom: 0;
|
5
|
+
border-left: $caret-width solid transparent;
|
6
|
+
}
|
7
|
+
|
8
|
+
@mixin caret-up {
|
9
|
+
border-top: 0;
|
10
|
+
border-right: $caret-width solid transparent;
|
11
|
+
border-bottom: $caret-width solid;
|
12
|
+
border-left: $caret-width solid transparent;
|
13
|
+
}
|
14
|
+
|
15
|
+
@mixin caret-right {
|
16
|
+
border-top: $caret-width solid transparent;
|
17
|
+
border-bottom: $caret-width solid transparent;
|
18
|
+
border-left: $caret-width solid;
|
19
|
+
}
|
20
|
+
|
21
|
+
@mixin caret-left {
|
22
|
+
border-top: $caret-width solid transparent;
|
23
|
+
border-right: $caret-width solid;
|
24
|
+
border-bottom: $caret-width solid transparent;
|
25
|
+
}
|
26
|
+
|
27
|
+
@mixin caret($direction: down) {
|
28
|
+
@if $enable-caret {
|
29
|
+
&::after {
|
30
|
+
display: inline-block;
|
31
|
+
width: 0;
|
32
|
+
height: 0;
|
33
|
+
margin-left: $caret-width * .85;
|
34
|
+
vertical-align: $caret-width * .85;
|
35
|
+
content: "";
|
36
|
+
@if $direction == down {
|
37
|
+
@include caret-down;
|
38
|
+
} @else if $direction == up {
|
39
|
+
@include caret-up;
|
40
|
+
} @else if $direction == right {
|
41
|
+
@include caret-right;
|
42
|
+
}
|
43
|
+
}
|
44
|
+
|
45
|
+
@if $direction == left {
|
46
|
+
&::after {
|
47
|
+
display: none;
|
48
|
+
}
|
49
|
+
|
50
|
+
&::before {
|
51
|
+
display: inline-block;
|
52
|
+
width: 0;
|
53
|
+
height: 0;
|
54
|
+
margin-right: $caret-width * .85;
|
55
|
+
vertical-align: $caret-width * .85;
|
56
|
+
content: "";
|
57
|
+
@include caret-left;
|
58
|
+
}
|
59
|
+
}
|
60
|
+
|
61
|
+
&:empty::after {
|
62
|
+
margin-left: 0;
|
63
|
+
}
|
64
|
+
}
|
65
|
+
}
|
@@ -1,7 +1,7 @@
|
|
1
1
|
// Form control focus state
|
2
2
|
//
|
3
3
|
// Generate a customized focus state and for any input with the specified color,
|
4
|
-
// which defaults to the
|
4
|
+
// which defaults to the `$input-focus-border-color` variable.
|
5
5
|
//
|
6
6
|
// We highly encourage you to not customize the default value, but instead use
|
7
7
|
// this to tweak colors on an as-needed basis. This aesthetic change is based on
|
@@ -15,13 +15,40 @@
|
|
15
15
|
color: $input-focus-color;
|
16
16
|
background-color: $input-focus-bg;
|
17
17
|
border-color: $input-focus-border-color;
|
18
|
-
outline:
|
19
|
-
|
18
|
+
outline: 0;
|
19
|
+
// Avoid using mixin so we can pass custom focus shadow properly
|
20
|
+
@if $enable-shadows {
|
21
|
+
box-shadow: $input-box-shadow, $input-focus-box-shadow;
|
22
|
+
} @else {
|
23
|
+
box-shadow: $input-focus-box-shadow;
|
24
|
+
}
|
20
25
|
}
|
21
26
|
}
|
22
27
|
|
23
28
|
|
24
29
|
@mixin form-validation-state($state, $color) {
|
30
|
+
.#{$state}-feedback {
|
31
|
+
display: none;
|
32
|
+
width: 100%;
|
33
|
+
margin-top: $form-feedback-margin-top;
|
34
|
+
font-size: $form-feedback-font-size;
|
35
|
+
color: $color;
|
36
|
+
}
|
37
|
+
|
38
|
+
.#{$state}-tooltip {
|
39
|
+
position: absolute;
|
40
|
+
top: 100%;
|
41
|
+
z-index: 5;
|
42
|
+
display: none;
|
43
|
+
max-width: 100%; // Contain to parent when possible
|
44
|
+
padding: .5rem;
|
45
|
+
margin-top: .1rem;
|
46
|
+
font-size: .875rem;
|
47
|
+
line-height: 1;
|
48
|
+
color: #fff;
|
49
|
+
background-color: rgba($color, .8);
|
50
|
+
border-radius: .2rem;
|
51
|
+
}
|
25
52
|
|
26
53
|
.form-control,
|
27
54
|
.custom-select {
|
@@ -30,36 +57,57 @@
|
|
30
57
|
border-color: $color;
|
31
58
|
|
32
59
|
&:focus {
|
33
|
-
|
60
|
+
border-color: $color;
|
61
|
+
box-shadow: 0 0 0 $input-focus-width rgba($color, .25);
|
34
62
|
}
|
35
63
|
|
36
|
-
~
|
37
|
-
~
|
64
|
+
~ .#{$state}-feedback,
|
65
|
+
~ .#{$state}-tooltip {
|
38
66
|
display: block;
|
39
67
|
}
|
40
68
|
}
|
41
69
|
}
|
42
70
|
|
43
|
-
|
44
|
-
// TODO: redo check markup lol crap
|
45
71
|
.form-check-input {
|
46
72
|
.was-validated &:#{$state},
|
47
73
|
&.is-#{$state} {
|
48
|
-
|
74
|
+
~ .form-check-label {
|
49
75
|
color: $color;
|
50
76
|
}
|
77
|
+
|
78
|
+
~ .#{$state}-feedback,
|
79
|
+
~ .#{$state}-tooltip {
|
80
|
+
display: block;
|
81
|
+
}
|
51
82
|
}
|
52
83
|
}
|
53
84
|
|
54
|
-
// custom radios and checks
|
55
85
|
.custom-control-input {
|
56
86
|
.was-validated &:#{$state},
|
57
87
|
&.is-#{$state} {
|
58
|
-
~ .custom-control-
|
59
|
-
background-color: rgba($color, .25);
|
60
|
-
}
|
61
|
-
~ .custom-control-description {
|
88
|
+
~ .custom-control-label {
|
62
89
|
color: $color;
|
90
|
+
|
91
|
+
&::before {
|
92
|
+
background-color: lighten($color, 25%);
|
93
|
+
}
|
94
|
+
}
|
95
|
+
|
96
|
+
~ .#{$state}-feedback,
|
97
|
+
~ .#{$state}-tooltip {
|
98
|
+
display: block;
|
99
|
+
}
|
100
|
+
|
101
|
+
&:checked {
|
102
|
+
~ .custom-control-label::before {
|
103
|
+
@include gradient-bg(lighten($color, 10%));
|
104
|
+
}
|
105
|
+
}
|
106
|
+
|
107
|
+
&:focus {
|
108
|
+
~ .custom-control-label::before {
|
109
|
+
box-shadow: 0 0 0 1px $body-bg, 0 0 0 $input-focus-width rgba($color, .25);
|
110
|
+
}
|
63
111
|
}
|
64
112
|
}
|
65
113
|
}
|
@@ -68,13 +116,21 @@
|
|
68
116
|
.custom-file-input {
|
69
117
|
.was-validated &:#{$state},
|
70
118
|
&.is-#{$state} {
|
71
|
-
~ .custom-file-
|
119
|
+
~ .custom-file-label {
|
72
120
|
border-color: $color;
|
73
121
|
|
74
122
|
&::before { border-color: inherit; }
|
75
123
|
}
|
124
|
+
|
125
|
+
~ .#{$state}-feedback,
|
126
|
+
~ .#{$state}-tooltip {
|
127
|
+
display: block;
|
128
|
+
}
|
129
|
+
|
76
130
|
&:focus {
|
77
|
-
|
131
|
+
~ .custom-file-label {
|
132
|
+
box-shadow: 0 0 0 $input-focus-width rgba($color, .25);
|
133
|
+
}
|
78
134
|
}
|
79
135
|
}
|
80
136
|
}
|