From df1de94147eae93ecfe556629fb68daac1211241 Mon Sep 17 00:00:00 2001
From: Nikita Krupin <krupin.nikita0110@gmail.com>
Date: Fri, 13 May 2022 15:54:14 -0400
Subject: [PATCH] comment theming tweaks, hide search button on settings page
 ''

---
 .../Comments/commentThreadRenderer.vue        | 17 ++++++----
 .../Comments/commentsHeaderRenderer.vue       | 31 ++++++++++---------
 .../Comments/mainCommentRenderer.vue          |  6 ++--
 NUXT/components/dialogBase.vue                |  2 +-
 NUXT/components/topNavigation.vue             |  3 +-
 NUXT/pages/index.vue                          |  3 +-
 NUXT/pages/mods/theme.vue                     |  4 +--
 7 files changed, 37 insertions(+), 29 deletions(-)

diff --git a/NUXT/components/Comments/commentThreadRenderer.vue b/NUXT/components/Comments/commentThreadRenderer.vue
index a4b8f5d..97de7b1 100644
--- a/NUXT/components/Comments/commentThreadRenderer.vue
+++ b/NUXT/components/Comments/commentThreadRenderer.vue
@@ -1,8 +1,8 @@
 <template>
   <div
+    v-if="commentRenderer"
     v-ripple
     class="comment-thread px-3"
-    v-if="commentRenderer"
     @click="$emit('showReplies', comment)"
   >
     <a
@@ -26,7 +26,13 @@
       <div class="comment-content--header subtitle-2">
         <div
           class="author-badge-name mr-1"
-          :class="{ owner: commentRenderer.authorIsChannelOwner }"
+          :class="
+            commentRenderer.authorIsChannelOwner
+              ? $vuetify.theme.dark
+                ? 'owner background lighten-2'
+                : 'owner primary lighten-3'
+              : ''
+          "
         >
           <div class="author-name--wrapper">
             <span class="font-weight-bold author-name" v-emoji>
@@ -162,13 +168,12 @@
 }
 
 .owner {
-  padding: 0 0.6em;
-  background-color: #888888;
-  color: #fff;
+  color: var(--v-primary-base);
   border-radius: 1em;
+  padding: 0 0.3em 0 0.6em;
 
   &::v-deep .author-badge {
-    color: #fff;
+    color: var(--v-primary-base);
   }
 }
 
diff --git a/NUXT/components/Comments/commentsHeaderRenderer.vue b/NUXT/components/Comments/commentsHeaderRenderer.vue
index f377683..a9be4a7 100644
--- a/NUXT/components/Comments/commentsHeaderRenderer.vue
+++ b/NUXT/components/Comments/commentsHeaderRenderer.vue
@@ -22,6 +22,22 @@
   </div>
 </template>
 
+<script>
+export default {
+  props: ["comment"],
+
+  data() {
+    return {
+      boxRenderer: null,
+    };
+  },
+
+  mounted() {
+    this.boxRenderer = this.comment?.createRenderer?.commentSimpleboxRenderer;
+  },
+};
+</script>
+
 <style scoped>
 .entry {
   width: 100%; /* Prevent Loading Weirdness */
@@ -44,18 +60,3 @@
 }
 </style>
 
-<script>
-export default {
-  props: ["comment"],
-
-  data() {
-    return {
-      boxRenderer: null,
-    };
-  },
-
-  mounted() {
-    this.boxRenderer = this.comment?.createRenderer?.commentSimpleboxRenderer;
-  },
-};
-</script>
diff --git a/NUXT/components/Comments/mainCommentRenderer.vue b/NUXT/components/Comments/mainCommentRenderer.vue
index dd615f0..605084e 100644
--- a/NUXT/components/Comments/mainCommentRenderer.vue
+++ b/NUXT/components/Comments/mainCommentRenderer.vue
@@ -20,23 +20,23 @@
       :key="index"
       class="commentElement"
     >
+      <v-divider v-if="getComponents()[Object.keys(comment)[0]]"></v-divider>
       <v-list-item class="px-0">
         <component
-          v-if="getComponents()[Object.keys(comment)[0]]"
           :is="Object.keys(comment)[0]"
+          v-if="getComponents()[Object.keys(comment)[0]]"
           :comment="comment[Object.keys(comment)[0]]"
           @intersect="paginate"
           @showReplies="openReply"
         ></component>
       </v-list-item>
-      <v-divider v-if="getComponents()[Object.keys(comment)[0]]"></v-divider>
     </div>
 
     <div class="loading" v-if="loading">
       <v-sheet
-        color="background"
         v-for="i in comments.length <= 0 ? 5 : 1"
         :key="i"
+        color="background"
       >
         <v-skeleton-loader type="list-item-avatar-three-line" />
       </v-sheet>
diff --git a/NUXT/components/dialogBase.vue b/NUXT/components/dialogBase.vue
index 34f4a68..c0eac48 100644
--- a/NUXT/components/dialogBase.vue
+++ b/NUXT/components/dialogBase.vue
@@ -4,7 +4,7 @@
       <v-toolbar color="background" flat>
         <slot name="header"></slot>
       </v-toolbar>
-      <v-divider></v-divider>
+      <!-- <v-divider></v-divider> -->
     </div>
     <div class="dialog-body background">
       <slot></slot>
diff --git a/NUXT/components/topNavigation.vue b/NUXT/components/topNavigation.vue
index 50600be..fd4f96a 100644
--- a/NUXT/components/topNavigation.vue
+++ b/NUXT/components/topNavigation.vue
@@ -18,7 +18,7 @@
       dense
       flat
       label="Search"
-      style="margin-top: 1px"
+      style="margin-top: 7px"
       :background-color="
         $vuetify.theme.dark ? 'background lighten-1' : 'background darken-1'
       "
@@ -40,6 +40,7 @@
       <v-icon>mdi-refresh</v-icon>
     </v-btn>
     <v-btn
+      v-if="$route.name !== 'settings'"
       icon
       tile
       class="ml-3 my-auto fill-height"
diff --git a/NUXT/pages/index.vue b/NUXT/pages/index.vue
index 761416f..bf2f41e 100644
--- a/NUXT/pages/index.vue
+++ b/NUXT/pages/index.vue
@@ -50,8 +50,9 @@ export default {
           this.$vuetify.theme.currentTheme.background,
           this.$vuetify.theme.dark
         );
-        // this.$vuetube.statusBar.setTransparent();
+
         // this.$vuetube.navigationBar.setTransparent();
+        // this.$vuetube.statusBar.setTransparent();
         resolve();
       }, 0)
     );
diff --git a/NUXT/pages/mods/theme.vue b/NUXT/pages/mods/theme.vue
index 9a8dc5b..e8d1555 100644
--- a/NUXT/pages/mods/theme.vue
+++ b/NUXT/pages/mods/theme.vue
@@ -108,8 +108,8 @@
         v-model="pickerState"
         width="300"
         content-class="background"
-        :style="{
-          borderRadius: `${$store.state.tweaks.roundTweak / 2}rem`,
+        :content-style="{
+          borderRadius: `${$store.state.tweaks.roundTweak / 2}rem !important`,
         }"
       >
         <v-color-picker