MID-6271 small prism form cleanup

Evolveum · May 11, 2022 · 97ed618 · 97ed618
1 parent edc9a10
commit 97ed618
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 10 deletions.
diff --git a/gui/admin-gui/src/frontend/scss/prism-forms.scss b/gui/admin-gui/src/frontend/scss/prism-forms.scss
@@ -15,7 +15,6 @@
 }
 
 .top-level-prism-container {
-  border-top: 1px solid $table-divider-color;
   padding-top: 5px;
 
   .prism-properties {

diff --git a/...ui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/AbstractPageObjectDetails.html b/...ui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/AbstractPageObjectDetails.html
@@ -20,13 +20,9 @@
 
                 <div class="details-panel">
                     <wicket:enclosure child="navigation">
-                        <div class="details-panel-navigation">
-                            <div wicket:id="navigation"></div>
-                        </div>
+                        <div class="details-panel-navigation" wicket:id="navigation"/>
                     </wicket:enclosure>
-                    <div class="details-panel-details-form">
-                        <div wicket:id="mainPanel"></div>
-                    </div>
+                    <div class="details-panel-details-form" wicket:id="mainPanel"/>
                 </div>
             </form>
         </div>

diff --git a/...ui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/AbstractPageObjectDetails.java b/...ui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/AbstractPageObjectDetails.java
@@ -422,6 +422,15 @@ private void initMainPanel(ContainerPanelConfigurationType panelConfig, Midpoint
 
         Class<? extends Panel> panelClass = findObjectPanel(panelType);
         Panel panel = WebComponentUtil.createPanel(panelClass, ID_MAIN_PANEL, objectDetailsModels, panelConfig);
+        panel.add(AttributeAppender.append("class", () -> {
+                List panels = getPanelConfigurations().getObject();
+                if (panels == null || panels.size() <= 1) {
+                    return "flex-grow-1";
+                }
+
+                return null;
+        }));
+
         if (panel != null) {
             form.addOrReplace(panel);
             return;

diff --git a/...veum/midpoint/gui/impl/page/admin/configuration/component/NotificationConfigTabPanel.html b/...veum/midpoint/gui/impl/page/admin/configuration/component/NotificationConfigTabPanel.html
@@ -13,7 +13,7 @@
                 <div class="row prism-property">
                     <div class="top-level-prism-container">
                         <div class="container-fluid">
-                            <div class="prism-header" style="height: 29px;">
+                            <div class="prism-header">
                                 <div wicket:id="mailConfigurationHeader"/>
                             </div>
                             <div class="prism-properties">
@@ -29,7 +29,7 @@
                                 <div class="property-stripe">
                                     <div class="row prism-property" wicket:id="debug"/>
                                 </div>
-                                <div class="prism-header" style="height: 29px;">
+                                <div class="prism-header">
                                     <div wicket:id="mailServerConfigurationHeader"/>
                                 </div>
                                 <div wicket:id="mailServersTable"/>
@@ -55,7 +55,7 @@
                             <div class="row prism-property">
                                 <div class="col-md-12 prism-property-value" wicket:id="values">
                                     <div class="container-wrapper">
-                                        <div class="prism-header" style="height: 29px;">
+                                        <div class="prism-header">
                                             <a wicket:id="valueHeader"/>
                                             <button wicket:id="removeButton" wicket:message="title:PrismObjectPanel.addChildContainer"
                                                 class="btn btn-tool" trigger="hover"><i class="fa fa-minus-circle"></i></button>