MID-6271 small search css fixes

Evolveum · May 19, 2022 · 6d2fbbd · 6d2fbbd
1 parent 11357d1
commit 6d2fbbd
Show file tree

Hide file tree

Showing 4 changed files with 44 additions and 44 deletions.
diff --git a/gui/admin-gui/src/frontend/scss/midpoint-theme.scss b/gui/admin-gui/src/frontend/scss/midpoint-theme.scss
@@ -1275,14 +1275,12 @@ td .prism-property-value {
 
 .search-item {
   display: inline-block;
-  //min-width: 270px;
   border-color: #ddd;
   border-radius: 3px;
   background-color: #f4f4f4;
   vertical-align: middle;
   font-size: 12px;
   padding-left: 3px;
-  margin-left: 3px;
 
   .search-item-label {
     margin-top: 5px;
@@ -1812,3 +1810,7 @@ span.yui-skin-sam {
   word-break: break-word;
   max-width: 50vw;
 }
+
+th.debug-list-buttons {
+  width: 160px;
+}
diff --git a/...rc/main/java/com/evolveum/midpoint/gui/impl/component/search/AbstractSearchItemPanel.java b/...rc/main/java/com/evolveum/midpoint/gui/impl/component/search/AbstractSearchItemPanel.java
@@ -91,7 +91,7 @@ public String getDataPlacement() {
         if (searchItemField instanceof InputPanel && !(searchItemField instanceof AutoCompleteTextPanel)) {
             FormComponent<?> baseFormComponent = ((InputPanel) searchItemField).getBaseFormComponent();
             baseFormComponent.add(WebComponentUtil.getSubmitOnEnterKeyDownBehavior("searchSimple"));
-            baseFormComponent.add(AttributeAppender.append("style", "width: 140px; max-width: 400px !important;"));
+            baseFormComponent.add(AttributeAppender.append("style", "max-width: 400px !important;"));
             baseFormComponent.add(new EmptyOnBlurAjaxFormUpdatingBehaviour());
             baseFormComponent.add(new VisibleEnableBehaviour() {
 

diff --git a/.../src/main/java/com/evolveum/midpoint/gui/impl/component/search/FilterSearchItemPanel.java b/.../src/main/java/com/evolveum/midpoint/gui/impl/component/search/FilterSearchItemPanel.java
@@ -131,7 +131,7 @@ protected Component initSearchItemField() {
             }
             if (inputPanel instanceof InputPanel && !(inputPanel instanceof AutoCompleteTextPanel)) {
                 ((InputPanel) inputPanel).getBaseFormComponent().add(WebComponentUtil.getSubmitOnEnterKeyDownBehavior("searchSimple"));
-                ((InputPanel) inputPanel).getBaseFormComponent().add(AttributeAppender.append("style", "width: 140px; max-width: 400px !important;"));
+                ((InputPanel) inputPanel).getBaseFormComponent().add(AttributeAppender.append("style", "max-width: 400px !important;"));
                 ((InputPanel) inputPanel).getBaseFormComponent().add(new EmptyOnBlurAjaxFormUpdatingBehaviour());
             }
             inputPanel.setOutputMarkupId(true);

diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/component/search/SearchPanel.html b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/component/search/SearchPanel.html
@@ -6,49 +6,47 @@
   ~ and European Union Public License. See LICENSE file for details.
   -->
 <wicket:panel xmlns:wicket="http://wicket.apache.org">
-    <form wicket:id="form" class="d-flex flex-wrap justify-content-end">
-        <div wicket:id="searchItemsPanel"></div>
+    <form wicket:id="form" class="d-flex flex-wrap justify-content-end gap-1">
+        <div wicket:id="searchItemsPanel"/>
 
-            <div wicket:id="searchContainer" class="my-1">
-                <div class="btn-group btn-group-sm">
-                    <button type="button" class="btn btn-primary" about="searchSimple" wicket:id="submitSearchButton">
-                        <i class="fa fa-search flip-icon fa-lg"></i>
-                    </button>
-                    <button type="button" class="btn btn-primary dropdown-toggle" data-toggle="dropdown"
-                            aria-haspopup="true" aria-expanded="false" wicket:id="searchTypesMenu">
-                        <span class="caret"></span>
-                        <span class="sr-only">Toggle Dropdown</span>
-                    </button>
-                    <ul class="dropdown-menu pull-right" role="menu">
-                        <li wicket:id="searchTypeItems">
-                            <div wicket:id="searchType"/>
-                        </li>
-                    </ul>
-                </div>
-            </div>
-            <div wicket:id="saveSearchContainer" class="my-1">
-                <div class="btn-group btn-group-sm">
-                    <button type="button" class="btn btn-primary" wicket:id="saveSearchButton">
-                        <i class="fa fa-save flip-icon fa-lg"></i>
-                    </button>
-                    <button type="button" class="btn btn-primary dropdown-toggle" data-toggle="dropdown"
-                            aria-haspopup="true" aria-expanded="false" wicket:id="savedSearchMenu">
-                        <span class="caret"></span>
-                        <span class="sr-only">Toggle Dropdown</span>
-                    </button>
-                    <ul class="dropdown-menu pull-right" role="menu">
-                        <li wicket:id="savedSearchItems">
-                            <div wicket:id="savedSearchItem"/>
-                        </li>
-                    </ul>
-                </div>
+        <div wicket:id="searchContainer">
+            <div class="btn-group btn-group-sm">
+                <button type="button" class="btn btn-primary" about="searchSimple" wicket:id="submitSearchButton">
+                    <i class="fa fa-search flip-icon fa-lg"></i>
+                </button>
+                <button type="button" class="btn btn-primary dropdown-toggle" data-toggle="dropdown"
+                        aria-haspopup="true" aria-expanded="false" wicket:id="searchTypesMenu">
+                    <span class="caret"></span>
+                    <span class="sr-only">Toggle Dropdown</span>
+                </button>
+                <ul class="dropdown-menu pull-right" role="menu">
+                    <li wicket:id="searchTypeItems">
+                        <div wicket:id="searchType"/>
+                    </li>
+                </ul>
             </div>
+        </div>
+        <div class="btn-group btn-group-sm" wicket:id="saveSearchContainer">
+            <button type="button" class="btn btn-default" wicket:id="saveSearchButton">
+                <i class="fa fa-save"></i>
+            </button>
+            <button type="button" class="btn btn-primary dropdown-toggle" data-toggle="dropdown"
+                    aria-haspopup="true" aria-expanded="false" wicket:id="savedSearchMenu">
+                <span class="caret"></span>
+                <span class="sr-only">Toggle Dropdown</span>
+            </button>
+            <ul class="dropdown-menu pull-right" role="menu">
+                <li wicket:id="savedSearchItems">
+                    <div wicket:id="savedSearchItem"/>
+                </li>
+            </ul>
+        </div>
     </form>
     <wicket:fragment wicket:id="basicSearchFragment">
         <wicket:container wicket:id="items">
-            <div wicket:id="item" class="my-1"/>
+            <div wicket:id="item"/>
         </wicket:container>
-            <button wicket:id="more" class="btn btn-sm btn-default mx-1 my-1">
+            <button wicket:id="more" class="btn btn-sm btn-default">
                 <wicket:message key="SearchPanel.more"/>
                 &nbsp;
                 <span class="fa fa-caret-down"></span>
@@ -80,10 +78,10 @@
     </wicket:fragment>
 
     <wicket:fragment wicket:id="advancedSearchFragment">
-        <div class="d-flex my-1">
+        <div class="d-flex">
             <a class="btn btn-sm btn-link" wicket:id="debug" />
         </div>
-        <div class="my-1 has-feedback col-lg-11 col-sm-10 col-xs-9" wicket:id="advancedGroup" style="float:right; padding-right: 5px; text-align-last: left;">
+        <div class="has-feedback col-lg-11 col-sm-10 col-xs-9" wicket:id="advancedGroup" style="float:right; padding-right: 5px; text-align-last: left;">
             <textarea class="form-control form-control-sm" rows="2" wicket:id="advancedArea"
                     style="width: 220px; height: 60px; overflow: hidden;"></textarea>
             <input wicket:id="axiomQueryField" type="text" class="form-control form-control-sm"
@@ -98,7 +96,7 @@
     </wicket:fragment>
 
     <wicket:fragment wicket:id="fulltextSearchFragment">
-        <div class="my-1" wicket:id="fullTextContainer">
+        <div wicket:id="fullTextContainer">
             <input wicket:id="fullTextField" type="text" class="form-control form-control-sm" style="width: 150px; min-width: 150px;"/>
         </div>
     </wicket:fragment>