Merge pull request #389 from th-ch/fix-menu-buttons

Update menu buttons to new format
th-ch · Sep 12, 2021 · d255e5f · d255e5f
2 parents fea460a + e888b5c
commit d255e5f
Show file tree

Hide file tree

Showing 3 changed files with 114 additions and 90 deletions.
diff --git a/plugins/downloader/style.css b/plugins/downloader/style.css
@@ -6,8 +6,16 @@
 	cursor: pointer;
 }
 
+.menu-item > .yt-simple-endpoint:hover {
+	background-color: var(--ytmusic-menu-item-hover-background-color);
+}
+
 .menu-icon {
 	flex: var(--ytmusic-menu-item-icon_-_flex);
 	margin: var(--ytmusic-menu-item-icon_-_margin);
 	fill: var(--ytmusic-menu-item-icon_-_fill);
+	stroke: var(--iron-icon-stroke-color, none);
+	width: var(--iron-icon-width, 24px);
+	height: var(--iron-icon-height, 24px);
+	animation: var(--iron-icon_-_animation);
 }
diff --git a/plugins/downloader/templates/download.html b/plugins/downloader/templates/download.html
@@ -1,37 +1,45 @@
 <div
-	class="menu-item ytmusic-menu-popup-renderer"
+	class="style-scope menu-item ytmusic-menu-popup-renderer"
 	role="option"
 	tabindex="-1"
 	aria-disabled="false"
 	aria-selected="false"
 	onclick="download()"
 >
 	<div
-		class="menu-icon yt-icon-container yt-icon ytmusic-toggle-menu-service-item-renderer"
+		id="navigation-endpoint"
+		class="yt-simple-endpoint style-scope ytmusic-menu-navigation-item-renderer"
+		tabindex="-1"
 	>
-		<svg
-			viewBox="0 0 24 24"
-			preserveAspectRatio="xMidYMid meet"
-			focusable="false"
-			class="style-scope yt-icon"
-			style="pointer-events: none; display: block; width: 100%; height: 100%;"
+		<div
+			class="icon menu-icon style-scope ytmusic-menu-navigation-item-renderer"
 		>
-			<g class="style-scope yt-icon">
-				<path
-					d="M25.462,19.105v6.848H4.515v-6.848H0.489v8.861c0,1.111,0.9,2.012,2.016,2.012h24.967c1.115,0,2.016-0.9,2.016-2.012v-8.861H25.462z"
-					class="style-scope yt-icon" fill="#aaaaaa"
-				/>
-				<path
-					d="M14.62,18.426l-5.764-6.965c0,0-0.877-0.828,0.074-0.828s3.248,0,3.248,0s0-0.557,0-1.416c0-2.449,0-6.906,0-8.723c0,0-0.129-0.494,0.615-0.494c0.75,0,4.035,0,4.572,0c0.536,0,0.524,0.416,0.524,0.416c0,1.762,0,6.373,0,8.742c0,0.768,0,1.266,0,1.266s1.842,0,2.998,0c1.154,0,0.285,0.867,0.285,0.867s-4.904,6.51-5.588,7.193C15.092,18.979,14.62,18.426,14.62,18.426z"
-					class="style-scope yt-icon" fill="#aaaaaa"
-				/>
-			</g>
-		</svg>
-	</div>
-	<div
-		class="text style-scope ytmusic-toggle-menu-service-item-renderer"
-		id="ytmcustom-download"
-	>
-		Download
+			<svg
+				viewBox="0 0 24 24"
+				preserveAspectRatio="xMidYMid meet"
+				focusable="false"
+				class="style-scope yt-icon"
+				style="pointer-events: none; display: block; width: 100%; height: 100%"
+			>
+				<g class="style-scope yt-icon">
+					<path
+						d="M25.462,19.105v6.848H4.515v-6.848H0.489v8.861c0,1.111,0.9,2.012,2.016,2.012h24.967c1.115,0,2.016-0.9,2.016-2.012v-8.861H25.462z"
+						class="style-scope yt-icon"
+						fill="#aaaaaa"
+					/>
+					<path
+						d="M14.62,18.426l-5.764-6.965c0,0-0.877-0.828,0.074-0.828s3.248,0,3.248,0s0-0.557,0-1.416c0-2.449,0-6.906,0-8.723c0,0-0.129-0.494,0.615-0.494c0.75,0,4.035,0,4.572,0c0.536,0,0.524,0.416,0.524,0.416c0,1.762,0,6.373,0,8.742c0,0.768,0,1.266,0,1.266s1.842,0,2.998,0c1.154,0,0.285,0.867,0.285,0.867s-4.904,6.51-5.588,7.193C15.092,18.979,14.62,18.426,14.62,18.426z"
+						class="style-scope yt-icon"
+						fill="#aaaaaa"
+					/>
+				</g>
+			</svg>
+		</div>
+		<div
+			class="text style-scope ytmusic-menu-navigation-item-renderer"
+			id="ytmcustom-download"
+		>
+			Download
+		</div>
 	</div>
 </div>
