From 54ba112d64f24a045eb1f6b3e822447fc89e4012 Mon Sep 17 00:00:00 2001
From: Florian Strohmaier <florian.strohmaier@icinga.com>
Date: Wed, 26 Jun 2019 16:29:01 +0200
Subject: [PATCH] CSS: Align controls elements

refs #3676
---
 application/controllers/UserController.php |  2 +-
 public/css/icinga/controls.less            | 12 ++-
 public/css/icinga/forms.less               | 99 ++++++++++++----------
 3 files changed, 65 insertions(+), 48 deletions(-)

diff --git a/application/controllers/UserController.php b/application/controllers/UserController.php
index 7ef07534d..5d458aecc 100644
--- a/application/controllers/UserController.php
+++ b/application/controllers/UserController.php
@@ -45,7 +45,7 @@ class UserController extends AuthBackendController
         }
 
         $this->view->backendSelection = new Form();
-        $this->view->backendSelection->setAttrib('class', 'backend-selection');
+        $this->view->backendSelection->setAttrib('class', 'backend-selection inline');
         $this->view->backendSelection->setUidDisabled();
         $this->view->backendSelection->setMethod('GET');
         $this->view->backendSelection->setTokenDisabled();
diff --git a/public/css/icinga/controls.less b/public/css/icinga/controls.less
index d38598e25..effc1812d 100644
--- a/public/css/icinga/controls.less
+++ b/public/css/icinga/controls.less
@@ -14,6 +14,7 @@
 
   > .control-group {
     padding: 0;
+    line-height: 2em;
 
     > .control-label-group {
       text-align: left;
@@ -33,12 +34,16 @@
 .pagination-control,
 .sort-controls-container {
   // Select controls may not respect font-size thus leading to improperly vertical alignment w/o big enough line-height
-  line-height: 2em;
+  /*line-height: 2em;*/
 }
 
 .filter {
   // Display filter control on a new line
   clear: both;
+
+  > a {
+    color: @icinga-blue;
+  }
 }
 
 .limiter-control > .control-group {
@@ -141,6 +146,7 @@
 .sort-controls-container {
   clear: right;
   float: right;
+  line-height: 1;
 
   > * {
     vertical-align: middle;
@@ -150,6 +156,10 @@
 .sort-direction-control {
   margin-left: 0.25em;
   width: 1em;
+
+  .spinner {
+    line-height: 1;
+  }
 }
 
 html.no-js .sort-control form {
diff --git a/public/css/icinga/forms.less b/public/css/icinga/forms.less
index dd5d881ba..f801d1c44 100644
--- a/public/css/icinga/forms.less
+++ b/public/css/icinga/forms.less
@@ -30,6 +30,7 @@ form:not(.inline):not([role="search"]) {
 .control-group {
   display: flex;
   margin: 0 -.5em;
+  align-items: center;
 
   > * {
     margin: .5em;
@@ -121,23 +122,26 @@ select ~ .spinner:before {
                                                general input styles
 ***********************************************************************************************************************/
 
-.control-group input[type="text"],
-.control-group input[type="password"],
-.control-group input[type="number"],
-.control-group textarea,
-.control-group select {
+form input[type="text"],
+form input[type="password"],
+form input[type="number"],
+form textarea,
+form select {
   background: @low-sat-blue;
   flex: 1;
-  width: 0;
 }
 
-.control-group select option * {
-  width: 100%;
-  overflow: hidden;
-  white-space: nowrap;
-  max-width: 100%;
-  -ms-text-overflow: ellipsis;
-  text-overflow: ellipsis;
+form input:not([type="checkbox"]),
+form .toggle-switch,
+form button,
+form select,
+form textarea,
+form button,
+form .toggle-switch,
+form input {
+  border: none;
+  .rounded-corners(.25em);
+  .appearance(none);
 }
 
 .control-group input:not([type="checkbox"]),
@@ -148,11 +152,9 @@ select ~ .spinner:before {
 .form-controls button,
 .form-controls .toggle-switch,
 .form-controls input {
-  border: none;
-  border-radius: .25em;
   font-size: inherit;
-  padding: .5625em;
-  .appearance(none);
+  padding: 0 .5625em;
+  line-height: 2.625em;
 }
 
 .control-group .toggle-switch,
@@ -160,12 +162,44 @@ select ~ .spinner:before {
   margin: 1em .5em;
 }
 
-.controls .control-group {
+.controls form {
+
+  .control-label-group {
+    margin-top: 0;
+    margin-bottom: 0;
+    padding-top: 0.25em;
+    padding-bottom: 0.25em;
+  }
+
   input,
   select {
-    line-height: 0.75;
+    line-height: 1.5em;
+    padding: 0 .5625em;
     max-width: 16em;
   }
+
+  select {
+    padding-right: 1.526em;
+    margin-top: 0;
+    margin-bottom: 0;
+  }
+}
+
+form select {
+  padding-right: 1.5625em;
+}
+
+/* Remove native dropdown arrow in IE10+ */
+form select::-ms-expand {
+  display: none;
+  opacity: 0
+}
+
+form select:not([multiple]) {
+  background-image: url(../img/select-icon.svg);
+  background-repeat: no-repeat;
+  background-position: right center;
+  background-size: contain;
 }
 
 /**********************************************************************************************************************
@@ -205,24 +239,6 @@ input.search {
   text-align: left;
 }
 
-/* The default resize handles are still displayed over the image, so I will remove this for now
-.control-group textarea {
-  background-image: url(../img/textarea-corner-2x.png);
-  background-repeat: no-repeat;
-  background-position: bottom right;
-  background-size: 1em 1em;
-} */
-
-.control-group select {
-  padding-right: 1.5625em;
-}
-
-/* Remove native dropdown arrow in IE10+ */
-.control-group select::-ms-expand {
-  display: none;
-  opacity: 0
-}
-
 .control-group .spinner {
   margin: .5em 0;
 }
@@ -237,13 +253,6 @@ input.search {
   }
 }
 
-.control-group select:not([multiple]) {
-  background-image: url(../img/select-icon.svg);
-  background-repeat: no-repeat;
-  background-position: right center;
-  background-size: contain;
-}
-
 /**********************************************************************************************************************
                                                button styles
 ***********************************************************************************************************************/
@@ -471,8 +480,6 @@ input::-webkit-input-placeholder {
   display: inline-block;
 }
 
-
 .sort-control > * {
   display: inline-block;
-  margin: 0.5em 0;
 }