From b37f7dbdd536baaef8e7a30a1dd0defde4473c4e Mon Sep 17 00:00:00 2001 From: angusmcleod Date: Tue, 14 Dec 2021 09:11:23 +0800 Subject: [PATCH] DEV: preview template style improvements --- .../templates/components/wizard-custom-field.hbs | 4 ++-- assets/stylesheets/common/wizard-admin.scss | 4 ++++ assets/stylesheets/wizard/custom/composer.scss | 9 ++++----- config/locales/client.en.yml | 2 +- 4 files changed, 11 insertions(+), 8 deletions(-) diff --git a/assets/javascripts/discourse/templates/components/wizard-custom-field.hbs b/assets/javascripts/discourse/templates/components/wizard-custom-field.hbs index 3b63cef7..27ea19ee 100644 --- a/assets/javascripts/discourse/templates/components/wizard-custom-field.hbs +++ b/assets/javascripts/discourse/templates/components/wizard-custom-field.hbs @@ -127,13 +127,13 @@ {{/if}} {{#if isComposerPreview}} -
+
- {{textarea name="preview-template" value=field.preview_template}} + {{textarea name="preview-template" value=field.preview_template class="preview-template"}}
{{/if}} diff --git a/assets/stylesheets/common/wizard-admin.scss b/assets/stylesheets/common/wizard-admin.scss index 66cc6b43..acc6f112 100644 --- a/assets/stylesheets/common/wizard-admin.scss +++ b/assets/stylesheets/common/wizard-admin.scss @@ -317,6 +317,10 @@ font-size: 1em; } } + + .preview-template { + min-height: 150px; + } } &.full, diff --git a/assets/stylesheets/wizard/custom/composer.scss b/assets/stylesheets/wizard/custom/composer.scss index 24cad2a4..be866b8a 100644 --- a/assets/stylesheets/wizard/custom/composer.scss +++ b/assets/stylesheets/wizard/custom/composer.scss @@ -72,6 +72,10 @@ display: flex; flex-direction: column; margin-left: 0; + overflow: auto; + cursor: default; + margin-top: unset; + padding-top: unset; } .d-editor-button-bar { @@ -107,11 +111,6 @@ display: inline-block; } -.d-editor-preview-wrapper { - overflow: auto; - cursor: default; -} - .d-editor-input, .d-editor-preview { box-sizing: border-box; diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml index 40e103c8..ff500ee2 100644 --- a/config/locales/client.en.yml +++ b/config/locales/client.en.yml @@ -183,7 +183,7 @@ en: char_counter_placeholder: "Display Character Counter" field_placeholder: "Field Placeholder" file_types: "File Types" - preview_template: "Preview Template" + preview_template: "Template" limit: "Limit" property: "Property" prefill: "Prefill"