Merging upstream version 0.22.0.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 232 insertions, 232 deletions

diff --git a/public/css/combined.less b/public/css/combined.less
index 422a94c..75c5fc3 100644
--- a/public/css/combined.less
+++ b/public/css/combined.less
@@ -131,6 +131,23 @@
     }
   }
 }
+form.gipfl-quicksearch {
+    display: block;
+    input.search {
+        width: 8em;
+        min-width: unset;
+        border: none;
+        background-color: inherit;
+        padding-left: 2em;
+        margin-left: 1.5em;
+        font-size: 0.75em;
+        font-weight: normal;
+        &:focus {
+            width: 16em;
+            border: none;
+        }
+    }
+}
 div.gipfl-action-bar {
   > * {
     vertical-align: middle;
@@ -236,31 +253,6 @@ div.gipfl-action-bar > ul {
   }
 }
 /** END of dropdown in action bar **/
-form.gipfl-quicksearch {
-    display: block;
-    input.search {
-        width: 8em;
-        min-width: unset;
-        border: none;
-        background-color: inherit;
-        padding-left: 2em;
-        margin-left: 1.5em;
-        font-size: 0.75em;
-        font-weight: normal;
-        &:focus {
-            width: 16em;
-            border: none;
-        }
-    }
-}
-@gipfl-color-low-sat-blue: #dae3e6;
-// map Icinga vars, to avoid warnings in other files
-@gipfl-color-main: @icinga-blue;
-@gipfl-color-text: @text-color;
-@gipfl-color-gray-light: @gray-light;
-@gipfl-bg-element: #f2f1f0;
-@gipfl-bg-element: @low-sat-blue;
-@gipfl-icon-font: 'ifont';
 /**
  * Lightweight support for small collapsible components
  *
@@ -316,159 +308,6 @@ ul.gipfl-collapsible {
         line-height: 2em;
     }
 }
-/**
- * State Hints
- *
- * @since v0.6.0
- */
-div.gipfl-widget-hint {
-    border: 1px solid @text-color;
-    padding: 0.5em;
-    line-height: 2em;
-    max-width: 60em;
-    border-left-width: 3em;
-    border-radius: 0.25em;
-    margin-bottom: 1em;
-    background-color: @body-bg-color;
-    box-shadow: fade(@text-color, 30%) 1em 0 1.5em 0;
-    &:before {
-        position: relative;
-        margin-left: -1.4em;
-        margin-right: 0.5em;
-        height: 100%;
-        vertical-align: middle;
-        font-family: 'ifont';
-        color: white;
-        font-size: 2em;
-    }
-    &.ok {
-        border-color: @color-ok;
-        box-shadow: fade(@color-ok, 30%) 1em 0 1.5em 0;
-    }
-    &.info {
-        border-color: @color-pending;
-        box-shadow: fade(@color-pending, 30%) 1em 0 1.5em 0;
-    }
-    &.warning {
-        border-color: @color-warning;
-        box-shadow: fade(@color-warning, 30%) 1em 0 1.5em 0;
-    }
-    &.error {
-        border-color: @color-critical;
-        box-shadow: fade(@color-critical, 30%) 1em 0 1.5em 0;
-    }
-    &.critical:before, &.error:before {
-        content: '\e881';
-    }
-    &.warning:before {
-        content: '\e881';
-    }
-    &.info:before {
-        content: '\e87d';
-    }
-    &.ok:before {
-        content: '\e803';
-    }
-    a {
-        text-decoration: underline;
-    }
-}
-table.gipfl-name-value-table {
-  width: 100%;
-  > tbody > tr > th {
-    color: @text-color-light;
-    // Reset default font-weight
-    font-weight: bold;
-    padding-left: 0;
-    text-align: right;
-    vertical-align: top;
-    width: 12em;
-  }
-  > tbody > tr > td {
-    vertical-align: top;
-  }
-}
-
-table.gipfl-name-value-table a {
-  color: @icinga-blue;
-}
-
-table.gipfl-name-value-table pre {
-  background-color: transparent;
-  margin: 0;
-  padding: 0;
-  font-size: unset;
-  display: inline;
-}
-form.gipfl-form {
-  input[type="submit"] {
-    margin-right: 0.5em;
-  }
-  input[type="submit"]:first-of-type {
-    background-color: @icinga-blue;
-    color: @text-color-inverted;
-    border: 2px solid @icinga-blue;
-    font-weight: bold;
-  }
-
-  select:not([multiple]) {
-    padding-right: 1.5625em;
-    background-image: url(../img/select-icon.svg);
-    background-repeat: no-repeat;
-    background-position: right center;
-    background-size: contain;
-  }
-
-  input.validated {
-    background-color: fade(@color-ok, 30%);
-    border-color: @color-ok;
-  }
-
-  :not(output):-moz-ui-invalid, :not(output).invalid {
-    background-color: fade(@color-critical, 30%);
-    border-color: @color-critical;
-    box-shadow: none;
-  }
-
-  input[type=text].input-with-button {
-    max-width: 30em;
-    min-width: 18em;
-    width: 80%;
-    margin: 0;
-    border-top-right-radius: unset;
-    border-bottom-right-radius: unset;
-    border-right-style: none;
-    &:focus {
-      border-right-style: none;
-    }
-  }
-
-  input[type=submit].input-element-related-button {
-    width: 20%;
-    max-width: 6em;
-    background-color: @icinga-blue;
-    color: @text-color-inverted;
-    border: 1px solid @icinga-blue;
-    border-radius: 0 3px 3px 0;
-    -moz-border-radius: 0 3px 3px 0;
-    -webkit-border-radius: 0 3px 3px 0;
-    line-height: 2em;
-    height: 2.4em;
-    padding: 0;
-    margin: 0 1em 0 0;
-    &:hover {
-      background-color: @text-color-inverted;
-      color: @icinga-blue;
-      border-color: @icinga-blue;
-    }
-  }
-  p.gipfl-widget-hint {
-    max-width: 52.5em;
-  }
-  p.gipfl-element-description {
-    max-width: 36em;
-  }
-}
 form.gipfl-form {
   label {
     line-height: 2em;
@@ -808,67 +647,97 @@ form.gipfl-form {
   }
 }
 
-#layout.minimal-layout div.content form.gipfl-form {
-  ul.extensible-set {
-    max-width: unset;
-    border: 1px solid @gray-light;
-  }
-
-  dd.active ul.extensible-set {
-    border: 1px solid @icinga-blue;
-
-    input[type=submit]:first-of-type {
-      border-width: 1px;
+@gipfl-color-low-sat-blue: #dae3e6;
+// map Icinga vars, to avoid warnings in other files
+@gipfl-color-main: @icinga-blue;
+@gipfl-color-text: @text-color;
+@gipfl-color-gray-light: @gray-light;
+@gipfl-bg-element: #f2f1f0;
+@gipfl-bg-element: @low-sat-blue;
+@gipfl-icon-font: 'ifont';
+/**
+ * State Hints
+ *
+ * @since v0.6.0
+ */
+div.gipfl-widget-hint {
+    border: 1px solid @text-color;
+    padding: 0.5em;
+    line-height: 2em;
+    max-width: 60em;
+    border-left-width: 3em;
+    border-radius: 0.25em;
+    margin-bottom: 1em;
+    background-color: @body-bg-color;
+    box-shadow: fade(@text-color, 30%) 1em 0 1.5em 0;
+    &:before {
+        position: relative;
+        margin-left: -1.4em;
+        margin-right: 0.5em;
+        height: 100%;
+        vertical-align: middle;
+        font-family: 'ifont';
+        color: white;
+        font-size: 2em;
     }
-  }
-
-  dd input.related-action[type='submit'] {
-    display: none;
-  }
-
-  dd.active li.active input.related-action[type='submit'] {
-    display: inline-block;
-  }
-
-  dd.active ul.extensible-set, ul.extensible-set.sortable {
-    input[type=text], select {
-      width: 100%;
+    &.ok {
+        border-color: @color-ok;
+        box-shadow: fade(@color-ok, 30%) 1em 0 1.5em 0;
     }
-
-    input[type=text] {
-      // background-color: white;
-      border: 1px solid white;
+    &.info {
+        border-color: @color-pending;
+        box-shadow: fade(@color-pending, 30%) 1em 0 1.5em 0;
     }
+    &.warning {
+        border-color: @color-warning;
+        box-shadow: fade(@color-warning, 30%) 1em 0 1.5em 0;
+    }
+    &.error {
+        border-color: @color-critical;
+        box-shadow: fade(@color-critical, 30%) 1em 0 1.5em 0;
+    }
+    &.critical:before, &.error:before {
+        content: '\e881';
+    }
+    &.warning:before {
+        content: '\e881';
+    }
+    &.info:before {
+        content: '\e87d';
+    }
+    &.ok:before {
+        content: '\e803';
+    }
+    a {
+        text-decoration: underline;
+    }
+}
+table.gipfl-name-value-table {
+  width: 100%;
+  > tbody > tr > th {
+    color: @text-color-light;
+    // Reset default font-weight
+    font-weight: bold;
+    padding-left: 0;
+    text-align: right;
+    vertical-align: top;
+    width: 12em;
+  }
+  > tbody > tr > td {
+    vertical-align: top;
   }
 }
-form.gipfl-inline-form {
-    display: inline-block;
-    select {
-        width: auto;
-        min-width: unset;
-        max-width: unset;
-        border: none;
-        padding: 0 0.5em;
-        margin: 0;
-        line-height: unset;
-        box-sizing:border-box;
-        height: 1.5em;
 
-        &:hover {
-            border: none;
-        }
+table.gipfl-name-value-table a {
+  color: @icinga-blue;
+}
 
-        &:focus {
-            border: none;
-        }
-    }
-    input[type=submit] {
-        padding: 0 0.25em;
-        margin: 0 1em 0 0;
-        border: none;
-        line-height: unset;
-        box-sizing: border-box;
-    }
+table.gipfl-name-value-table pre {
+  background-color: transparent;
+  margin: 0;
+  padding: 0;
+  font-size: unset;
+  display: inline;
 }
 .Differences {
     width: 100%;
@@ -967,3 +836,134 @@ form.gipfl-inline-form {
 .DifferencesInline .ChangeReplace del {
     background: #e99;
 }
+form.gipfl-form {
+  input[type="submit"] {
+    margin-right: 0.5em;
+  }
+  input[type="submit"]:first-of-type {
+    background-color: @icinga-blue;
+    color: @text-color-inverted;
+    border: 2px solid @icinga-blue;
+    font-weight: bold;
+  }
+
+  select:not([multiple]) {
+    padding-right: 1.5625em;
+    background-image: url(../img/select-icon.svg);
+    background-repeat: no-repeat;
+    background-position: right center;
+    background-size: contain;
+  }
+
+  input.validated {
+    background-color: fade(@color-ok, 30%);
+    border-color: @color-ok;
+  }
+
+  :not(output):-moz-ui-invalid, :not(output).invalid {
+    background-color: fade(@color-critical, 30%);
+    border-color: @color-critical;
+    box-shadow: none;
+  }
+
+  input[type=text].input-with-button {
+    max-width: 30em;
+    min-width: 18em;
+    width: 80%;
+    margin: 0;
+    border-top-right-radius: unset;
+    border-bottom-right-radius: unset;
+    border-right-style: none;
+    &:focus {
+      border-right-style: none;
+    }
+  }
+
+  input[type=submit].input-element-related-button {
+    width: 20%;
+    max-width: 6em;
+    background-color: @icinga-blue;
+    color: @text-color-inverted;
+    border: 1px solid @icinga-blue;
+    border-radius: 0 3px 3px 0;
+    -moz-border-radius: 0 3px 3px 0;
+    -webkit-border-radius: 0 3px 3px 0;
+    line-height: 2em;
+    height: 2.4em;
+    padding: 0;
+    margin: 0 1em 0 0;
+    &:hover {
+      background-color: @text-color-inverted;
+      color: @icinga-blue;
+      border-color: @icinga-blue;
+    }
+  }
+  p.gipfl-widget-hint {
+    max-width: 52.5em;
+  }
+  p.gipfl-element-description {
+    max-width: 36em;
+  }
+}
+#layout.minimal-layout div.content form.gipfl-form {
+  ul.extensible-set {
+    max-width: unset;
+    border: 1px solid @gray-light;
+  }
+
+  dd.active ul.extensible-set {
+    border: 1px solid @icinga-blue;
+
+    input[type=submit]:first-of-type {
+      border-width: 1px;
+    }
+  }
+
+  dd input.related-action[type='submit'] {
+    display: none;
+  }
+
+  dd.active li.active input.related-action[type='submit'] {
+    display: inline-block;
+  }
+
+  dd.active ul.extensible-set, ul.extensible-set.sortable {
+    input[type=text], select {
+      width: 100%;
+    }
+
+    input[type=text] {
+      // background-color: white;
+      border: 1px solid white;
+    }
+  }
+}
+form.gipfl-inline-form {
+    display: inline-block;
+    select {
+        width: auto;
+        min-width: unset;
+        max-width: unset;
+        border: none;
+        padding: 0 0.5em;
+        margin: 0;
+        line-height: unset;
+        box-sizing:border-box;
+        height: 1.5em;
+
+        &:hover {
+            border: none;
+        }
+
+        &:focus {
+            border: none;
+        }
+    }
+    input[type=submit] {
+        padding: 0 0.25em;
+        margin: 0 1em 0 0;
+        border: none;
+        line-height: unset;
+        box-sizing: border-box;
+    }
+}