From 4436d82c36852b9d2693007e6ef52e55b496dcd5 Mon Sep 17 00:00:00 2001 From: Alexander Skvortsov Date: Fri, 14 May 2021 21:36:06 -0400 Subject: [PATCH] Fix CustomFooterModal Appearance The textarea in the CustomFooterModal was much larger than in the other appearance page modals, and did not use a monospaced font. Turns out the other 2 were explicitly specified in the less. This commit adds a class that can be applied to all these modals for simpler maintenance. Fixes https://github.com/flarum/core/issues/2865 --- framework/core/js/src/admin/components/EditCustomCssModal.js | 2 +- framework/core/js/src/admin/components/EditCustomFooterModal.js | 2 +- framework/core/js/src/admin/components/EditCustomHeaderModal.js | 2 +- framework/core/less/admin/AppearancePage.less | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/framework/core/js/src/admin/components/EditCustomCssModal.js b/framework/core/js/src/admin/components/EditCustomCssModal.js index c7686b085..bd855d545 100644 --- a/framework/core/js/src/admin/components/EditCustomCssModal.js +++ b/framework/core/js/src/admin/components/EditCustomCssModal.js @@ -2,7 +2,7 @@ import SettingsModal from './SettingsModal'; export default class EditCustomCssModal extends SettingsModal { className() { - return 'EditCustomCssModal Modal--large'; + return 'EditCustomCssModal TextareaCodeModal Modal--large'; } title() { diff --git a/framework/core/js/src/admin/components/EditCustomFooterModal.js b/framework/core/js/src/admin/components/EditCustomFooterModal.js index 88d97535e..43cfd29d4 100644 --- a/framework/core/js/src/admin/components/EditCustomFooterModal.js +++ b/framework/core/js/src/admin/components/EditCustomFooterModal.js @@ -2,7 +2,7 @@ import SettingsModal from './SettingsModal'; export default class EditCustomFooterModal extends SettingsModal { className() { - return 'EditCustomFooterModal Modal--large'; + return 'EditCustomFooterModal TextareaCodeModal Modal--large'; } title() { diff --git a/framework/core/js/src/admin/components/EditCustomHeaderModal.js b/framework/core/js/src/admin/components/EditCustomHeaderModal.js index 24625cbd7..11a1f8d4e 100644 --- a/framework/core/js/src/admin/components/EditCustomHeaderModal.js +++ b/framework/core/js/src/admin/components/EditCustomHeaderModal.js @@ -2,7 +2,7 @@ import SettingsModal from './SettingsModal'; export default class EditCustomHeaderModal extends SettingsModal { className() { - return 'EditCustomHeaderModal Modal--large'; + return 'EditCustomHeaderModal TextareaCodeModal Modal--large'; } title() { diff --git a/framework/core/less/admin/AppearancePage.less b/framework/core/less/admin/AppearancePage.less index 18b5a46e7..0e7ba3471 100644 --- a/framework/core/less/admin/AppearancePage.less +++ b/framework/core/less/admin/AppearancePage.less @@ -37,7 +37,7 @@ margin-bottom: 15px; } -.EditCustomCssModal, .EditCustomHeaderModal { +.TextareaCodeModal { textarea { font-family: monospace; line-height: 1;