Skip to content

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

UI: minor form-kit tweaks (#38477)

Joffrey JAFFEUX4ba1e4978206
diff --git a/app/assets/stylesheets/common/base/uc-simplified-category-setup-edit-categories.scss b/app/assets/stylesheets/common/base/uc-simplified-category-setup-edit-categories.scss
index ea6d2d73863..2d074f1dc78 100644
--- a/app/assets/stylesheets/common/base/uc-simplified-category-setup-edit-categories.scss
+++ b/app/assets/stylesheets/common/base/uc-simplified-category-setup-edit-categories.scss
@@ -147,6 +147,10 @@
.edit-category-content {
grid-area: unset;
}
+
+ .edit-category-type-schema-fields {
+ display: contents;
+ }
}
.edit-category-title-text {
diff --git a/app/assets/stylesheets/common/form-kit/_control-checkbox.scss b/app/assets/stylesheets/common/form-kit/_control-checkbox.scss
index 4755c3d4c57..3b32c7b2a5f 100644
--- a/app/assets/stylesheets/common/form-kit/_control-checkbox.scss
+++ b/app/assets/stylesheets/common/form-kit/_control-checkbox.scss
@@ -28,5 +28,9 @@
&__control-checkbox-description {
color: var(--primary-medium);
+
+ &:empty {
+ display: none;
+ }
}
}
diff --git a/app/assets/stylesheets/common/form-kit/_fieldset.scss b/app/assets/stylesheets/common/form-kit/_fieldset.scss
index 0cf0d4d2044..6e0eb80a1cd 100644
--- a/app/assets/stylesheets/common/form-kit/_fieldset.scss
+++ b/app/assets/stylesheets/common/form-kit/_fieldset.scss
@@ -10,7 +10,7 @@
align-items: center;
margin: 0 0 0.25rem;
font-size: var(--font-down-1-rem);
- color: var(--primary-high);
+ color: var(--primary);
}
&__fieldset-description {
diff --git a/app/assets/stylesheets/common/form-kit/_section.scss b/app/assets/stylesheets/common/form-kit/_section.scss
index c6e73808e0d..e8fdaef446e 100644
--- a/app/assets/stylesheets/common/form-kit/_section.scss
+++ b/app/assets/stylesheets/common/form-kit/_section.scss
@@ -1,9 +1,8 @@
.form-kit__section {
display: flex;
flex-direction: column;
- gap: 1rem;
+ gap: 1.5rem;
width: 100%;
- padding-bottom: 1.5rem;
&.form-kit__actions {
align-items: center;
diff --git a/frontend/discourse/app/form-kit/components/fk/control/checkbox.gjs b/frontend/discourse/app/form-kit/components/fk/control/checkbox.gjs
index 98cc72a4903..ab599c4cd71 100644
--- a/frontend/discourse/app/form-kit/components/fk/control/checkbox.gjs
+++ b/frontend/discourse/app/form-kit/components/fk/control/checkbox.gjs
@@ -37,9 +37,7 @@ export default class FKControlCheckbox extends FKBaseControl {
{{/if}}
<FKTooltip @field={{@field}} />
</span>
- {{#if (has-block)}}
- <span class="form-kit__control-checkbox-description">{{yield}}</span>
- {{/if}}
+ <span class="form-kit__control-checkbox-description">{{yield}}</span>
</span>
</FKLabel>
</template>