From f47be86df3471390ad119856020fe81a025822b0 Mon Sep 17 00:00:00 2001
From: DebaucheryLibrarian <moonloop.adult@protonmail.com>
Date: Wed, 24 Mar 2021 17:17:51 +0100
Subject: [PATCH] Added scroll events to inner content divs to sync tooltips
 with page. Including actor heart button on stash page. Fixed stash scene
 preview title overflow.

---
 assets/components/actors/actor.vue        |  5 +++-
 assets/components/container/warning.vue   |  2 +-
 assets/components/entities/entity.vue     |  5 +++-
 assets/components/releases/release.vue    | 28 +++++++++++------------
 assets/components/tags/tag.vue            |  5 +++-
 assets/components/tooltip/tooltip.vue     |  1 +
 assets/components/users/scene-preview.vue |  3 +++
 assets/index.ejs                          |  2 +-
 assets/js/stashes/actions.js              |  3 ++-
 9 files changed, 34 insertions(+), 20 deletions(-)

diff --git a/assets/components/actors/actor.vue b/assets/components/actors/actor.vue
index feb02ae2..2b366b71 100644
--- a/assets/components/actors/actor.vue
+++ b/assets/components/actors/actor.vue
@@ -42,7 +42,10 @@
 			/>
 		</div>
 
-		<div class="content-inner actor-inner">
+		<div
+			class="content-inner actor-inner"
+			@scroll="events.emit('scroll', $event)"
+		>
 			<div
 				class="profile"
 				:class="{ expanded: bioExpanded, 'with-avatar': !!actor.avatar }"
diff --git a/assets/components/container/warning.vue b/assets/components/container/warning.vue
index 95aa2a8b..99015f91 100644
--- a/assets/components/container/warning.vue
+++ b/assets/components/container/warning.vue
@@ -170,7 +170,7 @@ export default {
 			position: absolute;
 			z-index: -1;
 			border-radius: 1.1rem;
-			filter: blur(.5rem);
+			filter: blur(.25rem);
 			transition: filter .2s ease;
 		}
 	}
diff --git a/assets/components/entities/entity.vue b/assets/components/entities/entity.vue
index 0ae57814..16dbd9dd 100644
--- a/assets/components/entities/entity.vue
+++ b/assets/components/entities/entity.vue
@@ -75,7 +75,10 @@
 			</router-link>
 		</div>
 
-		<div class="content-inner">
+		<div
+			class="content-inner"
+			@scroll="events.emit('scroll', $event)"
+		>
 			<Scroll
 				v-if="entity.children.length > 0"
 				v-slot="scroll"
diff --git a/assets/components/releases/release.vue b/assets/components/releases/release.vue
index e278102c..69473276 100644
--- a/assets/components/releases/release.vue
+++ b/assets/components/releases/release.vue
@@ -75,20 +75,6 @@
 				:tags="release.tags"
 			/>
 
-			<div
-				v-if="release.directors && release.directors.length > 0"
-				class="row"
-			>
-				<span class="row-label">Director</span>
-
-				<router-link
-					v-for="director in release.directors"
-					:key="`director-${director.id}`"
-					class="link director"
-					:to="`/director/${director.id}/${director.slug}`"
-				>{{ director.name }}</router-link>
-			</div>
-
 			<div
 				v-if="release.movies && release.movies.length > 0"
 				class="row"
@@ -117,6 +103,20 @@
 				:releases="release.scenes"
 			/>
 
+			<div
+				v-if="release.directors && release.directors.length > 0"
+				class="row"
+			>
+				<span class="row-label">Director</span>
+
+				<router-link
+					v-for="director in release.directors"
+					:key="`director-${director.id}`"
+					class="link director"
+					:to="`/director/${director.id}/${director.slug}`"
+				>{{ director.name }}</router-link>
+			</div>
+
 			<div
 				v-if="release.description"
 				class="row"
diff --git a/assets/components/tags/tag.vue b/assets/components/tags/tag.vue
index 4dd30aad..d3e89c3d 100644
--- a/assets/components/tags/tag.vue
+++ b/assets/components/tags/tag.vue
@@ -10,7 +10,10 @@
 			</h2>
 		</div>
 
-		<div class="content-inner">
+		<div
+			class="content-inner"
+			@scroll="events.emit('scroll', $event)"
+		>
 			<div
 				v-if="description"
 				class="description header-description"
diff --git a/assets/components/tooltip/tooltip.vue b/assets/components/tooltip/tooltip.vue
index 28822fa3..991f8b65 100644
--- a/assets/components/tooltip/tooltip.vue
+++ b/assets/components/tooltip/tooltip.vue
@@ -117,6 +117,7 @@ function mounted() {
 	});
 
 	this.events.on('scroll', () => {
+		console.log('scroll!');
 		this.calculate();
 	});
 }
diff --git a/assets/components/users/scene-preview.vue b/assets/components/users/scene-preview.vue
index dfe1b6be..2fe60bc2 100644
--- a/assets/components/users/scene-preview.vue
+++ b/assets/components/users/scene-preview.vue
@@ -81,6 +81,9 @@ export default {
 
 .scene-title {
 	padding: .25rem .5rem;
+	white-space: nowrap;
+	overflow: hidden;
+	text-overflow: ellipsis;
 }
 
 .scene-actors {
diff --git a/assets/index.ejs b/assets/index.ejs
index 9d716fd3..d68248c2 100644
--- a/assets/index.ejs
+++ b/assets/index.ejs
@@ -3,7 +3,7 @@
     <head>
         <meta charset="UTF-8">
         <meta name="viewport" content="width=device-width,height=device-height,initial-scale=1,maximum-scale=1,user-scalable=no">
-		<meta name="theme-color" content="#ff6c88">
+		<meta name="theme-color" content="#ff2288">
 
         <title>traxxx</title>
 
diff --git a/assets/js/stashes/actions.js b/assets/js/stashes/actions.js
index 6ea15513..093781ca 100644
--- a/assets/js/stashes/actions.js
+++ b/assets/js/stashes/actions.js
@@ -5,7 +5,7 @@ import {
 	patch,
 } from '../api';
 
-import { releaseFields } from '../fragments';
+import { releaseFields, actorStashesFields } from '../fragments';
 import { curateStash } from '../curate';
 
 function initStashesActions(store, _router) {
@@ -52,6 +52,7 @@ function initStashesActions(store, _router) {
 								width
 								height
 							}
+							${actorStashesFields}
 						}
 					}
 					scenes: stashesScenes {