From 7f15e2a657026b86dd27c1ff8f8ce9ac6ea51e0c Mon Sep 17 00:00:00 2001 From: Angus McLeod Date: Mon, 6 Nov 2017 17:06:53 +0800 Subject: [PATCH] Minor tweaks --- assets/javascripts/wizard/initializers/custom.js.es6 | 2 +- assets/stylesheets/wizard/wizard_custom.scss | 11 +++++++++++ lib/wizard_edits.rb | 2 +- 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/assets/javascripts/wizard/initializers/custom.js.es6 b/assets/javascripts/wizard/initializers/custom.js.es6 index 6263f8b0..f7770e18 100644 --- a/assets/javascripts/wizard/initializers/custom.js.es6 +++ b/assets/javascripts/wizard/initializers/custom.js.es6 @@ -42,7 +42,7 @@ export default { const src = this.get('step.banner'); if (!src) return; - if (src.indexOf('/uploads/') > -1 || src.indexOf('/images/') > -1) { + if (src.indexOf('/uploads/') > -1 || src.indexOf('/plugins/') > -1) { return getUrl(src); } else { return getUrl(`/images/wizard/${src}`); diff --git a/assets/stylesheets/wizard/wizard_custom.scss b/assets/stylesheets/wizard/wizard_custom.scss index c3203769..e79ddf89 100644 --- a/assets/stylesheets/wizard/wizard_custom.scss +++ b/assets/stylesheets/wizard/wizard_custom.scss @@ -13,11 +13,22 @@ i { margin-right: 7px; } + + img.large { + width: 250; + padding: 25px;; + } + + img.small { + width: 120; + padding: 10px; + } } .wizard-column .wizard-step-banner { width: initial; max-width: 660px; + max-height: 300px; } .control-group { diff --git a/lib/wizard_edits.rb b/lib/wizard_edits.rb index a716c4ae..7b327b92 100644 --- a/lib/wizard_edits.rb +++ b/lib/wizard_edits.rb @@ -97,7 +97,7 @@ end def description return object.description if object.description - I18n.t("#{object.key || i18n_key}.description", default: '') + I18n.t("#{object.key || i18n_key}.description", default: '', base_url: Discourse.base_url) end end