From 99f5670c30f64bee59d4cbc5bd9fed5932e16c4e Mon Sep 17 00:00:00 2001 From: Gary Pendergast Date: Thu, 16 Jan 2025 09:44:43 +1100 Subject: [PATCH] UX: Tweak plugin and customize-based admin page margins (#30808) Admin pages that are based off the customize or plugin templates were wrapped in the `admin-container` class, which has slightly different margins to the `admin-config-page` class, which is used on most admin pages. This change ensures that all the admin pages have the same alignment. --- app/assets/javascripts/admin/addon/templates/customize.hbs | 2 +- app/assets/javascripts/admin/addon/templates/plugins.hbs | 2 +- .../discourse/tests/acceptance/admin-plugins-test.js | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/assets/javascripts/admin/addon/templates/customize.hbs b/app/assets/javascripts/admin/addon/templates/customize.hbs index 3967aa7995b..d10e5b7de2a 100644 --- a/app/assets/javascripts/admin/addon/templates/customize.hbs +++ b/app/assets/javascripts/admin/addon/templates/customize.hbs @@ -58,6 +58,6 @@ {{/unless}} -
+
{{outlet}}
\ No newline at end of file diff --git a/app/assets/javascripts/admin/addon/templates/plugins.hbs b/app/assets/javascripts/admin/addon/templates/plugins.hbs index a878db38063..fc205c09097 100644 --- a/app/assets/javascripts/admin/addon/templates/plugins.hbs +++ b/app/assets/javascripts/admin/addon/templates/plugins.hbs @@ -32,7 +32,7 @@
{{/if}} -
+
{{#each this.brokenAdminRoutes as |route|}}
{{i18n "admin.plugins.broken_route" name=(i18n route.label)}} diff --git a/app/assets/javascripts/discourse/tests/acceptance/admin-plugins-test.js b/app/assets/javascripts/discourse/tests/acceptance/admin-plugins-test.js index 6561b387a07..cfda767bc9e 100644 --- a/app/assets/javascripts/discourse/tests/acceptance/admin-plugins-test.js +++ b/app/assets/javascripts/discourse/tests/acceptance/admin-plugins-test.js @@ -47,7 +47,7 @@ acceptance("Admin - Plugins", function (needs) { .hasText("Some Test Plugin", "displays the plugin in the table"); assert - .dom(".admin-plugins .admin-container .alert-error") + .dom(".admin-plugins .admin-config-page .alert-error") .exists("shows an error for unknown routes"); assert