diff --git a/authui/src/authflowv2/components/input.css b/authui/src/authflowv2/components/input.css index 217535db37..b65d91982d 100644 --- a/authui/src/authflowv2/components/input.css +++ b/authui/src/authflowv2/components/input.css @@ -9,6 +9,7 @@ --input__border-radius: var(--border-radius-rounded-square); --input__placeholder-color: var(--color-neutral-200); --input__text-color: var(--color-neutral-700); + --input__text-color--disabled: var(--color-neutral-300); --input__font-family: var(--typography-body-large__font-family); --input__font-size: var(--typography-body-large__font-size); --input__line-height: var(--typography-body-large__line-height); @@ -41,6 +42,7 @@ --input__ring-color: var(--color-neutral-500); --input__placeholder-color: var(--color-neutral-400); --input__text-color: var(--color-neutral-100); + --input__text-color--disabled: var(--color-neutral-500); --input__password-visibility-icon-color: var(--color-neutral-300); } @@ -56,18 +58,22 @@ letter-spacing: var(--input__letter-spacing); font-weight: var(--input__font-weight); caret-color: var(--input__ring-color--focus); - @apply ring-inset + @apply ring-inset ring-[length:var(--input\_\_ring-width)] ring-[color:var(--input\_\_ring-color)]; &:focus { - @apply ring-inset + @apply ring-inset ring-[length:var(--input\_\_ring-width--focus)] ring-[color:var(--input\_\_ring-color--focus)]; } + &:disabled { + color: var(--input__text-color--disabled); + } + &.input--error { - @apply ring-inset + @apply ring-inset ring-[color:var(--input\_\_ring-color--error)]; } } diff --git a/authui/src/authflowv2/components/settings-item.css b/authui/src/authflowv2/components/settings-item.css index 952f3b09d5..ba1ca1254f 100644 --- a/authui/src/authflowv2/components/settings-item.css +++ b/authui/src/authflowv2/components/settings-item.css @@ -99,7 +99,7 @@ grid-template-columns: var(--settings-item__grid-col-icon-width) auto 1.125rem; } - &:hover { + &[href]:hover { background-color: var(--settings-item__bg-color--hover); color: var(--settings-item__text-color--hover); @apply ring-inset diff --git a/resources/authgear/templates/en/web/authflowv2/__settings_item.html b/resources/authgear/templates/en/web/authflowv2/__settings_item.html index 098508ff4a..04e741a18f 100644 --- a/resources/authgear/templates/en/web/authflowv2/__settings_item.html +++ b/resources/authgear/templates/en/web/authflowv2/__settings_item.html @@ -65,6 +65,8 @@ {{ end }} -
+ {{ if $.Href }} +
+ {{ end }} {{ end}} diff --git a/resources/authgear/templates/en/web/authflowv2/__settings_text_input.html b/resources/authgear/templates/en/web/authflowv2/__settings_text_input.html index f59b8ac6a5..46331198cc 100644 --- a/resources/authgear/templates/en/web/authflowv2/__settings_text_input.html +++ b/resources/authgear/templates/en/web/authflowv2/__settings_text_input.html @@ -1,3 +1,14 @@ +{{/* Example usage + {{ template "authflowv2/__settings_text_input.html" + (dict + "Label" "Full Name" + "Name" "/given_name" + "Value" "John" + "Disabled" true + ) + }} +*/}} + {{ define "authflowv2/__settings_text_input.html" }} {{ end }} diff --git a/resources/authgear/templates/en/web/authflowv2/settings_profile_edit_name.html b/resources/authgear/templates/en/web/authflowv2/settings_profile_edit_name.html index 3945339cba..f3dfefbbc2 100644 --- a/resources/authgear/templates/en/web/authflowv2/settings_profile_edit_name.html +++ b/resources/authgear/templates/en/web/authflowv2/settings_profile_edit_name.html @@ -20,7 +20,7 @@ {{ $.CSRFField }}
- {{ if (call $.IsEditable "/name") }} + {{ if (call $.IsReadable "/name") }} {{ template "authflowv2/__settings_text_input.html" (dict "Label" (translate "v2.page.settings-profile-edit-name.default.fullname-input-label" nil) @@ -29,11 +29,12 @@ "InputAttrs" ` data-form-state-target="input" ` + "Disabled" (not (call $.IsEditable "/name")) ) }} {{ end }} - {{ if (call $.IsEditable "/given_name") }} + {{ if (call $.IsReadable "/given_name") }} {{ template "authflowv2/__settings_text_input.html" (dict "Label" (translate "v2.page.settings-profile-edit-name.default.given-name-input-label" nil) @@ -42,11 +43,12 @@ "InputAttrs" ` data-form-state-target="input" ` + "Disabled" (not (call $.IsEditable "/given_name")) ) }} {{ end }} - {{ if (call $.IsEditable "/middle_name") }} + {{ if (call $.IsReadable "/middle_name") }} {{ template "authflowv2/__settings_text_input.html" (dict "Label" (translate "v2.page.settings-profile-edit-name.default.middle-name-input-label" nil) @@ -55,11 +57,12 @@ "InputAttrs" ` data-form-state-target="input" ` + "Disabled" (not (call $.IsEditable "/middle_name")) ) }} {{ end }} - {{ if (call $.IsEditable "/family_name") }} + {{ if (call $.IsReadable "/family_name") }} {{ template "authflowv2/__settings_text_input.html" (dict "Label" (translate "v2.page.settings-profile-edit-name.default.family-name-input-label" nil) @@ -68,11 +71,12 @@ "InputAttrs" ` data-form-state-target="input" ` + "Disabled" (not (call $.IsEditable "/family_name")) ) }} {{ end }} - {{ if (call $.IsEditable "/nickname") }} + {{ if (call $.IsReadable "/nickname") }} {{ template "authflowv2/__settings_text_input.html" (dict "Label" (translate "v2.page.settings-profile-edit-name.default.nickname-input-label" nil) @@ -81,21 +85,23 @@ "InputAttrs" ` data-form-state-target="input" ` + "Disabled" (not (call $.IsEditable "/nickname")) ) }} {{ end }} -
- + {{ if or (call $.IsEditable "/name") (call $.IsEditable "/given_name") (call $.IsEditable "/family_name") (call $.IsEditable "/middle_name") (call $.IsEditable "/nickname") }} + + {{ end }} {{ end }}