Merge branch 'master' into develop

2025-02-25 18:55:37 -06:00 · 2017-11-17 15:49:17 +01:00
parent 10fcf2f5be 6595be95eb
commit 0e44fe082b
177 changed files with 14293 additions and 1263 deletions
--- a/public/sass/components/_panel_alertlist.scss
+++ b/public/sass/components/_panel_alertlist.scss
@@ -1,3 +1,12 @@
 .panel-alert-list {
  overflow-y: auto;
 }
+
+.panel-alert-list__no-alerts {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  width: 100%;
+  height: calc(100% - 30px);
+}
+
--- a/public/sass/components/_panel_dashlist.scss
+++ b/public/sass/components/_panel_dashlist.scss
@@ -14,9 +14,11 @@
  background-color: $tight-form-bg;
  border: $input-btn-border-width solid $input-label-border-color;
  .fa {
-    float: right;
    padding-top: 3px;
  }
+  .dashlist-star {
+    float: right;
+  }
  .fa-star {
    color: $orange;
  }