From 081eeb8a1f0ef8fa1f6f579b5d566f684a39b64e Mon Sep 17 00:00:00 2001
From: Rukmini Bose <rukmini.bose15@gmail.com>
Date: Mon, 3 Oct 2022 18:14:32 -0700
Subject: [PATCH] Fix scroll and snow theme colors

---
 .../notebook/components/NotebookEntry.vue     | 53 ++++++++++---------
 src/styles/notebook.scss                      | 12 +++--
 2 files changed, 36 insertions(+), 29 deletions(-)

diff --git a/src/plugins/notebook/components/NotebookEntry.vue b/src/plugins/notebook/components/NotebookEntry.vue
index a4cfef52b1..b76e6a2239 100644
--- a/src/plugins/notebook/components/NotebookEntry.vue
+++ b/src/plugins/notebook/components/NotebookEntry.vue
@@ -30,16 +30,27 @@
     @drop.prevent="dropOnEntry"
 >
     <div class="c-ne__time-and-content">
-        <div class="c-ne__time-and-creator">
+        <div class="c-ne__time-and-creator-and-delete">
             <span class="c-ne__created-date">{{ createdOnDate }}</span>
             <span class="c-ne__created-time">{{ createdOnTime }}</span>
-
             <span
                 v-if="entry.createdBy"
                 class="c-ne__creator"
             >
                 <span class="icon-person"></span> {{ entry.createdBy }}
             </span>
+            <span
+                v-if="!readOnly && !isLocked"
+                class="c-ne__local-controls--hidden"
+            >
+                <button
+                    class="c-ne__remove c-icon-button c-icon-button--major icon-trash"
+                    title="Delete this entry"
+                    tabindex="-1"
+                    @click="deleteEntry"
+                >
+                </button>
+            </span>
         </div>
         <div class="c-ne__content">
             <template v-if="readOnly && result">
@@ -89,36 +100,26 @@
                 :target-specific-details="{entryId: entry.id}"
                 @tags-updated="timestampAndUpdate"
             />
-
             <div
-                ref="embedsWrapper"
-                class="c-snapshots c-ne__embeds-wrapper"
                 :class="{scrollContainer: enableEmbedsWrapperScroll }"
             >
-                <NotebookEmbed
-                    v-for="embed in entry.embeds"
-                    ref="embeds"
-                    :key="embed.id"
-                    :embed="embed"
-                    :is-locked="isLocked"
-                    @removeEmbed="removeEmbed"
-                    @updateEmbed="updateEmbed"
-                />
+                <div
+                    ref="embedsWrapper"
+                    class="c-snapshots c-ne__embeds-wrapper"
+                >
+                    <NotebookEmbed
+                        v-for="embed in entry.embeds"
+                        ref="embeds"
+                        :key="embed.id"
+                        :embed="embed"
+                        :is-locked="isLocked"
+                        @removeEmbed="removeEmbed"
+                        @updateEmbed="updateEmbed"
+                    />
+                </div>
             </div>
         </div>
     </div>
-    <div
-        v-if="!readOnly && !isLocked"
-        class="c-ne__local-controls--hidden"
-    >
-        <button
-            class="c-icon-button c-icon-button--major icon-trash"
-            title="Delete this entry"
-            tabindex="-1"
-            @click="deleteEntry"
-        >
-        </button>
-    </div>
     <div
         v-if="readOnly"
         class="c-ne__section-and-page"
diff --git a/src/styles/notebook.scss b/src/styles/notebook.scss
index 2dc86aa38d..7899b0a651 100644
--- a/src/styles/notebook.scss
+++ b/src/styles/notebook.scss
@@ -31,7 +31,6 @@
     // Class for overflow embeds (possibly for text entry overflow in future)
     background: $scrollContainer;
     box-shadow: inset 0 3px 4px rgb(0 0 0 / 40%);
-    overflow-y: scroll;
     border-radius: $controlCr;
 
 }
@@ -303,7 +302,7 @@
         opacity: 0.7;
     }
 
-    &__time-and-creator,
+    &__time-and-creator-and-delete,
     &__input {
         padding: $p;
     }
@@ -332,9 +331,10 @@
     }
 
     &__content {
-        display: flex;
+        display: inline-flex;
         flex-direction: column;
         flex: 1 1 auto;
+        margin-right: $interiorMarginSm;
 
         > [class*="__"] + [class*="__"] {
             margin-top: $interiorMarginSm;
@@ -394,8 +394,13 @@
             opacity: 0.7;
         }
     }
+
+    &__remove{
+        float: right;
+    }
 }
 
+
 /****************************** EMBEDS */
 @mixin snapThumb() {
     // LEGACY: TODO: refactor when .snap-thumb in New Entry dialog is refactored
@@ -718,6 +723,7 @@ body.mobile {
     .c-notebook__entry {
         [class*="local-controls"] {
             display: none;
+            height: fit-content;
         }
     }