LimiterControlForm: Remove class inline and update css

application/forms/Control/LimiterControlForm.php

@@ -15,7 +15,7 @@ class LimiterControlForm extends Form
      *
      * @var string
      */
-    const CSS_CLASS_LIMITER = 'limiter-control inline';
+    const CSS_CLASS_LIMITER = 'limiter-control icinga-controls';
 
     /**
      * Default limit
@@ -37,14 +37,10 @@ class LimiterControlForm extends Form
         500 => '500'
     );
 
-    public static $defaultElementDecorators = array(
-        array('Label', array('tag'=>'span', 'separator' => '')),
-        array('Help', array('placement' => 'APPEND')),
-        array(array('labelWrap' => 'HtmlTag'), array('tag' => 'div')),
-        array('ViewHelper', array('separator' => '')),
-        array('Errors', array('separator' => '')),
-        array('HtmlTag', array('tag' => 'div', 'class' => 'limiter-control-form'))
-    );
+    public static $defaultElementDecorators = [
+        ['Label', ['tag' => 'span', 'separator' => '']],
+        ['ViewHelper', ['separator' => '']],
+    ];
 
     /**
      * Default limit for this instance

public/css/icinga/controls.less

@@ -79,29 +79,8 @@ input.search {
   }
 }
 
-.limiter-control > .control-group {
-  padding: 0;
-  // Note that the sort-control form does not have padding as it's utilizing different decorators
-
-  > .control-label-group {
-    text-align: left;
-    padding: 0;
-    width: 1em;
-  }
-
-  > select {
-    width: 4.5em;
-  }
-
-  > i {
-    .sr-only();
-  }
-}
-
-.limiter-control,
-.sort-control {
-  // Display limiter and sort control both on the same line; floating could be used here too to achieve the same
-  display: inline-block;
+.limiter-control > select {
+  margin-left: .5em;
 }
 
 .pagination-control {
@@ -164,8 +143,6 @@ input.search {
 }
 
 .sort-control {
-  margin-left: 0.25em;
-
   label {
     width: auto;
     margin-right: 0.5em;
@@ -185,9 +162,10 @@ input.search {
 .sort-controls-container {
   clear: right;
   float: right;
+  display: flex;
 
-  > * {
-    vertical-align: middle;
+  > *:not(:last-child) {
+    margin-right: .5em;
   }
 }
 

public/css/icinga/forms.less

@@ -439,11 +439,6 @@ form.icinga-forms .form-info {
 
 // Specific form styles
 
-.limiter-control-form > * {
-  display: inline-block;
-  margin-right: 0.25em;
-}
-
 .search.inline {
   display: inline-block;
 }