Browse Source

Merge branch 'staging'

Owen Diffey 3 năm trước cách đây
mục cha
commit
bd615eda1b

+ 1 - 1
frontend/src/components/ChristmasLights.vue

@@ -39,7 +39,7 @@ export default {
 	.christmas-lights {
 		position: absolute;
 		width: 100%;
-		height: 50px;
+		height: 64px;
 		left: 0;
 		top: 64px;
 		display: flex;

+ 4 - 0
frontend/src/components/layout/MainHeader.vue

@@ -302,4 +302,8 @@ export default {
 		}
 	}
 }
+
+.christmas-mode .nav {
+	border-radius: 0 !important;
+}
 </style>

+ 3 - 1
frontend/src/components/modals/EditPlaylist/index.vue

@@ -62,7 +62,9 @@
 						v-if="
 							userId === playlist.createdBy ||
 							isEditable() ||
-							(playlist.type === 'genre' && isAdmin())
+							((playlist.type === 'genre' ||
+								playlist.type === 'artist') &&
+								isAdmin())
 						"
 					/>
 					<add-songs

+ 4 - 0
frontend/src/pages/Home.vue

@@ -800,6 +800,10 @@ export default {
 		&.loggedIn {
 			top: 20vh !important;
 		}
+
+		@media only screen and (max-width: 550px) {
+			top: 45vh !important;
+		}
 	}
 	.header {
 		&,

+ 5 - 7
frontend/src/pages/Station/index.vue

@@ -2865,19 +2865,17 @@ export default {
 .christmas-seeker {
 	background: repeating-linear-gradient(
 		-45deg,
-		var(--white),
-		var(--white) 1rem,
-		var(--dark-red) 1rem,
-		var(--dark-red) 2rem
+		var(--white) 0 1rem,
+		var(--dark-red) 1rem 2rem
 	);
 
-	background-size: 150% 200%;
-	animation: christmas 10s linear infinite;
+	background-size: 200% 200%;
+	animation: christmas 20s linear infinite;
 }
 
 @keyframes christmas {
 	100% {
-		background-position: 100% 100%;
+		background-position: 80% 100%;
 	}
 }