diff --git a/index.html b/index.html
index 17d4e542..52a2a12c 100644
--- a/index.html
+++ b/index.html
@@ -669,9 +669,14 @@
Checkbox
@@ -687,9 +692,13 @@
Radiogroup
diff --git a/src/base/form-check-element.ts b/src/base/form-check-element.ts
index 421476ea..6e521acc 100644
--- a/src/base/form-check-element.ts
+++ b/src/base/form-check-element.ts
@@ -134,12 +134,14 @@ export class FormCheckElement extends SgdsElement implements SgdsFormControl {
@keydown=${this._handleKeyDown}
@invalid=${(e: Event) => this._handleInvalid(e)}
/>
-
- ${this.hasFeedback
- ? html`
${this.invalidFeedback}
`
- : nothing}
+
`;
}
diff --git a/src/components/Checkbox/checkbox.css b/src/components/Checkbox/checkbox.css
index 9df5eff8..6f998f33 100644
--- a/src/components/Checkbox/checkbox.css
+++ b/src/components/Checkbox/checkbox.css
@@ -16,7 +16,7 @@ input {
}
.form-check {
- display: block;
+ display: flex;
margin-bottom: var(--sgds-spacer-2);
min-height: 2rem;
}
@@ -24,7 +24,6 @@ input {
.form-check .form-check-input {
margin-right: var(--sgds-form-input-margin-right);
}
-
.form-check-input {
appearance: none;
background-color: var(--sgds-form-bg);
@@ -69,11 +68,11 @@ input {
.form-check-input.is-invalid:focus {
box-shadow: var(--sgds-form-focus-invalid-box-shadow);
}
-.form-check-input.is-invalid ~ .form-check-label {
+.form-check-input.is-invalid ~ .form-check-label-container > .form-check-label {
color: var(--sgds-form-invalid-color);
}
.form-check-inline {
- display: inline-block;
+ display: inline-flex;
vertical-align: text-top;
margin-right: var(--sgds-form-inline-margin-right);
margin-bottom: 0;
diff --git a/src/components/Input/sgds-input.ts b/src/components/Input/sgds-input.ts
index 328fb326..4f4f8315 100644
--- a/src/components/Input/sgds-input.ts
+++ b/src/components/Input/sgds-input.ts
@@ -181,7 +181,7 @@ export class SgdsInput extends SgdsElement implements SgdsFormControl {
${this._renderFeedback()} `;
}
protected _renderFeedback() {
- return this.hasFeedback
+ return this.hasFeedback && this.invalid
? html`