From f82e0cc36111fe11d1096fc5adbd4f159c3df89e Mon Sep 17 00:00:00 2001 From: Malina Calarco Date: Tue, 11 Jul 2023 14:34:02 -0700 Subject: [PATCH 1/4] changed form-field-groups.hbs to show a disabled text book for username when editing a user --- ui/lib/core/addon/components/form-field-groups.hbs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui/lib/core/addon/components/form-field-groups.hbs b/ui/lib/core/addon/components/form-field-groups.hbs index 226076ea5a63..13ece0ed39de 100644 --- a/ui/lib/core/addon/components/form-field-groups.hbs +++ b/ui/lib/core/addon/components/form-field-groups.hbs @@ -17,7 +17,7 @@ /> {{else}} {{! OTHERWISE WE'RE EDITING }} - {{#if (or (eq attr.name "name") (attr.options.editDisabled))}} + {{#if (or (eq attr.name "name") (eq attr.name "username") (attr.options.editDisabled))}} {{else}} Date: Wed, 12 Jul 2023 13:30:17 -0800 Subject: [PATCH 2/4] reverted the change in form-field-groups.hbs. Instead changed the CSS for readonly to match the CSS of disabled in inputs.scss --- ui/app/styles/core/inputs.scss | 4 +++- ui/lib/core/addon/components/form-field-groups.hbs | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/ui/app/styles/core/inputs.scss b/ui/app/styles/core/inputs.scss index 826abdaecd77..f8a24bb8fb60 100644 --- a/ui/app/styles/core/inputs.scss +++ b/ui/app/styles/core/inputs.scss @@ -47,7 +47,9 @@ } .input[disabled], -.textarea[disabled] { +.textarea[disabled], +.input[readonly], +.textarea[readonly] { border-color: $grey-light; background-color: $ui-gray-100; color: $ui-gray-500; diff --git a/ui/lib/core/addon/components/form-field-groups.hbs b/ui/lib/core/addon/components/form-field-groups.hbs index 13ece0ed39de..226076ea5a63 100644 --- a/ui/lib/core/addon/components/form-field-groups.hbs +++ b/ui/lib/core/addon/components/form-field-groups.hbs @@ -17,7 +17,7 @@ /> {{else}} {{! OTHERWISE WE'RE EDITING }} - {{#if (or (eq attr.name "name") (eq attr.name "username") (attr.options.editDisabled))}} + {{#if (or (eq attr.name "name") (attr.options.editDisabled))}} {{else}} Date: Wed, 12 Jul 2023 23:50:43 -0800 Subject: [PATCH 3/4] changed readonly input styling in inputs.scss in accordance with new design for readonly input --- ui/app/styles/core/inputs.scss | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ui/app/styles/core/inputs.scss b/ui/app/styles/core/inputs.scss index f8a24bb8fb60..a62891d7ecf9 100644 --- a/ui/app/styles/core/inputs.scss +++ b/ui/app/styles/core/inputs.scss @@ -47,9 +47,7 @@ } .input[disabled], -.textarea[disabled], -.input[readonly], -.textarea[readonly] { +.textarea[disabled] { border-color: $grey-light; background-color: $ui-gray-100; color: $ui-gray-500; @@ -62,7 +60,9 @@ .input[readonly], .textarea[readonly] { + border: none; box-shadow: none; + cursor: not-allowed; } // textarea specific css From 2bf9fe6738574fab3839f1625f28b2256d002df1 Mon Sep 17 00:00:00 2001 From: Malina Calarco Date: Thu, 13 Jul 2023 00:16:41 -0800 Subject: [PATCH 4/4] added changelog --- changelog/21771.txt | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 changelog/21771.txt diff --git a/changelog/21771.txt b/changelog/21771.txt new file mode 100644 index 000000000000..55252dcb3666 --- /dev/null +++ b/changelog/21771.txt @@ -0,0 +1,3 @@ +```release-note:bug +ui: Fix styling for username input when editing a user +``` \ No newline at end of file