Merge branch 'preprod'

dascritch · Feb 9, 2021 · 92922ed · 92922ed
2 parents f2e0263 + 0118905
commit 92922ed
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 22 deletions.
diff --git a/dist/cpu-audio.js b/dist/cpu-audio.js
diff --git a/dist/cpu-audio.js.map b/dist/cpu-audio.js.map
diff --git a/src/30_trigger.js b/src/30_trigger.js
@@ -621,12 +621,12 @@ const trigger = {
 	 */
 	native_share : function(event) {
 		let dataset = document.CPU.find_container(event.target).fetch_audiotag_dataset();;
-		event.preventDefault();
 		navigator.share({
 			'title': dataset.title,
 			'text': dataset.title,
 			'url': dataset.canonical
 		});
+		event.preventDefault();
 	},
 
 	_show_alternate_nav : null,

diff --git a/src/scoped.css b/src/scoped.css
@@ -37,8 +37,6 @@
 				color var(--cpu-color-transitions),
 				background-color var(--cpu-background-transitions),
 				opacity var(--cpu-background-transitions);
-	--focus-bg : var(--cpu-focus-background, var(--cpu-color));
-	--focus-cl : var(--cpu-focus-color, var(--cpu-background));
 }
 
 .show-no main {
@@ -66,10 +64,6 @@ svg {
 	height : var(--cpu-height);
 }
 
-a:hover, a:focus, button:hover, button:focus {
-	color : var(--focus-cl);
-	background : var(--focus-bg);
-}
 
 i, em {
 	font-style: italic;
@@ -315,10 +309,6 @@ aside.ticker a.active-cue span {
 	display : inline-block;
 }
 
-.with-preview {
-	color: var(--focus-cl) !important;
-	background : white !important;
-}
 
 .act-loading #loadingline {
 	background : repeating-linear-gradient(45deg, var(--cpu-color) 0, var(--cpu-background) 15px, var(--cpu-color) 30px);
@@ -374,10 +364,6 @@ aside.ticker a.active-cue span {
 	text-overflow : clip;
 }
 
-#pageshare a:hover, #pageshare a:focus, #pageshare div:hover {
-	color : var(--focus-cl);
-	background : var(--focus-bg);
-}
 
 #pageshare svg {
 	vertical-align : middle;
@@ -457,10 +443,6 @@ h6 {
 	margin : 0px;
 	padding : 2px
 }
-.active-cue {
-	background : var(--focus-cl);
-	color : var(--focus-bg) !important; /* dirty but fastest */
-}
 
 .cue strong {
 	flex : 1 1;
@@ -586,4 +568,12 @@ aside a, h6, .cue time
 	#interface {
 		display : none;
 	}
+}
+
+a:hover, a:focus, button:hover, button:focus,
+#pageshare div:hover ,
+.active-cue, /* can now ride off its !important on color */
+.with-preview /* !important still needed to simplify css */ {
+	background: var(--cpu-focus-background, var(--cpu-color)) !important;
+	color : var(--cpu-focus-color, var(--cpu-background)) !important;
 }