diff --git a/app/views/layouts/darkswarm.html.haml b/app/views/layouts/darkswarm.html.haml index c02ebb6ee0..951618fa45 100644 --- a/app/views/layouts/darkswarm.html.haml +++ b/app/views/layouts/darkswarm.html.haml @@ -15,7 +15,7 @@ %link{href: "https://fonts.googleapis.com/css?family=Roboto:400,300italic,400italic,300,700,700italic|Oswald:300,400,700", rel: "stylesheet", type: "text/css"} %link{href: font_path("OFN-v2.woff"), rel: "preload", as: "font", crossorigin: "anonymous"} - = stylesheet_link_tag "darkswarm/all", "data-turbo-track": "reload" + = stylesheet_pack_tag "darkswarm", "data-turbo-track": "reload" = javascript_pack_tag "application", "data-turbo-track": "reload" = render "layouts/shopfront_script" if @shopfront_layout diff --git a/app/views/layouts/registration.html.haml b/app/views/layouts/registration.html.haml index b8bb3d392e..ea49bc4c5f 100644 --- a/app/views/layouts/registration.html.haml +++ b/app/views/layouts/registration.html.haml @@ -10,7 +10,7 @@ = favicon_link_tag "/favicon-staging.ico" %link{href: "https://fonts.googleapis.com/css?family=Roboto:400,300italic,400italic,300,700,700italic|Oswald:300,400,700", rel: "stylesheet", type: "text/css"} - = stylesheet_link_tag "darkswarm/all" + = stylesheet_pack_tag "darkswarm" = javascript_include_tag "darkswarm/all" = javascript_pack_tag "application" diff --git a/app/assets/stylesheets/admin/advanced_settings.scss b/app/webpacker/css/admin/advanced_settings.scss similarity index 100% rename from app/assets/stylesheets/admin/advanced_settings.scss rename to app/webpacker/css/admin/advanced_settings.scss diff --git a/app/assets/stylesheets/admin/alert.scss b/app/webpacker/css/admin/alert.scss similarity index 100% rename from app/assets/stylesheets/admin/alert.scss rename to app/webpacker/css/admin/alert.scss diff --git a/app/assets/stylesheets/admin/all.scss b/app/webpacker/css/admin/all.scss similarity index 100% rename from app/assets/stylesheets/admin/all.scss rename to app/webpacker/css/admin/all.scss diff --git a/app/assets/stylesheets/admin/animations.scss b/app/webpacker/css/admin/animations.scss similarity index 100% rename from app/assets/stylesheets/admin/animations.scss rename to app/webpacker/css/admin/animations.scss diff --git a/app/assets/stylesheets/admin/change_type_form.scss b/app/webpacker/css/admin/change_type_form.scss similarity index 100% rename from app/assets/stylesheets/admin/change_type_form.scss rename to app/webpacker/css/admin/change_type_form.scss diff --git a/app/assets/stylesheets/admin/components/actions.scss b/app/webpacker/css/admin/components/actions.scss similarity index 100% rename from app/assets/stylesheets/admin/components/actions.scss rename to app/webpacker/css/admin/components/actions.scss diff --git a/app/assets/stylesheets/admin/components/alert-box.scss b/app/webpacker/css/admin/components/alert-box.scss similarity index 100% rename from app/assets/stylesheets/admin/components/alert-box.scss rename to app/webpacker/css/admin/components/alert-box.scss diff --git a/app/assets/stylesheets/admin/components/alert_row.scss b/app/webpacker/css/admin/components/alert_row.scss similarity index 100% rename from app/assets/stylesheets/admin/components/alert_row.scss rename to app/webpacker/css/admin/components/alert_row.scss diff --git a/app/assets/stylesheets/admin/components/date-picker.scss b/app/webpacker/css/admin/components/date-picker.scss similarity index 100% rename from app/assets/stylesheets/admin/components/date-picker.scss rename to app/webpacker/css/admin/components/date-picker.scss diff --git a/app/assets/stylesheets/admin/components/dialogs.scss b/app/webpacker/css/admin/components/dialogs.scss similarity index 100% rename from app/assets/stylesheets/admin/components/dialogs.scss rename to app/webpacker/css/admin/components/dialogs.scss diff --git a/app/assets/stylesheets/admin/components/input.scss b/app/webpacker/css/admin/components/input.scss similarity index 100% rename from app/assets/stylesheets/admin/components/input.scss rename to app/webpacker/css/admin/components/input.scss diff --git a/app/assets/stylesheets/admin/components/jquery_dialog.scss b/app/webpacker/css/admin/components/jquery_dialog.scss similarity index 100% rename from app/assets/stylesheets/admin/components/jquery_dialog.scss rename to app/webpacker/css/admin/components/jquery_dialog.scss diff --git a/app/assets/stylesheets/admin/components/messages.scss b/app/webpacker/css/admin/components/messages.scss similarity index 100% rename from app/assets/stylesheets/admin/components/messages.scss rename to app/webpacker/css/admin/components/messages.scss diff --git a/app/assets/stylesheets/admin/components/navigation.scss b/app/webpacker/css/admin/components/navigation.scss similarity index 100% rename from app/assets/stylesheets/admin/components/navigation.scss rename to app/webpacker/css/admin/components/navigation.scss diff --git a/app/assets/stylesheets/admin/components/ng-cloak.scss b/app/webpacker/css/admin/components/ng-cloak.scss similarity index 100% rename from app/assets/stylesheets/admin/components/ng-cloak.scss rename to app/webpacker/css/admin/components/ng-cloak.scss diff --git a/app/assets/stylesheets/admin/components/page_actions.scss b/app/webpacker/css/admin/components/page_actions.scss similarity index 100% rename from app/assets/stylesheets/admin/components/page_actions.scss rename to app/webpacker/css/admin/components/page_actions.scss diff --git a/app/assets/stylesheets/admin/components/pagination.scss b/app/webpacker/css/admin/components/pagination.scss similarity index 100% rename from app/assets/stylesheets/admin/components/pagination.scss rename to app/webpacker/css/admin/components/pagination.scss diff --git a/app/assets/stylesheets/admin/components/per_page_controls.scss b/app/webpacker/css/admin/components/per_page_controls.scss similarity index 100% rename from app/assets/stylesheets/admin/components/per_page_controls.scss rename to app/webpacker/css/admin/components/per_page_controls.scss diff --git a/app/assets/stylesheets/admin/components/product_autocomplete.scss b/app/webpacker/css/admin/components/product_autocomplete.scss similarity index 100% rename from app/assets/stylesheets/admin/components/product_autocomplete.scss rename to app/webpacker/css/admin/components/product_autocomplete.scss diff --git a/app/assets/stylesheets/admin/components/progress.scss b/app/webpacker/css/admin/components/progress.scss similarity index 100% rename from app/assets/stylesheets/admin/components/progress.scss rename to app/webpacker/css/admin/components/progress.scss diff --git a/app/assets/stylesheets/admin/components/save_bar.scss b/app/webpacker/css/admin/components/save_bar.scss similarity index 100% rename from app/assets/stylesheets/admin/components/save_bar.scss rename to app/webpacker/css/admin/components/save_bar.scss diff --git a/app/assets/stylesheets/admin/components/sidebar.scss b/app/webpacker/css/admin/components/sidebar.scss similarity index 100% rename from app/assets/stylesheets/admin/components/sidebar.scss rename to app/webpacker/css/admin/components/sidebar.scss diff --git a/app/assets/stylesheets/admin/components/simple_modal.scss b/app/webpacker/css/admin/components/simple_modal.scss similarity index 100% rename from app/assets/stylesheets/admin/components/simple_modal.scss rename to app/webpacker/css/admin/components/simple_modal.scss diff --git a/app/assets/stylesheets/admin/components/states.scss b/app/webpacker/css/admin/components/states.scss similarity index 100% rename from app/assets/stylesheets/admin/components/states.scss rename to app/webpacker/css/admin/components/states.scss diff --git a/app/assets/stylesheets/admin/components/stripe_connect_button.scss b/app/webpacker/css/admin/components/stripe_connect_button.scss similarity index 100% rename from app/assets/stylesheets/admin/components/stripe_connect_button.scss rename to app/webpacker/css/admin/components/stripe_connect_button.scss diff --git a/app/assets/stylesheets/admin/components/subscriptions_states.scss b/app/webpacker/css/admin/components/subscriptions_states.scss similarity index 100% rename from app/assets/stylesheets/admin/components/subscriptions_states.scss rename to app/webpacker/css/admin/components/subscriptions_states.scss diff --git a/app/assets/stylesheets/admin/components/table-filter.scss b/app/webpacker/css/admin/components/table-filter.scss similarity index 100% rename from app/assets/stylesheets/admin/components/table-filter.scss rename to app/webpacker/css/admin/components/table-filter.scss diff --git a/app/assets/stylesheets/admin/components/table_loading.scss b/app/webpacker/css/admin/components/table_loading.scss similarity index 100% rename from app/assets/stylesheets/admin/components/table_loading.scss rename to app/webpacker/css/admin/components/table_loading.scss diff --git a/app/assets/stylesheets/admin/components/timepicker.scss b/app/webpacker/css/admin/components/timepicker.scss similarity index 100% rename from app/assets/stylesheets/admin/components/timepicker.scss rename to app/webpacker/css/admin/components/timepicker.scss diff --git a/app/assets/stylesheets/admin/components/todo.scss b/app/webpacker/css/admin/components/todo.scss similarity index 100% rename from app/assets/stylesheets/admin/components/todo.scss rename to app/webpacker/css/admin/components/todo.scss diff --git a/app/assets/stylesheets/admin/components/tooltip.scss b/app/webpacker/css/admin/components/tooltip.scss similarity index 100% rename from app/assets/stylesheets/admin/components/tooltip.scss rename to app/webpacker/css/admin/components/tooltip.scss diff --git a/app/assets/stylesheets/admin/components/wizard_progress.scss b/app/webpacker/css/admin/components/wizard_progress.scss similarity index 100% rename from app/assets/stylesheets/admin/components/wizard_progress.scss rename to app/webpacker/css/admin/components/wizard_progress.scss diff --git a/app/assets/stylesheets/admin/customers.scss b/app/webpacker/css/admin/customers.scss similarity index 100% rename from app/assets/stylesheets/admin/customers.scss rename to app/webpacker/css/admin/customers.scss diff --git a/app/assets/stylesheets/admin/dashboard-single-ent.scss b/app/webpacker/css/admin/dashboard-single-ent.scss similarity index 100% rename from app/assets/stylesheets/admin/dashboard-single-ent.scss rename to app/webpacker/css/admin/dashboard-single-ent.scss diff --git a/app/assets/stylesheets/admin/dashboard_item.scss b/app/webpacker/css/admin/dashboard_item.scss similarity index 100% rename from app/assets/stylesheets/admin/dashboard_item.scss rename to app/webpacker/css/admin/dashboard_item.scss diff --git a/app/assets/stylesheets/admin/dialog.scss b/app/webpacker/css/admin/dialog.scss similarity index 100% rename from app/assets/stylesheets/admin/dialog.scss rename to app/webpacker/css/admin/dialog.scss diff --git a/app/assets/stylesheets/admin/disabled.scss b/app/webpacker/css/admin/disabled.scss similarity index 100% rename from app/assets/stylesheets/admin/disabled.scss rename to app/webpacker/css/admin/disabled.scss diff --git a/app/assets/stylesheets/admin/dropdown.scss b/app/webpacker/css/admin/dropdown.scss similarity index 100% rename from app/assets/stylesheets/admin/dropdown.scss rename to app/webpacker/css/admin/dropdown.scss diff --git a/app/assets/stylesheets/admin/enterprise_index_panels.scss b/app/webpacker/css/admin/enterprise_index_panels.scss similarity index 100% rename from app/assets/stylesheets/admin/enterprise_index_panels.scss rename to app/webpacker/css/admin/enterprise_index_panels.scss diff --git a/app/assets/stylesheets/admin/enterprises.scss b/app/webpacker/css/admin/enterprises.scss similarity index 100% rename from app/assets/stylesheets/admin/enterprises.scss rename to app/webpacker/css/admin/enterprises.scss diff --git a/app/assets/stylesheets/admin/filters_and_controls.scss b/app/webpacker/css/admin/filters_and_controls.scss similarity index 100% rename from app/assets/stylesheets/admin/filters_and_controls.scss rename to app/webpacker/css/admin/filters_and_controls.scss diff --git a/app/assets/stylesheets/admin/globals/functions.scss b/app/webpacker/css/admin/globals/functions.scss similarity index 100% rename from app/assets/stylesheets/admin/globals/functions.scss rename to app/webpacker/css/admin/globals/functions.scss diff --git a/app/assets/stylesheets/admin/globals/mixins.scss b/app/webpacker/css/admin/globals/mixins.scss similarity index 100% rename from app/assets/stylesheets/admin/globals/mixins.scss rename to app/webpacker/css/admin/globals/mixins.scss diff --git a/app/assets/stylesheets/admin/globals/variables.scss b/app/webpacker/css/admin/globals/variables.scss similarity index 100% rename from app/assets/stylesheets/admin/globals/variables.scss rename to app/webpacker/css/admin/globals/variables.scss diff --git a/app/assets/stylesheets/admin/grid.scss b/app/webpacker/css/admin/grid.scss similarity index 100% rename from app/assets/stylesheets/admin/grid.scss rename to app/webpacker/css/admin/grid.scss diff --git a/app/assets/stylesheets/admin/hacks/ie.scss b/app/webpacker/css/admin/hacks/ie.scss similarity index 100% rename from app/assets/stylesheets/admin/hacks/ie.scss rename to app/webpacker/css/admin/hacks/ie.scss diff --git a/app/assets/stylesheets/admin/hacks/mozilla.scss b/app/webpacker/css/admin/hacks/mozilla.scss similarity index 100% rename from app/assets/stylesheets/admin/hacks/mozilla.scss rename to app/webpacker/css/admin/hacks/mozilla.scss diff --git a/app/assets/stylesheets/admin/hacks/opera.scss b/app/webpacker/css/admin/hacks/opera.scss similarity index 100% rename from app/assets/stylesheets/admin/hacks/opera.scss rename to app/webpacker/css/admin/hacks/opera.scss diff --git a/app/assets/stylesheets/admin/icons.scss b/app/webpacker/css/admin/icons.scss similarity index 100% rename from app/assets/stylesheets/admin/icons.scss rename to app/webpacker/css/admin/icons.scss diff --git a/app/assets/stylesheets/admin/index_panel_buttons.scss b/app/webpacker/css/admin/index_panel_buttons.scss similarity index 100% rename from app/assets/stylesheets/admin/index_panel_buttons.scss rename to app/webpacker/css/admin/index_panel_buttons.scss diff --git a/app/assets/stylesheets/admin/index_panels.scss b/app/webpacker/css/admin/index_panels.scss similarity index 100% rename from app/assets/stylesheets/admin/index_panels.scss rename to app/webpacker/css/admin/index_panels.scss diff --git a/app/assets/stylesheets/admin/modals.scss b/app/webpacker/css/admin/modals.scss similarity index 100% rename from app/assets/stylesheets/admin/modals.scss rename to app/webpacker/css/admin/modals.scss diff --git a/app/assets/stylesheets/admin/offsets.scss b/app/webpacker/css/admin/offsets.scss similarity index 100% rename from app/assets/stylesheets/admin/offsets.scss rename to app/webpacker/css/admin/offsets.scss diff --git a/app/assets/stylesheets/admin/openfoodnetwork.scss b/app/webpacker/css/admin/openfoodnetwork.scss similarity index 100% rename from app/assets/stylesheets/admin/openfoodnetwork.scss rename to app/webpacker/css/admin/openfoodnetwork.scss diff --git a/app/assets/stylesheets/admin/order_cycles.scss b/app/webpacker/css/admin/order_cycles.scss similarity index 100% rename from app/assets/stylesheets/admin/order_cycles.scss rename to app/webpacker/css/admin/order_cycles.scss diff --git a/app/assets/stylesheets/admin/orders.scss b/app/webpacker/css/admin/orders.scss similarity index 100% rename from app/assets/stylesheets/admin/orders.scss rename to app/webpacker/css/admin/orders.scss diff --git a/app/assets/stylesheets/admin/pages/enterprise_form.scss b/app/webpacker/css/admin/pages/enterprise_form.scss similarity index 100% rename from app/assets/stylesheets/admin/pages/enterprise_form.scss rename to app/webpacker/css/admin/pages/enterprise_form.scss diff --git a/app/assets/stylesheets/admin/pages/subscription_form.scss b/app/webpacker/css/admin/pages/subscription_form.scss similarity index 100% rename from app/assets/stylesheets/admin/pages/subscription_form.scss rename to app/webpacker/css/admin/pages/subscription_form.scss diff --git a/app/assets/stylesheets/admin/pages/subscription_line_items.scss b/app/webpacker/css/admin/pages/subscription_line_items.scss similarity index 100% rename from app/assets/stylesheets/admin/pages/subscription_line_items.scss rename to app/webpacker/css/admin/pages/subscription_line_items.scss diff --git a/app/assets/stylesheets/admin/pages/subscription_review.scss b/app/webpacker/css/admin/pages/subscription_review.scss similarity index 100% rename from app/assets/stylesheets/admin/pages/subscription_review.scss rename to app/webpacker/css/admin/pages/subscription_review.scss diff --git a/app/assets/stylesheets/admin/plugins/flatpickr-customization.scss b/app/webpacker/css/admin/plugins/flatpickr-customization.scss similarity index 100% rename from app/assets/stylesheets/admin/plugins/flatpickr-customization.scss rename to app/webpacker/css/admin/plugins/flatpickr-customization.scss diff --git a/app/assets/stylesheets/admin/plugins/font-awesome.scss b/app/webpacker/css/admin/plugins/font-awesome.scss similarity index 100% rename from app/assets/stylesheets/admin/plugins/font-awesome.scss rename to app/webpacker/css/admin/plugins/font-awesome.scss diff --git a/app/assets/stylesheets/admin/plugins/jstree.scss b/app/webpacker/css/admin/plugins/jstree.scss similarity index 100% rename from app/assets/stylesheets/admin/plugins/jstree.scss rename to app/webpacker/css/admin/plugins/jstree.scss diff --git a/app/assets/stylesheets/admin/plugins/powertip.scss b/app/webpacker/css/admin/plugins/powertip.scss similarity index 100% rename from app/assets/stylesheets/admin/plugins/powertip.scss rename to app/webpacker/css/admin/plugins/powertip.scss diff --git a/app/assets/stylesheets/admin/plugins/select2.scss b/app/webpacker/css/admin/plugins/select2.scss similarity index 100% rename from app/assets/stylesheets/admin/plugins/select2.scss rename to app/webpacker/css/admin/plugins/select2.scss diff --git a/app/assets/stylesheets/admin/product_import.scss b/app/webpacker/css/admin/product_import.scss similarity index 100% rename from app/assets/stylesheets/admin/product_import.scss rename to app/webpacker/css/admin/product_import.scss diff --git a/app/assets/stylesheets/admin/products.scss b/app/webpacker/css/admin/products.scss similarity index 100% rename from app/assets/stylesheets/admin/products.scss rename to app/webpacker/css/admin/products.scss diff --git a/app/assets/stylesheets/admin/question-mark-tooltip.scss b/app/webpacker/css/admin/question-mark-tooltip.scss similarity index 100% rename from app/assets/stylesheets/admin/question-mark-tooltip.scss rename to app/webpacker/css/admin/question-mark-tooltip.scss diff --git a/app/assets/stylesheets/admin/relationships.scss b/app/webpacker/css/admin/relationships.scss similarity index 100% rename from app/assets/stylesheets/admin/relationships.scss rename to app/webpacker/css/admin/relationships.scss diff --git a/app/assets/stylesheets/admin/reports.scss b/app/webpacker/css/admin/reports.scss similarity index 100% rename from app/assets/stylesheets/admin/reports.scss rename to app/webpacker/css/admin/reports.scss diff --git a/app/assets/stylesheets/admin/sections/orders.scss b/app/webpacker/css/admin/sections/orders.scss similarity index 100% rename from app/assets/stylesheets/admin/sections/orders.scss rename to app/webpacker/css/admin/sections/orders.scss diff --git a/app/assets/stylesheets/admin/sections/products.scss b/app/webpacker/css/admin/sections/products.scss similarity index 100% rename from app/assets/stylesheets/admin/sections/products.scss rename to app/webpacker/css/admin/sections/products.scss diff --git a/app/assets/stylesheets/admin/select2.scss b/app/webpacker/css/admin/select2.scss similarity index 100% rename from app/assets/stylesheets/admin/select2.scss rename to app/webpacker/css/admin/select2.scss diff --git a/app/assets/stylesheets/admin/shared/forms.scss b/app/webpacker/css/admin/shared/forms.scss similarity index 100% rename from app/assets/stylesheets/admin/shared/forms.scss rename to app/webpacker/css/admin/shared/forms.scss diff --git a/app/assets/stylesheets/admin/shared/icons.scss b/app/webpacker/css/admin/shared/icons.scss similarity index 100% rename from app/assets/stylesheets/admin/shared/icons.scss rename to app/webpacker/css/admin/shared/icons.scss diff --git a/app/assets/stylesheets/admin/shared/layout.scss b/app/webpacker/css/admin/shared/layout.scss similarity index 100% rename from app/assets/stylesheets/admin/shared/layout.scss rename to app/webpacker/css/admin/shared/layout.scss diff --git a/app/assets/stylesheets/admin/shared/tables.scss b/app/webpacker/css/admin/shared/tables.scss similarity index 100% rename from app/assets/stylesheets/admin/shared/tables.scss rename to app/webpacker/css/admin/shared/tables.scss diff --git a/app/assets/stylesheets/admin/shared/typography.scss b/app/webpacker/css/admin/shared/typography.scss similarity index 100% rename from app/assets/stylesheets/admin/shared/typography.scss rename to app/webpacker/css/admin/shared/typography.scss diff --git a/app/assets/stylesheets/admin/side_menu.scss b/app/webpacker/css/admin/side_menu.scss similarity index 100% rename from app/assets/stylesheets/admin/side_menu.scss rename to app/webpacker/css/admin/side_menu.scss diff --git a/app/assets/stylesheets/admin/sidebar-item.scss b/app/webpacker/css/admin/sidebar-item.scss similarity index 100% rename from app/assets/stylesheets/admin/sidebar-item.scss rename to app/webpacker/css/admin/sidebar-item.scss diff --git a/app/assets/stylesheets/admin/tables.scss b/app/webpacker/css/admin/tables.scss similarity index 100% rename from app/assets/stylesheets/admin/tables.scss rename to app/webpacker/css/admin/tables.scss diff --git a/app/assets/stylesheets/admin/tag_rules.scss b/app/webpacker/css/admin/tag_rules.scss similarity index 100% rename from app/assets/stylesheets/admin/tag_rules.scss rename to app/webpacker/css/admin/tag_rules.scss diff --git a/app/assets/stylesheets/admin/validation.scss b/app/webpacker/css/admin/validation.scss similarity index 100% rename from app/assets/stylesheets/admin/validation.scss rename to app/webpacker/css/admin/validation.scss diff --git a/app/assets/stylesheets/admin/variables.scss b/app/webpacker/css/admin/variables.scss similarity index 100% rename from app/assets/stylesheets/admin/variables.scss rename to app/webpacker/css/admin/variables.scss diff --git a/app/assets/stylesheets/admin/variant_overrides.scss b/app/webpacker/css/admin/variant_overrides.scss similarity index 100% rename from app/assets/stylesheets/admin/variant_overrides.scss rename to app/webpacker/css/admin/variant_overrides.scss diff --git a/app/assets/stylesheets/admin/welcome.scss b/app/webpacker/css/admin/welcome.scss similarity index 100% rename from app/assets/stylesheets/admin/welcome.scss rename to app/webpacker/css/admin/welcome.scss diff --git a/app/assets/stylesheets/darkswarm/_shop-filters.scss b/app/webpacker/css/darkswarm/_shop-filters.scss similarity index 100% rename from app/assets/stylesheets/darkswarm/_shop-filters.scss rename to app/webpacker/css/darkswarm/_shop-filters.scss diff --git a/app/assets/stylesheets/darkswarm/_shop-inputs.scss b/app/webpacker/css/darkswarm/_shop-inputs.scss similarity index 100% rename from app/assets/stylesheets/darkswarm/_shop-inputs.scss rename to app/webpacker/css/darkswarm/_shop-inputs.scss diff --git a/app/assets/stylesheets/darkswarm/_shop-modals.scss b/app/webpacker/css/darkswarm/_shop-modals.scss similarity index 100% rename from app/assets/stylesheets/darkswarm/_shop-modals.scss rename to app/webpacker/css/darkswarm/_shop-modals.scss diff --git a/app/assets/stylesheets/darkswarm/_shop-navigation.scss b/app/webpacker/css/darkswarm/_shop-navigation.scss similarity index 100% rename from app/assets/stylesheets/darkswarm/_shop-navigation.scss rename to app/webpacker/css/darkswarm/_shop-navigation.scss diff --git a/app/assets/stylesheets/darkswarm/_shop-popovers.scss b/app/webpacker/css/darkswarm/_shop-popovers.scss similarity index 100% rename from app/assets/stylesheets/darkswarm/_shop-popovers.scss rename to app/webpacker/css/darkswarm/_shop-popovers.scss diff --git a/app/assets/stylesheets/darkswarm/_shop-product-rows.scss b/app/webpacker/css/darkswarm/_shop-product-rows.scss similarity index 100% rename from app/assets/stylesheets/darkswarm/_shop-product-rows.scss rename to app/webpacker/css/darkswarm/_shop-product-rows.scss diff --git a/app/assets/stylesheets/darkswarm/_shop-product-thumb.scss b/app/webpacker/css/darkswarm/_shop-product-thumb.scss similarity index 100% rename from app/assets/stylesheets/darkswarm/_shop-product-thumb.scss rename to app/webpacker/css/darkswarm/_shop-product-thumb.scss diff --git a/app/assets/stylesheets/darkswarm/account.scss b/app/webpacker/css/darkswarm/account.scss similarity index 100% rename from app/assets/stylesheets/darkswarm/account.scss rename to app/webpacker/css/darkswarm/account.scss diff --git a/app/assets/stylesheets/darkswarm/active_table.scss b/app/webpacker/css/darkswarm/active_table.scss similarity index 100% rename from app/assets/stylesheets/darkswarm/active_table.scss rename to app/webpacker/css/darkswarm/active_table.scss diff --git a/app/assets/stylesheets/darkswarm/active_table_search.scss b/app/webpacker/css/darkswarm/active_table_search.scss similarity index 100% rename from app/assets/stylesheets/darkswarm/active_table_search.scss rename to app/webpacker/css/darkswarm/active_table_search.scss diff --git a/app/assets/stylesheets/darkswarm/all.scss b/app/webpacker/css/darkswarm/all.scss similarity index 78% rename from app/assets/stylesheets/darkswarm/all.scss rename to app/webpacker/css/darkswarm/all.scss index aef5c4db7d..3b6316fadb 100644 --- a/app/assets/stylesheets/darkswarm/all.scss +++ b/app/webpacker/css/darkswarm/all.scss @@ -9,13 +9,13 @@ *= require_self */ @import 'variables'; -@import 'foundation'; -@import 'foundation-icons'; +//@import 'foundation'; +//@import 'foundation-icons'; -@import 'base/*'; -@import 'layout/*'; -@import '*'; -@import 'pages/*'; +@import 'base/colors'; +@import 'layout/offcanvas'; +//@import '*'; +@import 'pages/login_modal'; @import 'web/all'; ofn-modal { diff --git a/app/assets/stylesheets/darkswarm/angular.scss b/app/webpacker/css/darkswarm/angular.scss similarity index 100% rename from app/assets/stylesheets/darkswarm/angular.scss rename to app/webpacker/css/darkswarm/angular.scss diff --git a/app/assets/stylesheets/darkswarm/animations.scss b/app/webpacker/css/darkswarm/animations.scss similarity index 100% rename from app/assets/stylesheets/darkswarm/animations.scss rename to app/webpacker/css/darkswarm/animations.scss diff --git a/app/assets/stylesheets/darkswarm/base/colors.scss b/app/webpacker/css/darkswarm/base/colors.scss similarity index 94% rename from app/assets/stylesheets/darkswarm/base/colors.scss rename to app/webpacker/css/darkswarm/base/colors.scss index fddcbc9f6a..dfff9cb584 100644 --- a/app/assets/stylesheets/darkswarm/base/colors.scss +++ b/app/webpacker/css/darkswarm/base/colors.scss @@ -1,4 +1,4 @@ -@import 'darkswarm/branding'; +@import '../branding'; $modal-background-color: #efefef; $modal-content-background-color: #fff; diff --git a/app/assets/stylesheets/darkswarm/big-input.scss b/app/webpacker/css/darkswarm/big-input.scss similarity index 100% rename from app/assets/stylesheets/darkswarm/big-input.scss rename to app/webpacker/css/darkswarm/big-input.scss diff --git a/app/assets/stylesheets/darkswarm/branding.scss b/app/webpacker/css/darkswarm/branding.scss similarity index 100% rename from app/assets/stylesheets/darkswarm/branding.scss rename to app/webpacker/css/darkswarm/branding.scss diff --git a/app/assets/stylesheets/darkswarm/cart-dropdown.scss b/app/webpacker/css/darkswarm/cart-dropdown.scss similarity index 100% rename from app/assets/stylesheets/darkswarm/cart-dropdown.scss rename to app/webpacker/css/darkswarm/cart-dropdown.scss diff --git a/app/assets/stylesheets/darkswarm/cart-page.scss b/app/webpacker/css/darkswarm/cart-page.scss similarity index 100% rename from app/assets/stylesheets/darkswarm/cart-page.scss rename to app/webpacker/css/darkswarm/cart-page.scss diff --git a/app/assets/stylesheets/darkswarm/checkout.scss b/app/webpacker/css/darkswarm/checkout.scss similarity index 100% rename from app/assets/stylesheets/darkswarm/checkout.scss rename to app/webpacker/css/darkswarm/checkout.scss diff --git a/app/assets/stylesheets/darkswarm/collapsible.scss b/app/webpacker/css/darkswarm/collapsible.scss similarity index 100% rename from app/assets/stylesheets/darkswarm/collapsible.scss rename to app/webpacker/css/darkswarm/collapsible.scss diff --git a/app/webpacker/css/darkswarm/compass/css3/transition.scss b/app/webpacker/css/darkswarm/compass/css3/transition.scss new file mode 100644 index 0000000000..d0bf3c8302 --- /dev/null +++ b/app/webpacker/css/darkswarm/compass/css3/transition.scss @@ -0,0 +1,190 @@ +@import "compass/support"; + +// The the user threshold for transition support. Defaults to `$graceful-usage-threshold` +$transition-support-threshold: $graceful-usage-threshold !default; + + +// CSS Transitions +// Currently only works in Webkit. +// +// * expected in CSS3, FireFox 3.6/7 and Opera Presto 2.3 +// * We'll be prepared. +// +// Including this submodule sets following defaults for the mixins: +// +// $default-transition-property : all +// $default-transition-duration : 1s +// $default-transition-function : false +// $default-transition-delay : false +// +// Override them if you like. Timing-function and delay are set to false for browser defaults (ease, 0s). + +$default-transition-property: all !default; + +$default-transition-duration: 1s !default; + +$default-transition-function: null !default; + +$default-transition-delay: null !default; + +$transitionable-prefixed-values: transform, transform-origin !default; + + + +// Checks if the value given is a unit of time. +@function is-time($value) { + @return if(type-of($value) == number, not not index(s ms, unit($value)), false); +} + +// Returns `$property` with the given prefix if it is found in `$transitionable-prefixed-values`. +@function prefixed-for-transition($prefix, $property) { + @if not $prefix { + @return $property; + } + @if type-of($property) == list or type-of($property) == arglist { + $new-list: comma-list(); + @each $v in $property { + $new-list: append($new-list, prefixed-for-transition($prefix, $v)); + } + @return $new-list; + } @else { + @if index($transitionable-prefixed-values, $property) { + @return #{$prefix}-#{$property}; + } @else { + @return $property; + } + } +} + +// Returns $transition-map which includes key and values that map to a transition declaration +@function transition-map($transition) { + $transition-map: (); + + @each $item in $transition { + @if is-time($item) { + @if map-has-key($transition-map, duration) { + $transition-map: map-merge($transition-map, (delay: $item)); + } @else { + $transition-map: map-merge($transition-map, (duration: $item)); + } + } @else if map-has-key($transition-map, property) { + $transition-map: map-merge($transition-map, (timing-function: $item)); + } @else { + $transition-map: map-merge($transition-map, (property: $item)); + } + } + + @return $transition-map; +} + +// One or more properties to transition +// +// * for multiple, use a comma-delimited list +// * also accepts "all" or "none" + +@mixin transition-property($properties...) { + $properties: set-arglist-default($properties, $default-transition-property); + @include with-each-prefix(css-transitions, $transition-support-threshold) { + $props: if($current-prefix, prefixed-for-transition($current-prefix, $properties), $properties); + @include prefix-prop(transition-property, $props); + } +} + +// One or more durations in seconds +// +// * for multiple, use a comma-delimited list +// * these durations will affect the properties in the same list position + +@mixin transition-duration($durations...) { + $durations: set-arglist-default($durations, $default-transition-duration); + @include prefixed-properties(css-transitions, $transition-support-threshold, ( + transition-duration: $durations + )); +} + +// One or more timing functions +// +// * [ ease | linear | ease-in | ease-out | ease-in-out | cubic-bezier(x1, y1, x2, y2)] +// * For multiple, use a comma-delimited list +// * These functions will effect the properties in the same list position + +@mixin transition-timing-function($functions...) { + $functions: set-arglist-default($functions, $default-transition-function); + @include prefixed-properties(css-transitions, $transition-support-threshold, ( + transition-timing-function: $functions + )); +} + +// One or more transition-delays in seconds +// +// * for multiple, use a comma-delimited list +// * these delays will effect the properties in the same list position + +@mixin transition-delay($delays...) { + $delays: set-arglist-default($delays, $default-transition-delay); + @include prefixed-properties(css-transitions, $transition-support-threshold, ( + transition-delay: $delays + )); +} + +// Transition all-in-one shorthand + +@mixin single-transition( + $property: $default-transition-property, + $duration: $default-transition-duration, + $function: $default-transition-function, + $delay: $default-transition-delay +) { + @include transition(compact($property $duration $function $delay)); +} + +@mixin transition($transitions...) { + $default: (compact($default-transition-property $default-transition-duration $default-transition-function $default-transition-delay),); + $transitions: if(length($transitions) == 1 and type-of(nth($transitions, 1)) == list and list-separator(nth($transitions, 1)) == comma, nth($transitions, 1), $transitions); + $transitions: set-arglist-default($transitions, $default); + + + @include with-each-prefix(css-transitions, $transition-support-threshold) { + $delays: comma-list(); + $transitions-without-delays: comma-list(); + $transitions-with-delays: comma-list(); + $has-delays: false; + + + // This block can be made considerably simpler at the point in time that + // we no longer need to deal with the differences in how delays are treated. + @each $transition in $transitions { + // Declare initial values for transition + $transition: transition-map($transition); + + $property: map-get($transition, property); + $duration: map-get($transition, duration); + $timing-function: map-get($transition, timing-function); + $delay: map-get($transition, delay); + + // Parse transition string to assign values into correct variables + $has-delays: $has-delays or $delay; + + @if $current-prefix == -webkit { + // Keep a list of delays in case one is specified + $delays: append($delays, if($delay, $delay, 0s)); + $transitions-without-delays: append($transitions-without-delays, + prefixed-for-transition($current-prefix, $property) $duration $timing-function); + } @else { + $transitions-with-delays: append($transitions-with-delays, + prefixed-for-transition($current-prefix, $property) $duration $timing-function $delay); + } + } + + @if $current-prefix == -webkit { + @include prefix-prop(transition, $transitions-without-delays); + @if $has-delays { + @include prefix-prop(transition-delay, $delays); + } + } @else if $current-prefix { + @include prefix-prop(transition, $transitions-with-delays); + } @else { + transition: $transitions-with-delays; + } + } +} diff --git a/app/webpacker/css/darkswarm/compass/css3/user-interface.scss b/app/webpacker/css/darkswarm/compass/css3/user-interface.scss new file mode 100644 index 0000000000..53af4f025e --- /dev/null +++ b/app/webpacker/css/darkswarm/compass/css3/user-interface.scss @@ -0,0 +1,71 @@ +// User Interface +// This file can be expanded to handle all the user interface properties as +// they become available in browsers: +// http://www.w3.org/TR/2000/WD-css3-userint-20000216 + +@import "compass/support"; + +// The prefixed support threshold for user-select. +// Defaults to the $graceful-usage-threshold. +$userselect-support-threshold: $graceful-usage-threshold !default; + +// This property controls the selection model and granularity of an element. +// +// @param $select +// [ none | text | toggle | element | elements | all | inherit ] +@mixin user-select($select) { + $select: unquote($select); + + @include with-each-prefix(user-select-none, $userselect-support-threshold) { + // old Firefox used a proprietary `-moz-none` value, starting with Firefox 21 `none` behaves like `-moz-none` + // @link https://developer.mozilla.org/en-US/docs/Web/CSS/user-select + @include prefix-prop(user-select, if($current-prefix == -moz and $select == 'none', -moz-none, $select)); + } +} + +// The prefixed support threshold for input-placeholder. +// Defaults to the $graceful-usage-threshold. +$input-placeholder-support-threshold: $graceful-usage-threshold !default; + +// Style the html5 input placeholder in browsers that support it. +// +// The styles for the input placeholder are passed as mixin content +// and the selector comes from the mixin's context. +// +// For example: +// +// #{elements-of-type(text-input)} { +// @include input-placeholder { +// color: #bfbfbf; +// font-style: italic; +// } +// } +// +// if you want to apply the placeholder styles to all elements supporting +// the `input-placeholder` pseudo class (beware of performance impacts): +// +// * { +// @include input-placeholder { +// color: #bfbfbf; +// font-style: italic; +// } +// } +@mixin input-placeholder { + @include with-each-prefix(css-placeholder, $input-placeholder-support-threshold) { + @if $current-prefix == -webkit { + &::-webkit-input-placeholder { @content; } + } + @elseif $current-prefix == -moz { + // for Firefox 19 and below + @if support-legacy-browser("firefox", "4", "19", $threshold: $input-placeholder-support-threshold) { + &:-moz-placeholder { @content; } + } + // for Firefox 20 and above + &::-moz-placeholder { @content; } + } + @elseif $current-prefix == -ms { + &:-ms-input-placeholder { @content; } + } + } + // This is not standardized yet so no official selector is generated. +} diff --git a/app/webpacker/css/darkswarm/compass/support.scss b/app/webpacker/css/darkswarm/compass/support.scss new file mode 100644 index 0000000000..a0eacf2d6d --- /dev/null +++ b/app/webpacker/css/darkswarm/compass/support.scss @@ -0,0 +1,111 @@ + +// The browser usage threshold for features that gracefully degrade +// Defaults to 1 user in 1,000. +$graceful-usage-threshold: 0.1 !default; + +$debug-browser-support: false !default; + +// @private +$default-capability-options: ( + (full-support: 1), + (partial-support: 1) +); + +// Yields to the mixin content once for each prefix required. +// The current prefix is set to the $current-prefix global for use by the included content. +// Also yields to the content once with $current-prefix set to null for the official version +// as long as there's not already a prefix in scope. +@mixin with-each-prefix($capability, $threshold) { + @each $prefix, $should-use-prefix in prefixes-for-capability($capability, $threshold) { + @if $should-use-prefix { + @if $debug-browser-support and type-of($should-use-prefix) == list { + /* Capability #{$capability} is prefixed with #{$prefix} because #{$should-use-prefix} is required. */ + } @else if $debug-browser-support and type-of($should-use-prefix) == number { + /* Capability #{$capability} is prefixed with #{$prefix} because #{$should-use-prefix}% of users need it which is more than the threshold of #{$threshold}%. */ + } + @include with-prefix($prefix) { + @include with-browser-ranges($capability) { + @content; + } + } + } @else if $debug-browser-support { + /* Capability #{$capability} is not prefixed with #{$prefix} because #{prefix-usage($prefix, $capability, $capability-options)}% of users are affected which is less than the threshold of #{$threshold}. */ + } + } + @include with-prefix(null) { + @include with-browser-ranges($capability) { + @content; + } + } +} + +// If there's a prefix context in scope, this will only output the content if the prefix matches. +// Otherwise, sets the current prefix scope and outputs the content. +@mixin with-prefix($prefix) { + @if $current-prefix or $prefix-context { + @if $current-prefix == $prefix or $prefix-context == $prefix { + @if $debug-browser-support { + @if $prefix { + /* content for #{$prefix} because #{$current-prefix or $prefix-context} is already in scope. */ + } @else { + /* unprefixed content. #{$current-prefix or $prefix-context} is already in scope. */ + } + } + $old-prefix-context: $prefix-context; + $old-prefix: $current-prefix; + $prefix-context: $prefix-context or $current-prefix !global; + $current-prefix: $prefix !global; + @content; + $prefix-context: $old-prefix-context !global; + $current-prefix: $old-prefix !global; + } @else if $prefix == null { + $old-prefix-context: $prefix-context; + $prefix-context: $prefix-context or $current-prefix !global; + $current-prefix: null !global; + @if $debug-browser-support { + /* Content for official syntax. Prefix context is still #{$prefix-context}. */ + } + @content; + $current-prefix: $prefix-context !global; + $prefix-context: $old-prefix-context !global; + } @else if $debug-browser-support { + /* Omitting content for #{$prefix} because #{$current-prefix} is already in scope. */ + } + } @else { + @if $debug-browser-support and $prefix { + /* Creating new #{$prefix} context. */ + } + $prefix-context: $prefix !global; + $current-prefix: $prefix !global; + @content; + $current-prefix: null !global; + $prefix-context: null !global; + } +} + +// If passed a map, that will be the new browser ranges. +// Otherwise a range map will be created based on the given capability and prefix +// using the `browser-ranges($capability, $prefix)` function. +// +// If there are current ranges in scope and the new ranges have some overlap +// with the current, +// +// If there is no overlap, then the content will not be rendered. +@mixin with-browser-ranges($capability, $prefix: $current-prefix) { + $new-ranges: null; + @if type-of($capability) == map { + $new-ranges: $capability; + } @else { + $new-ranges: browser-ranges($capability, $prefix); + } + + @if has-browser-subset($current-browser-versions, $new-ranges) { + $old-ranges: $current-browser-versions; + $current-browser-versions: intersect-browser-ranges($old-ranges, $new-ranges) !global; + @content; + $current-browser-versions: $old-ranges !global; + } @else if $debug-browser-support { + /* Excluding content because #{inspect($new-ranges)} is not included within + #{inspect($current-browser-versions)} */ + } +} diff --git a/app/assets/stylesheets/darkswarm/distributor_header.scss b/app/webpacker/css/darkswarm/distributor_header.scss similarity index 100% rename from app/assets/stylesheets/darkswarm/distributor_header.scss rename to app/webpacker/css/darkswarm/distributor_header.scss diff --git a/app/assets/stylesheets/darkswarm/embedded_shopfront.scss b/app/webpacker/css/darkswarm/embedded_shopfront.scss similarity index 100% rename from app/assets/stylesheets/darkswarm/embedded_shopfront.scss rename to app/webpacker/css/darkswarm/embedded_shopfront.scss diff --git a/app/assets/stylesheets/darkswarm/expanding-sidebar.scss b/app/webpacker/css/darkswarm/expanding-sidebar.scss similarity index 100% rename from app/assets/stylesheets/darkswarm/expanding-sidebar.scss rename to app/webpacker/css/darkswarm/expanding-sidebar.scss diff --git a/app/assets/stylesheets/darkswarm/footer.scss b/app/webpacker/css/darkswarm/footer.scss similarity index 100% rename from app/assets/stylesheets/darkswarm/footer.scss rename to app/webpacker/css/darkswarm/footer.scss diff --git a/app/assets/stylesheets/darkswarm/forms.scss b/app/webpacker/css/darkswarm/forms.scss similarity index 100% rename from app/assets/stylesheets/darkswarm/forms.scss rename to app/webpacker/css/darkswarm/forms.scss diff --git a/app/assets/stylesheets/darkswarm/groups.scss b/app/webpacker/css/darkswarm/groups.scss similarity index 100% rename from app/assets/stylesheets/darkswarm/groups.scss rename to app/webpacker/css/darkswarm/groups.scss diff --git a/app/assets/stylesheets/darkswarm/help-modal.scss b/app/webpacker/css/darkswarm/help-modal.scss similarity index 100% rename from app/assets/stylesheets/darkswarm/help-modal.scss rename to app/webpacker/css/darkswarm/help-modal.scss diff --git a/app/assets/stylesheets/darkswarm/home_panes.scss b/app/webpacker/css/darkswarm/home_panes.scss similarity index 100% rename from app/assets/stylesheets/darkswarm/home_panes.scss rename to app/webpacker/css/darkswarm/home_panes.scss diff --git a/app/assets/stylesheets/darkswarm/home_tagline.scss b/app/webpacker/css/darkswarm/home_tagline.scss similarity index 100% rename from app/assets/stylesheets/darkswarm/home_tagline.scss rename to app/webpacker/css/darkswarm/home_tagline.scss diff --git a/app/assets/stylesheets/darkswarm/hub_node.scss b/app/webpacker/css/darkswarm/hub_node.scss similarity index 100% rename from app/assets/stylesheets/darkswarm/hub_node.scss rename to app/webpacker/css/darkswarm/hub_node.scss diff --git a/app/assets/stylesheets/darkswarm/hubs.scss b/app/webpacker/css/darkswarm/hubs.scss similarity index 100% rename from app/assets/stylesheets/darkswarm/hubs.scss rename to app/webpacker/css/darkswarm/hubs.scss diff --git a/app/assets/stylesheets/darkswarm/ie_warning.scss b/app/webpacker/css/darkswarm/ie_warning.scss similarity index 100% rename from app/assets/stylesheets/darkswarm/ie_warning.scss rename to app/webpacker/css/darkswarm/ie_warning.scss diff --git a/app/assets/stylesheets/darkswarm/images.scss b/app/webpacker/css/darkswarm/images.scss similarity index 100% rename from app/assets/stylesheets/darkswarm/images.scss rename to app/webpacker/css/darkswarm/images.scss diff --git a/app/assets/stylesheets/darkswarm/layout/offcanvas.scss b/app/webpacker/css/darkswarm/layout/offcanvas.scss similarity index 100% rename from app/assets/stylesheets/darkswarm/layout/offcanvas.scss rename to app/webpacker/css/darkswarm/layout/offcanvas.scss diff --git a/app/assets/stylesheets/darkswarm/lists.scss b/app/webpacker/css/darkswarm/lists.scss similarity index 100% rename from app/assets/stylesheets/darkswarm/lists.scss rename to app/webpacker/css/darkswarm/lists.scss diff --git a/app/assets/stylesheets/darkswarm/loading.scss b/app/webpacker/css/darkswarm/loading.scss similarity index 100% rename from app/assets/stylesheets/darkswarm/loading.scss rename to app/webpacker/css/darkswarm/loading.scss diff --git a/app/assets/stylesheets/darkswarm/map.scss b/app/webpacker/css/darkswarm/map.scss similarity index 100% rename from app/assets/stylesheets/darkswarm/map.scss rename to app/webpacker/css/darkswarm/map.scss diff --git a/app/assets/stylesheets/darkswarm/menu.scss b/app/webpacker/css/darkswarm/menu.scss similarity index 99% rename from app/assets/stylesheets/darkswarm/menu.scss rename to app/webpacker/css/darkswarm/menu.scss index f0c89ddc60..33e4485b9c 100644 --- a/app/assets/stylesheets/darkswarm/menu.scss +++ b/app/webpacker/css/darkswarm/menu.scss @@ -1,4 +1,4 @@ -@import 'compass'; +//@import 'compass'; @import 'branding'; @import 'mixins'; @import 'typography'; diff --git a/app/assets/stylesheets/darkswarm/mixins.scss b/app/webpacker/css/darkswarm/mixins.scss similarity index 100% rename from app/assets/stylesheets/darkswarm/mixins.scss rename to app/webpacker/css/darkswarm/mixins.scss diff --git a/app/assets/stylesheets/darkswarm/modal-enterprises.scss b/app/webpacker/css/darkswarm/modal-enterprises.scss similarity index 100% rename from app/assets/stylesheets/darkswarm/modal-enterprises.scss rename to app/webpacker/css/darkswarm/modal-enterprises.scss diff --git a/app/assets/stylesheets/darkswarm/modals.scss b/app/webpacker/css/darkswarm/modals.scss similarity index 100% rename from app/assets/stylesheets/darkswarm/modals.scss rename to app/webpacker/css/darkswarm/modals.scss diff --git a/app/assets/stylesheets/darkswarm/overrides.scss b/app/webpacker/css/darkswarm/overrides.scss similarity index 100% rename from app/assets/stylesheets/darkswarm/overrides.scss rename to app/webpacker/css/darkswarm/overrides.scss diff --git a/app/assets/stylesheets/darkswarm/page_alert.scss b/app/webpacker/css/darkswarm/page_alert.scss similarity index 100% rename from app/assets/stylesheets/darkswarm/page_alert.scss rename to app/webpacker/css/darkswarm/page_alert.scss diff --git a/app/assets/stylesheets/darkswarm/pages/login_modal.scss b/app/webpacker/css/darkswarm/pages/login_modal.scss similarity index 100% rename from app/assets/stylesheets/darkswarm/pages/login_modal.scss rename to app/webpacker/css/darkswarm/pages/login_modal.scss diff --git a/app/assets/stylesheets/darkswarm/producer_node.scss b/app/webpacker/css/darkswarm/producer_node.scss similarity index 100% rename from app/assets/stylesheets/darkswarm/producer_node.scss rename to app/webpacker/css/darkswarm/producer_node.scss diff --git a/app/assets/stylesheets/darkswarm/producers.scss b/app/webpacker/css/darkswarm/producers.scss similarity index 100% rename from app/assets/stylesheets/darkswarm/producers.scss rename to app/webpacker/css/darkswarm/producers.scss diff --git a/app/assets/stylesheets/darkswarm/product_table.scss b/app/webpacker/css/darkswarm/product_table.scss similarity index 100% rename from app/assets/stylesheets/darkswarm/product_table.scss rename to app/webpacker/css/darkswarm/product_table.scss diff --git a/app/assets/stylesheets/darkswarm/registration.scss b/app/webpacker/css/darkswarm/registration.scss similarity index 100% rename from app/assets/stylesheets/darkswarm/registration.scss rename to app/webpacker/css/darkswarm/registration.scss diff --git a/app/assets/stylesheets/darkswarm/shop.scss b/app/webpacker/css/darkswarm/shop.scss similarity index 100% rename from app/assets/stylesheets/darkswarm/shop.scss rename to app/webpacker/css/darkswarm/shop.scss diff --git a/app/assets/stylesheets/darkswarm/shop_search.scss b/app/webpacker/css/darkswarm/shop_search.scss similarity index 100% rename from app/assets/stylesheets/darkswarm/shop_search.scss rename to app/webpacker/css/darkswarm/shop_search.scss diff --git a/app/assets/stylesheets/darkswarm/shop_tabs.scss b/app/webpacker/css/darkswarm/shop_tabs.scss similarity index 100% rename from app/assets/stylesheets/darkswarm/shop_tabs.scss rename to app/webpacker/css/darkswarm/shop_tabs.scss diff --git a/app/assets/stylesheets/darkswarm/sidebar.scss b/app/webpacker/css/darkswarm/sidebar.scss similarity index 80% rename from app/assets/stylesheets/darkswarm/sidebar.scss rename to app/webpacker/css/darkswarm/sidebar.scss index 2e6a7d0a2e..587bb8bc14 100644 --- a/app/assets/stylesheets/darkswarm/sidebar.scss +++ b/app/webpacker/css/darkswarm/sidebar.scss @@ -3,9 +3,9 @@ // See https://github.com/zurb/foundation/issues/3855#issuecomment-30372252 @import "variables"; -@import "foundation/components/global"; -@import "foundation/components/buttons"; -@import "foundation/components/panels"; +//@import "foundation/components/global"; +//@import "foundation/components/buttons"; +//@import "foundation/components/panels"; #sidebar { margin-top: 1.875em; diff --git a/app/assets/stylesheets/darkswarm/signup.scss b/app/webpacker/css/darkswarm/signup.scss similarity index 100% rename from app/assets/stylesheets/darkswarm/signup.scss rename to app/webpacker/css/darkswarm/signup.scss diff --git a/app/assets/stylesheets/darkswarm/stripe-elements.scss b/app/webpacker/css/darkswarm/stripe-elements.scss similarity index 100% rename from app/assets/stylesheets/darkswarm/stripe-elements.scss rename to app/webpacker/css/darkswarm/stripe-elements.scss diff --git a/app/assets/stylesheets/darkswarm/style.scss b/app/webpacker/css/darkswarm/style.scss similarity index 100% rename from app/assets/stylesheets/darkswarm/style.scss rename to app/webpacker/css/darkswarm/style.scss diff --git a/app/assets/stylesheets/darkswarm/tables.scss b/app/webpacker/css/darkswarm/tables.scss similarity index 100% rename from app/assets/stylesheets/darkswarm/tables.scss rename to app/webpacker/css/darkswarm/tables.scss diff --git a/app/assets/stylesheets/darkswarm/tabset.scss b/app/webpacker/css/darkswarm/tabset.scss similarity index 100% rename from app/assets/stylesheets/darkswarm/tabset.scss rename to app/webpacker/css/darkswarm/tabset.scss diff --git a/app/assets/stylesheets/darkswarm/taxons.scss b/app/webpacker/css/darkswarm/taxons.scss similarity index 100% rename from app/assets/stylesheets/darkswarm/taxons.scss rename to app/webpacker/css/darkswarm/taxons.scss diff --git a/app/assets/stylesheets/darkswarm/typography.scss b/app/webpacker/css/darkswarm/typography.scss similarity index 100% rename from app/assets/stylesheets/darkswarm/typography.scss rename to app/webpacker/css/darkswarm/typography.scss diff --git a/app/assets/stylesheets/darkswarm/ui.scss b/app/webpacker/css/darkswarm/ui.scss similarity index 98% rename from app/assets/stylesheets/darkswarm/ui.scss rename to app/webpacker/css/darkswarm/ui.scss index b2177013cc..ce516b58c4 100644 --- a/app/assets/stylesheets/darkswarm/ui.scss +++ b/app/webpacker/css/darkswarm/ui.scss @@ -1,4 +1,4 @@ -@import "foundation/components/buttons"; +//@import "foundation/components/buttons"; @import "branding"; @import "mixins"; @import "typography"; diff --git a/app/assets/stylesheets/darkswarm/variables.scss b/app/webpacker/css/darkswarm/variables.scss similarity index 91% rename from app/assets/stylesheets/darkswarm/variables.scss rename to app/webpacker/css/darkswarm/variables.scss index 2a799ed935..aff23bdc85 100644 --- a/app/assets/stylesheets/darkswarm/variables.scss +++ b/app/webpacker/css/darkswarm/variables.scss @@ -1,5 +1,6 @@ -@import "foundation/functions"; -@import "foundation/components/global"; +//@import "foundation/functions"; +//@import "foundation/components/global"; +@import "branding"; // Brand guide colours: // International: #81c26e diff --git a/app/assets/stylesheets/mail/all.css b/app/webpacker/css/mail/all.css similarity index 100% rename from app/assets/stylesheets/mail/all.css rename to app/webpacker/css/mail/all.css diff --git a/app/assets/stylesheets/mail/email.scss b/app/webpacker/css/mail/email.scss similarity index 100% rename from app/assets/stylesheets/mail/email.scss rename to app/webpacker/css/mail/email.scss diff --git a/app/assets/stylesheets/mail/payments_list.scss b/app/webpacker/css/mail/payments_list.scss similarity index 100% rename from app/assets/stylesheets/mail/payments_list.scss rename to app/webpacker/css/mail/payments_list.scss diff --git a/app/assets/stylesheets/shared/ng-tags-input.min.css b/app/webpacker/css/shared/ng-tags-input.min.css similarity index 100% rename from app/assets/stylesheets/shared/ng-tags-input.min.css rename to app/webpacker/css/shared/ng-tags-input.min.css diff --git a/app/assets/stylesheets/shared/question-mark-icon.scss b/app/webpacker/css/shared/question-mark-icon.scss similarity index 100% rename from app/assets/stylesheets/shared/question-mark-icon.scss rename to app/webpacker/css/shared/question-mark-icon.scss diff --git a/app/assets/stylesheets/shared/textAngular.css b/app/webpacker/css/shared/textAngular.css similarity index 100% rename from app/assets/stylesheets/shared/textAngular.css rename to app/webpacker/css/shared/textAngular.css diff --git a/app/assets/stylesheets/shared/variables/_layout.scss b/app/webpacker/css/shared/variables/_layout.scss similarity index 100% rename from app/assets/stylesheets/shared/variables/_layout.scss rename to app/webpacker/css/shared/variables/_layout.scss diff --git a/app/assets/stylesheets/shared/variables/variables.scss b/app/webpacker/css/shared/variables/variables.scss similarity index 100% rename from app/assets/stylesheets/shared/variables/variables.scss rename to app/webpacker/css/shared/variables/variables.scss diff --git a/app/webpacker/fonts/FontAwesome.otf b/app/webpacker/fonts/FontAwesome.otf new file mode 100644 index 0000000000..70125459f7 Binary files /dev/null and b/app/webpacker/fonts/FontAwesome.otf differ diff --git a/app/webpacker/fonts/OFN-v2.eot b/app/webpacker/fonts/OFN-v2.eot new file mode 100644 index 0000000000..81a9ae07b0 Binary files /dev/null and b/app/webpacker/fonts/OFN-v2.eot differ diff --git a/app/webpacker/fonts/OFN-v2.svg b/app/webpacker/fonts/OFN-v2.svg new file mode 100644 index 0000000000..956c951a2c --- /dev/null +++ b/app/webpacker/fonts/OFN-v2.svg @@ -0,0 +1,81 @@ + + + +Generated by IcoMoon + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/webpacker/fonts/OFN-v2.ttf b/app/webpacker/fonts/OFN-v2.ttf new file mode 100644 index 0000000000..05ba6831e2 Binary files /dev/null and b/app/webpacker/fonts/OFN-v2.ttf differ diff --git a/app/webpacker/fonts/OFN-v2.woff b/app/webpacker/fonts/OFN-v2.woff new file mode 100644 index 0000000000..d19723458d Binary files /dev/null and b/app/webpacker/fonts/OFN-v2.woff differ diff --git a/app/webpacker/fonts/fontawesome-webfont.eot b/app/webpacker/fonts/fontawesome-webfont.eot new file mode 100755 index 0000000000..0662cb96bf Binary files /dev/null and b/app/webpacker/fonts/fontawesome-webfont.eot differ diff --git a/app/webpacker/fonts/fontawesome-webfont.svg b/app/webpacker/fonts/fontawesome-webfont.svg new file mode 100755 index 0000000000..2edb4ec34c --- /dev/null +++ b/app/webpacker/fonts/fontawesome-webfont.svg @@ -0,0 +1,399 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/webpacker/fonts/fontawesome-webfont.ttf b/app/webpacker/fonts/fontawesome-webfont.ttf new file mode 100755 index 0000000000..d365924691 Binary files /dev/null and b/app/webpacker/fonts/fontawesome-webfont.ttf differ diff --git a/app/webpacker/fonts/fontawesome-webfont.woff b/app/webpacker/fonts/fontawesome-webfont.woff new file mode 100755 index 0000000000..b9bd17e158 Binary files /dev/null and b/app/webpacker/fonts/fontawesome-webfont.woff differ diff --git a/app/webpacker/packs/darkswarm.scss b/app/webpacker/packs/darkswarm.scss new file mode 100644 index 0000000000..b8653671ec --- /dev/null +++ b/app/webpacker/packs/darkswarm.scss @@ -0,0 +1 @@ +@import "../css/darkswarm/all.scss"; diff --git a/config/webpacker.yml b/config/webpacker.yml index dccab3e4ab..c2f655cce2 100644 --- a/config/webpacker.yml +++ b/config/webpacker.yml @@ -10,13 +10,17 @@ default: &default # Additional paths webpack should lookup modules # ['app/assets', 'engine/foo/app/assets'] - additional_paths: [] + additional_paths: [ + 'vendor', + 'app/webpacker/css', + 'engines/web/app/assets/stylesheets' + ] # Reload manifest.json on all requests so we reload latest compiled packs cache_manifest: false # Extract and emit a css file - extract_css: false + extract_css: true static_assets_extensions: - .jpg