chore: merge conflicts

Signed-off-by: Jonathan <theflametrooper@gmail.com>

frontend/components/Station/Station.vue

@@ -614,7 +614,7 @@ export default {
 
 				if (window.stationInterval !== 0)
 					clearInterval(window.stationInterval);
-				window.stationInterval = setInterval(function() {
+				window.stationInterval = setInterval(() => {
 					local.resizeSeekerbar();
 					local.calculateTimeElapsed();
 				}, 150);

frontend/dist/index.css

@@ -84,7 +84,7 @@ h6 {
 }
 
 .light-blue {
-	background-color: #03a9f4 !important;
+	background-color: #ff4545 !important;
 }
 
 .white {
@@ -101,7 +101,7 @@ a.nav-item.is-tab {
 }
 
 .button.is-info {
-	background-color: #03a9f4;
+	background-color: #ff4545;
 	border-width: 0;
 	color: #fff;
 }