MID-6271 fixed search more popover css

Evolveum · May 6, 2022 · 347c80e · 347c80e
1 parent 6597fa5
commit 347c80e
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 33 deletions.
diff --git a/gui/admin-gui/src/frontend/scss/midpoint-theme.scss b/gui/admin-gui/src/frontend/scss/midpoint-theme.scss
@@ -1827,6 +1827,8 @@ fieldset.objectButtons {
 
   &:last-of-type {
     border-right: 0;
+    padding-right: 0;
+    margin-right: 0;
   }
 }
 
@@ -1894,23 +1896,15 @@ th, td {
   text-transform: uppercase;
 }
 
-div.search-popover {
+div.search-popover > dl {
+  height: 150px;
+  max-height: 150px;
+  overflow: auto;
 
-  & > div.more-input,
-  & > div.buttons {
-    margin: 6px;
-  }
-
-  & > div.properties {
-    padding: 0 5px;
-    border-top: 1px solid #ccc;
-    border-bottom: 1px solid #ccc;
-    height: 150px;
-    max-height: 150px;
-    overflow: auto;
-    vertical-align: top;
+  & > dd > label {
+    margin-bottom: 0;
 
-    & label {
+    & > a {
       font-weight: normal;
     }
   }

diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/SearchPanel.html b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/SearchPanel.html
@@ -70,26 +70,22 @@
 
     <div wicket:id="popover">
         <div class="search-popover">
-            <div class="more-input">
-                <input wicket:id="addText" type="text" class="form-control form-control-sm" style="width: auto;" size="20">
-            </div>
+            <input wicket:id="addText" type="text" class="form-control form-control-sm mt-1 mb-2" style="width: auto;" size="20">
 
-            <div class="properties">
-                <dl wicket:id="propList">
-                    <dt>
-                        <wicket:message key="SearchPanel.properties"/>
-                    </dt>
-                    <dd wicket:id="properties">
-                        <label>
-                            <input wicket:id="check" type="checkbox">&nbsp;
-                            <a wicket:id="propLink"><span wicket:id="propName"/></a>
-                            <i wicket:id="help"/>
-                        </label>
-                    </dd>
-                </dl>
-            </div>
+            <dl class="border-bottom mb-2" wicket:id="propList">
+                <dt class="mb-1">
+                    <wicket:message key="SearchPanel.properties"/>
+                </dt>
+                <dd wicket:id="properties">
+                    <label>
+                        <input wicket:id="check" type="checkbox">&nbsp;
+                        <a wicket:id="propLink"><span wicket:id="propName"/></a>
+                        <i wicket:id="help"/>
+                    </label>
+                </dd>
+            </dl>
 
-            <div class="buttons">
+            <div class="mt-2 mb-1">
                 <a wicket:id="add" class="btn btn-sm btn-success"/>
                 <a wicket:id="close" class="btn btn-sm btn-default"/>
             </div>