Selaa lähdekoodia

fix(Station page): removed text from discussed buttons, increased sidebar width proportionally to player

Signed-off-by: Jonathan <theflametrooper@gmail.com>
Jonathan 4 vuotta sitten
vanhempi
commit
887964663d

+ 7 - 10
frontend/src/pages/Station/components/CurrentlyPlaying.vue

@@ -59,7 +59,7 @@
 						})
 					"
 				>
-					<i class="material-icons icon-with-button">flag</i>Report
+					<i class="material-icons icon-with-button">flag</i>
 				</button>
 				<a
 					class="button"
@@ -77,7 +77,7 @@
 					v-if="$parent.isAdminOnly() && !currentSong.simpleSong"
 					@click="$parent.editSong(currentSong)"
 				>
-					<i class="material-icons icon-with-button">edit</i>Edit
+					<i class="material-icons icon-with-button">edit</i>
 				</button>
 			</div>
 		</div>
@@ -123,6 +123,11 @@ export default {
 		height: 100%;
 		position: relative;
 
+		@media screen and (max-width: 1200px) {
+			min-width: 100px;
+			max-height: 100px;
+		}
+
 		#yt-thumbnail-bg {
 			height: 100%;
 			width: 100%;
@@ -197,14 +202,6 @@ export default {
 			#youtube-icon {
 				background-color: #bd2e2e;
 
-				&:after {
-					content: "View on YouTube";
-
-					@media (max-width: 1800px) {
-						content: "Open";
-					}
-				}
-
 				.icon {
 					margin-right: 3px;
 					height: 20px;

+ 9 - 47
frontend/src/pages/Station/index.vue

@@ -115,9 +115,6 @@
 								<i class="material-icons icon-with-button">
 									bug_report
 								</i>
-								<span class="optional-desktop-only-text">
-									Debug
-								</span>
 							</button>
 
 							<!-- Local Pause/Resume Button -->
@@ -128,9 +125,6 @@
 								v-if="localPaused"
 							>
 								<i class="material-icons">play_arrow</i>
-								<span class="optional-desktop-only-text"
-									>Play locally</span
-								>
 							</button>
 							<button
 								class="button is-primary"
@@ -139,9 +133,6 @@
 								v-else
 							>
 								<i class="material-icons">pause</i>
-								<span class="optional-desktop-only-text"
-									>Pause locally</span
-								>
 							</button>
 
 							<!-- Vote to Skip Button -->
@@ -153,13 +144,7 @@
 								<i class="material-icons icon-with-button"
 									>skip_next</i
 								>
-								<span class="optional-desktop-only-text"
-									>Vote to skip (</span
-								>
-								{{ currentSong.skipVotes }}
-								<span class="optional-desktop-only-text"
-									>)</span
-								>
+								({{ currentSong.skipVotes }})
 							</button>
 						</div>
 						<div id="duration">
@@ -246,9 +231,6 @@
 										"
 									>
 										<i class="material-icons">queue</i>
-										<span class="optional-desktop-only-text"
-											>Add Song To Playlist</span
-										>
 									</button>
 									<button
 										class="button"
@@ -1577,11 +1559,11 @@ export default {
 		.quadrant,
 		.player-container {
 			border: 0 !important;
+			background: transparent !important;
 		}
 
-		.quadrant,
 		.player-container {
-			background: transparent !important;
+			padding: 0 10px;
 		}
 
 		/** padding fixes on mobile */
@@ -1619,7 +1601,7 @@ export default {
 		display: grid;
 		height: 100%;
 		width: 100%;
-		grid-template-columns: 70% 30%;
+		grid-template-columns: 65% 35%;
 		grid-template-rows: 150px auto;
 		grid-template-areas:
 			"about-station currently-playing"
@@ -1627,26 +1609,6 @@ export default {
 		gap: 25px;
 		min-height: calc(100vh - 64px - 190px);
 
-		@media (min-width: 1040px) and (max-width: 2100px) {
-			#control-bar-container {
-				.optional-desktop-only-text {
-					display: none;
-				}
-
-				.button:not(#dropdown-toggle) {
-					width: 75px;
-				}
-
-				#add-song-to-playlist .button,
-				#local-resume,
-				#local-pause {
-					i {
-						margin-right: 0 !important;
-					}
-				}
-			}
-		}
-
 		.row {
 			display: flex;
 			flex-direction: row;
@@ -1779,13 +1741,13 @@ export default {
 				flex-direction: column;
 				flex-flow: wrap;
 
+				.button:not(#dropdown-toggle) {
+					width: 75px;
+				}
+
 				#left-buttons,
 				#right-buttons {
 					margin: 3px;
-
-					i {
-						margin-right: 3px;
-					}
 				}
 
 				#left-buttons {
@@ -1818,7 +1780,7 @@ export default {
 					cursor: pointer;
 
 					.volume-slider {
-						width: 500px;
+						width: 400px;
 						padding: 0 15px;
 						background: transparent;