Merge branch '2.4' of github.com:CachetHQ/Cachet into 2.4

cachethq · Jul 12, 2019 · e4a43a2 · e4a43a2
2 parents 87d4bc8 + ad0eda8
commit e4a43a2
Show file tree

Hide file tree

Showing 7 changed files with 42 additions and 40 deletions.
diff --git a/composer.lock b/composer.lock
diff --git a/public/dist/css/dashboard/dashboard.css b/public/dist/css/dashboard/dashboard.css
diff --git a/public/dist/js/all.js b/public/dist/js/all.js
diff --git a/public/dist/js/app.js b/public/dist/js/app.js
diff --git a/public/mix-manifest.json b/public/mix-manifest.json
@@ -1,8 +1,8 @@
 {
     "/dist/js/vendor.js": "/dist/js/vendor.js?id=313e4cd2cf600307cb5c",
-    "/dist/js/app.js": "/dist/js/app.js?id=7877550e52e1d4e8d66b",
-    "/dist/css/dashboard/dashboard.css": "/dist/css/dashboard/dashboard.css?id=0d9dfb3411fe9391898f",
+    "/dist/js/app.js": "/dist/js/app.js?id=be35dd18d92eef9dee9f",
+    "/dist/css/dashboard/dashboard.css": "/dist/css/dashboard/dashboard.css?id=654823be1de9b1245f17",
     "/dist/css/app.css": "/dist/css/app.css?id=1b9032e972af93e2c869",
     "/dist/js/manifest.js": "/dist/js/manifest.js?id=40dcfff9d09d402daf38",
-    "/dist/js/all.js": "/dist/js/all.js?id=498db5622a6525cca7e2"
+    "/dist/js/all.js": "/dist/js/all.js?id=c77bbe3fb26a84b5347d"
 }
diff --git a/resources/assets/sass/dashboard/partials/_sidebar.scss b/resources/assets/sass/dashboard/partials/_sidebar.scss
@@ -21,6 +21,7 @@ body.dashboard {
             margin: 0;
             padding: 0;
             list-style: none;
+            padding-bottom: 64px; /* Ensure the sidebar isn't being covered by the bottom links */
 
             .profile {
                 text-align: center;

diff --git a/resources/views/partials/incidents.blade.php b/resources/views/partials/incidents.blade.php
@@ -33,7 +33,8 @@
                         @if($incident->updates->isNotEmpty())
                         <div class="list-group">
                             @foreach($incident->updates as $update)
-                            <a class="list-group-item incident-update-item" href="{{ $update->permalink }}">
+                            <li class="list-group-item incident-update-item">
+
                                 <i class="{{ $update->icon }}" title="{{ $update->human_status }}" data-toggle="tooltip"></i>
                                 {!! $update->formatted_message !!}
                                 <small>
@@ -42,9 +43,9 @@
                                         data-timeago="{{ $update->timestamp_iso }}">
                                     </abbr>
                                 </small>
-                                <span class="ion-ios-arrow-right pull-right"></span>
+                                <a href="{{ $update->permalink }}" class="pull-right"><span class="ion-ios-arrow-right"></span></a>
 
-                            </a>
+                            </li>
                             @endforeach
                         </div>
                         @endif