Merge branch 'bug_24348/odd_spacing_with_filters_elements_in_node_sea…

…rch_page_pr' into branches/rudder/8.1
Normation · Mar 8, 2024 · d231671 · d231671
2 parents db01e17 + bd8fc10
commit d231671
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 127 deletions.
diff --git a/...r/rudder-web/src/main/scala/com/normation/rudder/web/components/SearchNodeComponent.scala b/...r/rudder-web/src/main/scala/com/normation/rudder/web/components/SearchNodeComponent.scala
@@ -228,18 +228,19 @@ class SearchNodeComponent(
 
       lines.append(cl)
 
-      val initJs          = cl.attribute.cType.initForm("v_" + index)
-      val inputAttributes = ("id", "v_" + index) :: ("class", "queryInputValue form-control input-sm") :: {
+      val initJs = cl.attribute.cType.initForm("v_" + index)
+
+      val inputAttributes = ("id", "v_" + index) :: ("class", "queryInputValue form-control form-control-sm") :: {
         if (cl.comparator.hasValue) Nil else ("disabled", "disabled") :: Nil
       }
       val input           = cl.attribute.cType.toForm(cl.value, (x => lines(index) = lines(index).copy(value = x)), inputAttributes: _*)
       (".removeLine *" #> {
         if (addRemove)
-          SHtml.ajaxSubmit("-", () => removeLine(index), ("class", "removeLineButton btn btn-danger btn-xs"))
+          SHtml.ajaxSubmit("-", () => removeLine(index), ("class", "btn btn-danger btn-sm fw-bold"))
         else
           NodeSeq.Empty
       } &
-      ".addLine *" #> SHtml.ajaxSubmit("+", () => addLine(index), ("class", "removeLineButton btn btn-success btn-xs")) &
+      ".addLine *" #> SHtml.ajaxSubmit("+", () => addLine(index), ("class", "btn btn-success btn-sm fw-bold")) &
       ".objectType *" #> objectTypeSelect(cl.objectType, lines, index) &
       ".attributeName *" #> attributeNameSelect(cl.objectType, cl.attribute, lines, index) &
       ".comparator *" #> comparatorSelect(cl.objectType, cl.attribute, cl.comparator, lines, index) &
@@ -311,7 +312,7 @@ class SearchNodeComponent(
         "Search",
         () => processForm(isGroupsPage),
         ("id"    -> "SubmitSearch"),
-        ("class" -> "submitButton btn btn-primary")
+        ("class" -> "btn btn-primary ")
       ) &
       "#query_lines *" #> criteria.zipWithIndex.flatMap { case (cl, i) => displayQueryLine(cl, i, criteria.size > 1) }).apply(
         html
@@ -499,7 +500,7 @@ object SearchNodeComponent {
         }
       case Nil    => ""
     }
-    val newForm      = comp.toForm(v_old, func, ("id" -> v_eltid), ("class" -> "queryInputValue form-control input-sm"))
+    val newForm      = comp.toForm(v_old, func, ("id" -> v_eltid), ("class" -> "queryInputValue form-control form-control-sm"))
     comp.destroyForm(v_eltid) &
     JsCmds.Replace(v_eltid, newForm) &
     comp.initForm(v_eltid) &
@@ -643,7 +644,7 @@ object SearchNodeComponent {
       }),
       ("id", "ot_" + i),
       ("onchange", ajaxAttr(lines, i)._2.toJsCmd),
-      ("class", "selectField form-select input-sm")
+      ("class", "selectField form-select form-select-sm")
     )
   }
 
@@ -658,7 +659,7 @@ object SearchNodeComponent {
       }),
       ("id", "at_" + i),
       ("onchange", ajaxComp(lines, i)._2.toJsCmd),
-      ("class", "selectField form-select input-sm")
+      ("class", "selectField form-select form-select-sm")
     )
   }
 
@@ -679,7 +680,7 @@ object SearchNodeComponent {
       }),
       ("id", "ct_" + i),
       ("onchange", ajaxVal(lines, i)._2.toJsCmd),
-      ("class", "selectComparator form-select input-sm")
+      ("class", "selectComparator form-select form-select-sm")
     )
   }
 

diff --git a/webapp/sources/rudder/rudder-web/src/main/style/rudder/rudder-groups.css b/webapp/sources/rudder/rudder-web/src/main/style/rudder/rudder-groups.css
@@ -128,9 +128,6 @@ content-query{
 .rudder-form.form-sm{
   margin-bottom: 12px;
 }
-.searchNodes {
-  margin-top: 15px;
-}
 #ajaxItemContainer > form{
   height: 100%;
 }

diff --git a/webapp/sources/rudder/rudder-web/src/main/style/rudder/rudder-main.scss b/webapp/sources/rudder/rudder-web/src/main/style/rudder/rudder-main.scss
@@ -172,31 +172,6 @@ pre.json-beautify code.elmsh {
   background-color: #13BEB7 !important;
   border-color: #109f9a !important;
 }