diff --git a/plugins/playback-speed/templates/slider.html b/plugins/playback-speed/templates/slider.html
@@ -1,79 +1,87 @@
 <div
-	class="menu-item ytmusic-menu-popup-renderer"
+	class="style-scope menu-item ytmusic-menu-popup-renderer"
 	role="option"
 	tabindex="-1"
 	aria-disabled="false"
 	aria-selected="false"
 >
-	<tp-yt-paper-slider
-		id="playback-speed-slider"
-		class="volume-slider style-scope ytmusic-player-bar on-hover"
-		max="100"
-		min="0"
-		step="5"
-		dir="ltr"
-		title="Playback speed"
-		aria-label="Playback speed"
-		role="slider"
-		tabindex="0"
-		aria-valuemin="0"
-		aria-valuemax="100"
-		aria-valuenow="50"
-		aria-disabled="false"
-		value="50"
-		><!--css-build:shady-->
-		<div id="sliderContainer" class="style-scope tp-yt-paper-slider">
-			<div class="bar-container style-scope tp-yt-paper-slider">
-				<tp-yt-paper-progress
-					id="sliderBar"
-					aria-hidden="true"
-					class="style-scope tp-yt-paper-slider"
-					role="progressbar"
-					value="50"
-					aria-valuenow="50"
-					aria-valuemin="0"
-					aria-valuemax="100"
-					aria-disabled="false"
-					style="touch-action: none"
-					><!--css-build:shady-->
+	<div
+		id="navigation-endpoint"
+		class="yt-simple-endpoint style-scope ytmusic-menu-navigation-item-renderer"
+		tabindex="-1"
+	>
+		<tp-yt-paper-slider
+			id="playback-speed-slider"
+			class="volume-slider style-scope ytmusic-player-bar on-hover"
+			max="100"
+			min="0"
+			step="5"
+			dir="ltr"
+			title="Playback speed"
+			aria-label="Playback speed"
+			role="slider"
+			tabindex="0"
+			aria-valuemin="0"
+			aria-valuemax="100"
+			aria-valuenow="50"
+			aria-disabled="false"
+			value="50"
+			><!--css-build:shady-->
+			<div id="sliderContainer" class="style-scope tp-yt-paper-slider">
+				<div class="bar-container style-scope tp-yt-paper-slider">
+					<tp-yt-paper-progress
+						id="sliderBar"
+						aria-hidden="true"
+						class="style-scope tp-yt-paper-slider"
+						role="progressbar"
+						value="50"
+						aria-valuenow="50"
+						aria-valuemin="0"
+						aria-valuemax="100"
+						aria-disabled="false"
+						style="touch-action: none"
+						><!--css-build:shady-->
 
-					<div id="progressContainer" class="style-scope tp-yt-paper-progress">
 						<div
-							id="secondaryProgress"
+							id="progressContainer"
 							class="style-scope tp-yt-paper-progress"
-							hidden="true"
-							style="transform: scaleX(0)"
-						></div>
-						<div
-							id="primaryProgress"
-							class="style-scope tp-yt-paper-progress"
-							style="transform: scaleX(0.5)"
-						></div>
-					</div>
-				</tp-yt-paper-progress>
-			</div>
-			<dom-if class="style-scope tp-yt-paper-slider"
-				><template is="dom-if"></template
-			></dom-if>
-			<div
-				id="sliderKnob"
-				class="slider-knob style-scope tp-yt-paper-slider"
-				style="left: 50%; touch-action: none"
-			>
+						>
+							<div
+								id="secondaryProgress"
+								class="style-scope tp-yt-paper-progress"
+								hidden="true"
+								style="transform: scaleX(0)"
+							></div>
+							<div
+								id="primaryProgress"
+								class="style-scope tp-yt-paper-progress"
+								style="transform: scaleX(0.5)"
+							></div>
+						</div>
+					</tp-yt-paper-progress>
+				</div>
+				<dom-if class="style-scope tp-yt-paper-slider"
+					><template is="dom-if"></template
+				></dom-if>
 				<div
-					class="slider-knob-inner style-scope tp-yt-paper-slider"
-					value="50"
-				></div>
+					id="sliderKnob"
+					class="slider-knob style-scope tp-yt-paper-slider"
+					style="left: 50%; touch-action: none"
+				>
+					<div
+						class="slider-knob-inner style-scope tp-yt-paper-slider"
+						value="50"
+					></div>
+				</div>
 			</div>
+			<dom-if class="style-scope tp-yt-paper-slider"
+				><template is="dom-if"></template></dom-if
+		></tp-yt-paper-slider>
+		<div
+			class="text style-scope ytmusic-menu-navigation-item-renderer"
+			id="ytmcustom-playback-speed"
+		>
+			Speed (<span id="playback-speed-value">1</span>)
 		</div>
-		<dom-if class="style-scope tp-yt-paper-slider"
-			><template is="dom-if"></template></dom-if
-	></tp-yt-paper-slider>
-
-	<div
-		class="text style-scope ytmusic-toggle-menu-service-item-renderer"
-		id="ytmcustom-playback-speed"
-	>
-		Speed (<span id="playback-speed-value">1</span>)
 	</div>
 </div>