From 930abb78f28176532fa1a4858427e9a6c42a636f Mon Sep 17 00:00:00 2001
From: Nizamudeen A <nia@redhat.com>
Date: Tue, 28 Feb 2023 11:48:16 +0530
Subject: [PATCH] mgr/dashboard: minor fixes to crud form UI

Fixes: https://tracker.ceph.com/issues/58864
Signed-off-by: Nizamudeen A <nia@redhat.com>
---
 src/pybind/mgr/dashboard/controllers/_crud.py      | 2 +-
 src/pybind/mgr/dashboard/controllers/ceph_users.py | 2 +-
 src/pybind/mgr/dashboard/frontend/src/styles.scss  | 8 ++++++++
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/pybind/mgr/dashboard/controllers/_crud.py b/src/pybind/mgr/dashboard/controllers/_crud.py
index 0ac299db6e4..14af17bc55b 100644
--- a/src/pybind/mgr/dashboard/controllers/_crud.py
+++ b/src/pybind/mgr/dashboard/controllers/_crud.py
@@ -275,7 +275,7 @@ class Form:
                     'displayFlex': True,
                     'htmlClass': 'd-flex justify-content-end mb-0',
                     'items': [
-                        {"type": "cancel", "style": self.cancel_style, 'htmlClass': 'mr-2'},
+                        {"type": "cancel", "style": self.cancel_style, 'htmlClass': 'me-2'},
                         {"type": "submit", "style": self.submit_style, "title": self.action},
                     ]
                 }
diff --git a/src/pybind/mgr/dashboard/controllers/ceph_users.py b/src/pybind/mgr/dashboard/controllers/ceph_users.py
index 3562f33a227..a2952dbf867 100644
--- a/src/pybind/mgr/dashboard/controllers/ceph_users.py
+++ b/src/pybind/mgr/dashboard/controllers/ceph_users.py
@@ -61,7 +61,7 @@ class CephUserEndpoints:
 create_cap_container = ArrayHorizontalContainer('Capabilities', 'capabilities',
                                                 label_html_class='hidden cd-header mt-1', fields=[
                                                     FormField('Entity', 'entity',
-                                                              field_type=str, html_class='mr-3'),
+                                                              field_type=str, html_class='me-3'),
                                                     FormField('Entity Capabilities',
                                                               'cap', field_type=str)
                                                 ])
diff --git a/src/pybind/mgr/dashboard/frontend/src/styles.scss b/src/pybind/mgr/dashboard/frontend/src/styles.scss
index f2c3052f800..e5cea86285f 100644
--- a/src/pybind/mgr/dashboard/frontend/src/styles.scss
+++ b/src/pybind/mgr/dashboard/frontend/src/styles.scss
@@ -230,4 +230,12 @@ json-schema-form {
   .ng-touched.ng-valid {
     @extend .is-valid;
   }
+
+  .close {
+    @extend .btn-close;
+
+    span {
+      display: none;
+    }
+  }
 }