mgr/dashboard: Fixed modal forms background color

Signed-off-by: Afreen Misbah <afreen@ibm.com>

diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/services/service-form/service-form.component.html b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/services/service-form/service-form.component.html
index cc741ede3ca2886bb6c4578fc17344ec969e3cce..1d7e407e9f702d4cc906a744b5e231a0c4a19a4c 100644 (file)
--- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/services/service-form/service-form.component.html
+++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/services/service-form/service-form.component.html
@@ -6,7 +6,8 @@
         i18n>{{ action | titlecase }} {{ resource }}</h3>
     <cd-help-text></cd-help-text>
   </cds-modal-header>
-  <section cdsModalContent>
+  <section cdsModalContent
+           hasForm="true">
     <form #frm="ngForm"
           [formGroup]="serviceForm"
           novalidate>
@@ -186,8 +187,7 @@
               <input cdsText
                      type="text"
                      [value]="serviceForm.controls.service_type.value + '.'"
-                     [disabled]="editing"
-                     readonly="true">
+                     disabled="true">
             </cds-text-label>
           </div>
           <cds-text-label [invalid]="serviceForm.controls.service_id.invalid && serviceForm.controls.service_id.dirty"

diff --git a/src/pybind/mgr/dashboard/frontend/src/styles/_carbon-defaults.scss b/src/pybind/mgr/dashboard/frontend/src/styles/_carbon-defaults.scss
index 8d41b7a0fcecd4a171807bea9e6407f313aee93b..7d920f0c66a50ffacaf32c32a9bed0c4254d7047 100644 (file)
--- a/src/pybind/mgr/dashboard/frontend/src/styles/_carbon-defaults.scss
+++ b/src/pybind/mgr/dashboard/frontend/src/styles/_carbon-defaults.scss
@@ -235,3 +235,20 @@ Tabs
 .cds--text-truncate--end {
   @include textTruncate.text-truncate-end;
 }
+
+/******************************************
+Modals
+******************************************/
+
+/* Temporary workaround for Carbon modal form field background bug.
+ https://github.com/carbon-design-system/carbon-components-angular/issues/3340
+ */
+.cds--modal {
+  .cds--select-input,
+  .cds--text-input,
+  .cds--list-box,
+  .cds--number input[type='number'],
+  .cds--text-area {
+    background-color: var(--cds-layer-02);
+  }
+}