-#login-page .content-wrapper .form-control:focus {
-  border-color: #041922;
-  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(102, 175, 233, 0);
-  box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 7px rgba(180, 180, 180, 0.6);
-}
-.content-wrapper .form-control{
-  border: 1px solid #d6deef;
-  -webkit-box-shadow: none;
-  box-shadow: none;
-  font-weight: normal;
-}
-.content-wrapper .form-control:active:focus {
-  border-color: #d6deef;
-  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 5px rgba(175, 175, 175, 0.6);
-  box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 5px rgba(175, 175, 175, 0.6);
-}
-.content-wrapper .form-control:focus {
-  border-color: #c4cbda;
-  -webkit-box-shadow: none;
-  box-shadow: none;
-}
-.no-background{
-  background-color:transparent !important;
-  background:none !important;
-}
 
 .content-wrapper .dataTables_wrapper_top .btn-default,
 .content-wrapper .dataTables_wrapper_bottom .btn-default {
@@ -1904,15 +1879,13 @@ ul > li.rudder-form > .input-group.disabled *{
   top:1px;
 }
 /* WBASEFIELD RADIO SWITCH */
-.wbBaseField.form-group .switch {
-  margin-bottom: 10px;
-}
 .wbBaseField.form-group .switch input{
   display: none !important;
 }
 .wbBaseField.form-group .switch label.radio-inline{
   padding: 0;
   margin: 0;
+  cursor: pointer;
 }
 .wbBaseField.form-group .switch label.radio-inline input + .radioTextLabel{
   display: inline-block;

diff --git a/webapp/sources/rudder/rudder-web/src/main/style/rudder/rudder-node.scss b/webapp/sources/rudder/rudder-web/src/main/style/rudder/rudder-node.scss
@@ -55,12 +55,6 @@ $node-state-size: 14px;
   }
 }
 
-#queryParameters{
-  padding: 0 15px;
-}
-#submitSearch{
-  margin-bottom: 15px;
-}
 .rudder_col>.portlet{
   padding: 0 !important;
 }

diff --git a/webapp/sources/rudder/rudder-web/src/main/style/rudder/rudder-rules.css b/webapp/sources/rudder/rudder-web/src/main/style/rudder/rudder-rules.css
@@ -75,12 +75,6 @@
   overflow-y: auto;
   overflow-x: hidden;
 }
-i#changeIconRule {
-  min-width: 25px;
-}
-#submitSearch #SubmitSearch{
-  margin-left: 7px;
-}
 label.rule-info{
   margin-bottom:0;
 }

diff --git a/webapp/sources/rudder/rudder-web/src/main/style/rudder/rudder.css b/webapp/sources/rudder/rudder-web/src/main/style/rudder/rudder.css
@@ -142,7 +142,6 @@ div.intro div ul {
 
 button.ui-state-default {
    width: 130px;
-
 }
 
 form select.selectComparator {
@@ -155,14 +154,6 @@ form select.selectField {
 
 .content-wrapper input.queryInputValue, .content-wrapper select.queryInputValue {
   width:280px;
-  margin: 0px;
-  padding: 0px;
-
-}
-
-form input.removeLineButton {
-  padding: 0;
-  width: 22px !important;
 }
 
 input.deleteNetwork * {
@@ -428,59 +419,10 @@ td.directiveVarValue  {
   text-align:center;
 }
 
-.pull-left {
-  float:left
-}
-
-.pull-right {
-  float:right
-}
-
-fieldset.searchNodes {
-  padding:5px;
-  clear: both;
-}
-
-tr.query_line, .query_line td {
-  padding: 4px 1px;
-  text-align: center;
-}
-
 .composition span {
   display: inline-block;
 }
 
-/************************
- * Search groups
- ************************/
-
-fieldset.hierarchy {
-  width:300px;
-  margin:5px;
-  padding:5px;
-  /*float: left;*/
-  display: inline-block;
-  vertical-align: top;
-}
-
-fieldset.groupCategory {
-  width:600px;
-  margin:5px;
-  padding:5px;
-  float: left;
-
-}
-
-.nodeGroupSubmitSearch {
-   margin: 0 ;
-   padding: 5px 0 5px 0;
-}
-
-div.hierarchySpacer {
-  width:5%;
-  display: inline-block;
-}
-
 /**************************************
 structure
 **************************************/
@@ -1174,23 +1116,9 @@ li.excluded a{
  font-size : 12px;
 }
 
-.techniqueEditorLink {
-  float:right;
-  text-decoration:none;
-  font-weight:bold;
-  font-size:13px;
-  margin-top:-5px;
-}
-
-.searchNodes tr td {
-  padding: 0 5px 5px 5px;
-}
 .searchNodes tr > td:first-child {
   padding-left: 0;
 }
-.searchNodes tr > td:last-child {
-  padding-right: 0;
-}
 .deprecatedTechniqueIcon {
   margin-left : 3px;
 }

diff --git a/webapp/sources/rudder/rudder-web/src/main/webapp/templates-hidden/server/server_details.html b/webapp/sources/rudder/rudder-web/src/main/webapp/templates-hidden/server/server_details.html
@@ -6,7 +6,7 @@
   <div id="SearchForm">
     <content-query>
       <div id="serverGrid_info_area"></div>
-      <div id="queryParameters" class="row">
+      <div id="queryParameters">
         <ul>
           <li class="rudder-form form-sm">
             <div class="input-group">
@@ -40,15 +40,15 @@
           </li>
         </ul>
         <div class="wbBaseField form-group">
-        <label><span class="text-fit">Match the criteria below with this operand:</span></label>
+        <label class="text-fit mb-1">Match the criteria below with this operand:</label>
           <div class="switch">
               <span class="radio-inline" id="composition"></span>
           </div>
         </div>
         <table class="searchNodes" >
           <tbody id="query_lines"></tbody>
         </table>
-        <div class="nodeGroupSubmitSearch" id="submitSearch"></div>
+        <div class="mt-1 mb-3" id="submitSearch"></div>
       </div>
     </content-query>
   </div>