1
0
Fork 0

Various rebase fixes

Dieser Commit ist enthalten in:
Angus McLeod 2022-08-01 18:07:16 +01:00
Ursprung 1175cbab96
Commit d4da391a4d
23 geänderte Dateien mit 20 neuen und 65 gelöschten Zeilen

Datei anzeigen

@ -1,17 +0,0 @@
//= require env
//= require jquery.debug
//= require ember.debug
//= require route-recognizer
//= require fake_xml_http_request
//= require pretender
//= require qunit
//= require ember-qunit
//= require test-shims
//= require ember-template-compiler
//= require_tree ./wizard/tests/fixtures
//= require ./wizard/tests/pretender
//= require_tree ./wizard/tests/helpers
//= require_tree ./wizard/tests/acceptance
//= require ./wizard/tests/bootstrap

Datei anzeigen

@ -1,14 +0,0 @@
@import "custom/base";
@import "custom/wizard";
@import "custom/header";
@import "custom/step";
@import "custom/badges";
@import "custom/buttons";
@import "custom/field";
@import "custom/validators";
@import "custom/mobile";
@import "custom/autocomplete";
@import "custom/composer";
@import "custom/events";
@import "custom/locations";
@import "custom/mentionables";

Datei anzeigen

@ -1,8 +1,8 @@
@import "wizard/mapper"; @import "admin/mapper";
@import "wizard/manager"; @import "admin/manager";
@import "wizard/api"; @import "admin/api";
@import "common/components/buttons"; @import "common/components/buttons";
@import "wizard/variables"; @import "admin/variables";
$expired: #339b18; $expired: #339b18;
$info: #038ae7; $info: #038ae7;

Datei anzeigen

@ -0,0 +1,14 @@
@import "wizard/base";
@import "wizard/wizard";
@import "wizard/header";
@import "wizard/step";
@import "wizard/badges";
@import "wizard/buttons";
@import "wizard/field";
@import "wizard/validators";
@import "wizard/mobile";
@import "wizard/autocomplete";
@import "wizard/composer";
@import "wizard/events";
@import "wizard/locations";
@import "wizard/mentionables";

Datei anzeigen

@ -8,39 +8,11 @@
# subscription_url: https://coop.pavilion.tech # subscription_url: https://coop.pavilion.tech
gem 'liquid', '5.0.1', require: true gem 'liquid', '5.0.1', require: true
register_asset 'stylesheets/common/wizard-admin.scss' register_asset 'stylesheets/common/admin.scss'
register_asset 'stylesheets/common/wizard-mapper.scss' register_asset 'stylesheets/common/wizard.scss'
register_asset 'stylesheets/common/wizard-custom.scss'
enabled_site_setting :custom_wizard_enabled enabled_site_setting :custom_wizard_enabled
if Rails.env.production?
Rails.application.config.assets.precompile += %w{
wizard-custom-guest.js
wizard-custom-start.js
wizard-custom.js
wizard-plugin.js.erb
wizard-raw-templates.js.erb
}
end
config = Rails.application.config
plugin_asset_path = "#{Rails.root}/plugins/discourse-custom-wizard/assets"
config.assets.paths << "#{plugin_asset_path}/javascripts"
config.assets.paths << "#{plugin_asset_path}/stylesheets/wizard"
if Rails.env.production?
config.assets.precompile += %w{
ember_jquery.js
wizard-custom-guest.js
wizard-custom-start.js
wizard-custom.js
wizard-plugin.js.erb
wizard-raw-templates.js.erb
wizard-vendor.js
}
end
if respond_to?(:register_svg_icon) if respond_to?(:register_svg_icon)
register_svg_icon "far-calendar" register_svg_icon "far-calendar"
register_svg_icon "chevron-right" register_svg_icon "chevron-right"