Skip to content

A platform for community discussion. Free, open, simple.

UX: minor tweak to support tab (#38475)

Joffrey JAFFEUX50598a3060ba
diff --git a/app/assets/stylesheets/common/form-kit/_section.scss b/app/assets/stylesheets/common/form-kit/_section.scss
index 19703f9f69c..c6e73808e0d 100644
--- a/app/assets/stylesheets/common/form-kit/_section.scss
+++ b/app/assets/stylesheets/common/form-kit/_section.scss
@@ -29,7 +29,7 @@
}
.form-kit__section.emphasis {
- border: 2px solid var(--tertiary);
+ border: 2px solid var(--content-border-color);
border-radius: var(--d-border-radius);
padding: 1em;
box-sizing: border-box;
diff --git a/frontend/discourse/admin/controllers/edit-category/tabs.js b/frontend/discourse/admin/controllers/edit-category/tabs.js
index 1740b13f904..835fa4c53f1 100644
--- a/frontend/discourse/admin/controllers/edit-category/tabs.js
+++ b/frontend/discourse/admin/controllers/edit-category/tabs.js
@@ -338,6 +338,10 @@ export default class EditCategoryTabsController extends Controller {
@action
deleteCategory() {
+ if (this.deleteDisabled) {
+ return;
+ }
+
this.set("deleting", true);
this.dialog.deleteConfirm({
title: i18n("category.delete_confirm"),
@@ -360,6 +364,10 @@ export default class EditCategoryTabsController extends Controller {
@action
toggleDeleteTooltip() {
+ if (this.deleteDisabled) {
+ return;
+ }
+
this.toggleProperty("showTooltip");
}
diff --git a/frontend/discourse/admin/templates/edit-category/tabs.gjs b/frontend/discourse/admin/templates/edit-category/tabs.gjs
index 82f4d13ce97..24c158efdf1 100644
--- a/frontend/discourse/admin/templates/edit-category/tabs.gjs
+++ b/frontend/discourse/admin/templates/edit-category/tabs.gjs
@@ -128,19 +128,17 @@ export default <template>
<form.Actions class="edit-category-footer">
{{#if @controller.model.can_delete}}
<form.Button
- @disabled={{@controller.deleteDisabled}}
@action={{@controller.deleteCategory}}
@icon="trash-can"
@label="category.delete"
- class="btn-danger"
+ class="btn-danger btn-small"
/>
{{else}}
<form.Button
- @disabled={{@controller.deleteDisabled}}
@action={{@controller.toggleDeleteTooltip}}
@icon="circle-question"
@label="category.delete"
- class="btn-default"
+ class="btn-default btn-small"
/>
{{/if}}
</form.Actions>
diff --git a/frontend/discourse/app/components/edit-category-type-schema-fields.gjs b/frontend/discourse/app/components/edit-category-type-schema-fields.gjs
index 368ce592c3e..e5ce3b13ebc 100644
--- a/frontend/discourse/app/components/edit-category-type-schema-fields.gjs
+++ b/frontend/discourse/app/components/edit-category-type-schema-fields.gjs
@@ -91,7 +91,6 @@ export default class EditCategoryTypeSchemaFields extends Component {
</@form.Section>
<@form.Emphasis
- @type="info"
@title={{i18n "category.type_settings_schema.site_settings"}}
@subtitle={{i18n "category.settings_apply_to_all_of_type_warning"}}
>
diff --git a/frontend/discourse/app/form-kit/components/fk/emphasis.gjs b/frontend/discourse/app/form-kit/components/fk/emphasis.gjs
index b710f32aa3a..481c41e5581 100644
--- a/frontend/discourse/app/form-kit/components/fk/emphasis.gjs
+++ b/frontend/discourse/app/form-kit/components/fk/emphasis.gjs
@@ -5,7 +5,7 @@ import { or } from "discourse/truth-helpers/index";
export default class FKEmphasis extends Component {
get type() {
- return this.args.type || "info";
+ return this.args.type || "default";
}
<template>
@@ -13,7 +13,7 @@ export default class FKEmphasis extends Component {
class={{concatClass
"form-kit__section"
"emphasis"
- (concat "emphasis-" this.type)
+ (if this.type (concat "emphasis-" this.type))
@class
}}
...attributes