From 9a82f907bb9d7ea495e2d0840b8ec6446d820b49 Mon Sep 17 00:00:00 2001
From: Nikita Krupin <krupin.nikita0110@gmail.com>
Date: Thu, 31 Mar 2022 20:15:13 -0400
Subject: [PATCH] prev commits close #91, close #209, close #99, close #139

---
 NUXT/layouts/default.vue | 14 ++++++++++----
 NUXT/pages/watch.vue     | 10 +++++-----
 2 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/NUXT/layouts/default.vue b/NUXT/layouts/default.vue
index a692ba7..28af6b6 100644
--- a/NUXT/layouts/default.vue
+++ b/NUXT/layouts/default.vue
@@ -12,6 +12,7 @@
     <div style="height: 100%; margin-top: 4rem">
       <div
         v-show="!search"
+        class="scrollcontainer"
         style="overflow: hidden; height: calc(100vh - 8rem)"
         :style="{
           borderRadius: `${roundTweak / 2}rem`,
@@ -26,7 +27,8 @@
 
       <div
         v-show="search"
-        style="padding: 0; overflow: hidden; height: calc(100vh - 4rem)"
+        class="scrollcontainer"
+        style="overflow: hidden; height: calc(100vh - 4rem)"
       >
         <div class="scroll-y" style="height: 100%">
           <div v-if="search" style="min-width: 180px">
@@ -150,13 +152,17 @@ export default {
   opacity: 0 !important;
 }
 
+.scrollcontainer {
+  overflow: hidden;
+  /* ios notch & gesture nav */
+  padding: env(safe-area-inset-top) env(safe-area-inset-right)
+    env(safe-area-inset-bottom) env(safe-area-inset-left) !important;
+}
+
 .scroll-y {
   overflow-y: scroll !important; /* has to be scroll, not auto */
   overflow-x: hidden !important;
   -webkit-overflow-scrolling: touch !important;
-  /* ios notch & gesture nav */
-  margin: env(safe-area-inset-top) env(safe-area-inset-right)
-    env(safe-area-inset-bottom) env(safe-area-inset-left) !important;
 }
 html,
 body {
diff --git a/NUXT/pages/watch.vue b/NUXT/pages/watch.vue
index 05416af..9193aea 100644
--- a/NUXT/pages/watch.vue
+++ b/NUXT/pages/watch.vue
@@ -1,14 +1,14 @@
 <template>
   <div class="background">
-
     <!--   Stock Player   -->
-    <videoPlayer :vid-src="vidSrc" />
+    <videoPlayer
+      style="position: sticky; top: 0; z-index: 696969"
+      :vid-src="vidSrc"
+    />
 
     <!--   VueTube Player V1   -->
     <!-- <VTPlayerV1 :sources="sources" v-if="sources.length > 0" />-->
 
-
-
     <v-card v-if="loaded" class="ml-2 mr-2 background" flat>
       <v-card-title
         class="mt-2"
@@ -95,7 +95,7 @@
 import { Share } from "@capacitor/share";
 import ShelfRenderer from "~/components/SectionRenderers/shelfRenderer.vue";
 import VidLoadRenderer from "~/components/vidLoadRenderer.vue";
-import SlimVideoDescriptionRenderer from '~/components/UtilRenderers/slimVideoDescriptionRenderer.vue';
+import SlimVideoDescriptionRenderer from "~/components/UtilRenderers/slimVideoDescriptionRenderer.vue";
 
 export default {
   components: { ShelfRenderer, VidLoadRenderer, SlimVideoDescriptionRenderer },