From f6972d44ed695be1794885b08f137a8e87dc8bf0 Mon Sep 17 00:00:00 2001
From: Richard Cox <richard-cox@users.noreply.github.com>
Date: Fri, 23 Oct 2020 15:23:32 +0100
Subject: [PATCH] Add new darker/lighter background colour to all textareas
 (#4710)

- fixes #4689
---
 .../specify-user-provided-details.component.html    |  2 +-
 src/frontend/packages/core/sass/_all-theme.scss     |  2 ++
 .../sass/components/text-area.theme.scss}           | 13 ++++---------
 .../packages/kubernetes/sass/_all-theme.scss        |  2 --
 4 files changed, 7 insertions(+), 12 deletions(-)
 rename src/frontend/packages/{kubernetes/src/kubernetes/auth-forms/kubernetes-serviceaccount-auth-form/kubernetes-serviceaccount-auth-form.component.theme.scss => core/sass/components/text-area.theme.scss} (58%)

diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/add-service-instance/specify-user-provided-details/specify-user-provided-details.component.html b/src/frontend/packages/cloud-foundry/src/shared/components/add-service-instance/specify-user-provided-details/specify-user-provided-details.component.html
index dad3260d98..1a23095064 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/add-service-instance/specify-user-provided-details/specify-user-provided-details.component.html
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/add-service-instance/specify-user-provided-details/specify-user-provided-details.component.html
@@ -41,7 +41,7 @@
     </mat-chip-list>
   </mat-form-field>
   <mat-form-field class="">
-    <textarea matInput formControlName="credentials" placeholder="Credentials" matAutosizeMinRows="2"
+    <textarea matInput formControlName="credentials" placeholder="Credentials (JSON)" matAutosizeMinRows="2"
       matAutosizeMaxRows="5"></textarea>
     <mat-error *ngIf="createEditServiceInstance.controls.credentials.hasError('notValidJson')">
       Not valid JSON.
diff --git a/src/frontend/packages/core/sass/_all-theme.scss b/src/frontend/packages/core/sass/_all-theme.scss
index c929676d41..1cb538fe61 100644
--- a/src/frontend/packages/core/sass/_all-theme.scss
+++ b/src/frontend/packages/core/sass/_all-theme.scss
@@ -48,6 +48,7 @@
 @import '../src/shared/components/sidepanel-preview/sidepanel-preview.component.theme';
 @import '../src/shared/components/user-avatar/user-avatar.component.theme';
 @import './components/text-status.theme';
+@import './components/text-area.theme';
 @import './components/hyperlinks.theme';
 @import './mat-desktop';
 @import './fonts';
@@ -83,6 +84,7 @@
   @include app-mat-snack-bar-theme($theme, $app-theme);
   @include ngx-charts-gauge($theme, $app-theme);
   @include app-text-status-theme($theme, $app-theme);
+  @include app-text-area($theme, $app-theme);
   @include app-card-status-theme($theme, $app-theme);
   @include app-usage-gauge-theme($theme, $app-theme);
   @include app-ssh-viewer-theme($theme, $app-theme);
diff --git a/src/frontend/packages/kubernetes/src/kubernetes/auth-forms/kubernetes-serviceaccount-auth-form/kubernetes-serviceaccount-auth-form.component.theme.scss b/src/frontend/packages/core/sass/components/text-area.theme.scss
similarity index 58%
rename from src/frontend/packages/kubernetes/src/kubernetes/auth-forms/kubernetes-serviceaccount-auth-form/kubernetes-serviceaccount-auth-form.component.theme.scss
rename to src/frontend/packages/core/sass/components/text-area.theme.scss
index 87832b8895..c0a6d7dfaf 100644
--- a/src/frontend/packages/kubernetes/src/kubernetes/auth-forms/kubernetes-serviceaccount-auth-form/kubernetes-serviceaccount-auth-form.component.theme.scss
+++ b/src/frontend/packages/core/sass/components/text-area.theme.scss
@@ -1,4 +1,4 @@
-@mixin app-kube-token-auth-form-theme($theme, $app-theme) {
+@mixin app-text-area($theme, $app-theme) {
 
   $is-dark: map-get($theme, is-dark);
   $app-background: map-get($app-theme, app-background-color);
@@ -8,12 +8,7 @@
     $textarea-color: lighten($app-background, 5%);
   }
 
-  .kube-sa-auth {
-    &__form {
-      textarea {
-        background-color: $textarea-color;
-      }
-    }
+  textarea {
+    background-color: $textarea-color;
   }
-
-}
\ No newline at end of file
+}
diff --git a/src/frontend/packages/kubernetes/sass/_all-theme.scss b/src/frontend/packages/kubernetes/sass/_all-theme.scss
index 0db83043c6..8a917544fa 100644
--- a/src/frontend/packages/kubernetes/sass/_all-theme.scss
+++ b/src/frontend/packages/kubernetes/sass/_all-theme.scss
@@ -7,7 +7,6 @@
 @import '../src/kubernetes/workloads/release/tabs/helm-release-summary-tab/helm-release-summary-tab.component.theme';
 @import '../src/kubernetes/list-types/kubernetes-nodes/kubernetes-node-link/kubernetes-node-link.component.theme';
 @import '../src/kubernetes/workloads/chart-values-editor/chart-values-editor.component.theme';
-@import '../src/kubernetes/auth-forms/kubernetes-serviceaccount-auth-form/kubernetes-serviceaccount-auth-form.component.theme';
 
 @mixin apply-theme-kubernetes($stratos-theme) {
 
@@ -21,6 +20,5 @@
   @include helm-release-summary-tab-theme($theme, $app-theme);
   @include kube-node-link-theme($theme, $app-theme);
   @include app-chart-values-editor-theme($theme, $app-theme);
-  @include app-kube-token-auth-form-theme($theme, $app-theme);
 
 }