Merge pull request ceph#50299 from rhcs-dashboard/fix-broken-styles-crud

mgr/dashboard: minor fixes to crud form UI Reviewed-by: Pegonzal <NOT@FOUND> Reviewed-by: Pere Diaz Bou <[email protected]>
bitfehler · Feb 28, 2023 · ed0e876 · ed0e876
2 parents a36ad05 + 930abb7
commit ed0e876
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git a/src/pybind/mgr/dashboard/controllers/_crud.py b/src/pybind/mgr/dashboard/controllers/_crud.py
@@ -275,7 +275,7 @@ def to_dict(self):
                     '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
@@ -61,7 +61,7 @@ def user_create(_, user_entity: str, capabilities: List[Cap]):
 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
@@ -230,4 +230,12 @@ json-schema-form {
   .ng-touched.ng-valid {
     @extend .is-valid;
   }
+
+  .close {
+    @extend .btn-close;
+
+    span {
+      display: none;
+    }
+  }
 }