From 5f193c0af8cedb3ad969d310111bf7c9ae8a0bad Mon Sep 17 00:00:00 2001 From: abradat Date: Mon, 3 Jun 2024 11:51:52 -0700 Subject: [PATCH 1/3] Fix cursor remaining in pointer state after clicking on proposal summary text area. Cursor changes to text state after clicking on proposal summary text area and changes back to cursor on submission or cancelation. --- .../inline-textarea-edit/inline-textarea-edit.component.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/alcs-frontend/src/app/shared/inline-editors/inline-textarea-edit/inline-textarea-edit.component.scss b/alcs-frontend/src/app/shared/inline-editors/inline-textarea-edit/inline-textarea-edit.component.scss index cc09826d94..d56cad7913 100644 --- a/alcs-frontend/src/app/shared/inline-editors/inline-textarea-edit/inline-textarea-edit.component.scss +++ b/alcs-frontend/src/app/shared/inline-editors/inline-textarea-edit/inline-textarea-edit.component.scss @@ -2,7 +2,7 @@ .editable { display: inline-block; - cursor: pointer; + cursor: auto; border: 2px solid colors.$primary-color-dark; padding: 8px; border-radius: 2px; From a295ceb6411ed14b50d7da85c234a3efc90715a6 Mon Sep 17 00:00:00 2001 From: abradat Date: Tue, 4 Jun 2024 10:55:36 -0700 Subject: [PATCH 2/3] fix ng-select border, dropdown, arrow, and placeholder colour to ALCS primary --- alcs-frontend/src/styles/ngselect.scss | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/alcs-frontend/src/styles/ngselect.scss b/alcs-frontend/src/styles/ngselect.scss index fe0fb471c4..624e89169c 100644 --- a/alcs-frontend/src/styles/ngselect.scss +++ b/alcs-frontend/src/styles/ngselect.scss @@ -6,9 +6,18 @@ font-size: 16px; } +.ng-select.ng-select-focused .ng-placeholder { + color: colors.$primary-color !important; +} + .ng-select.ng-select-focused .ng-select-container.ng-appearance-outline:after, -.ng-select.ng-select-focused .ng-select-container.ng-appearance-outline:hover:after { - border-color: colors.$primary-color; +.ng-select.ng-select-focused .ng-select-container.ng-appearance-outline:hover:after, +.ng-select.ng-select-focused .ng-select-container:after { + border-color: colors.$primary-color !important; +} + +.ng-select .ng-arrow { + color: colors.$primary-color !important; } .ng-select .ng-select-container.ng-appearance-outline { @@ -17,7 +26,7 @@ .ng-dropdown-panel .ng-dropdown-panel-items .ng-option.ng-option-selected { background-color: colors.$grey-light !important; - color: colors.$primary-color; + color: colors.$primary-color !important; &:hover { background-color: colors.$grey-light !important; From 5935958a9d4b6da86d4064922d6eacf4554ff7d9 Mon Sep 17 00:00:00 2001 From: abradat Date: Tue, 4 Jun 2024 11:07:53 -0700 Subject: [PATCH 3/3] Fix styling --- alcs-frontend/src/styles/ngselect.scss | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/alcs-frontend/src/styles/ngselect.scss b/alcs-frontend/src/styles/ngselect.scss index 624e89169c..a909d29e2a 100644 --- a/alcs-frontend/src/styles/ngselect.scss +++ b/alcs-frontend/src/styles/ngselect.scss @@ -6,10 +6,6 @@ font-size: 16px; } -.ng-select.ng-select-focused .ng-placeholder { - color: colors.$primary-color !important; -} - .ng-select.ng-select-focused .ng-select-container.ng-appearance-outline:after, .ng-select.ng-select-focused .ng-select-container.ng-appearance-outline:hover:after, .ng-select.ng-select-focused .ng-select-container:after { @@ -20,6 +16,10 @@ color: colors.$primary-color !important; } +.ng-select.ng-select-focused .ng-placeholder { + color: colors.$primary-color !important; +} + .ng-select .ng-select-container.ng-appearance-outline { padding: 0 0.8em !important; }