Fix merge conflicts and bring branch up to date

nasa · Aug 5, 2024 · 22a70c6 · 22a70c6
1 parent 4e260b8
commit 22a70c6
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 55 deletions.
diff --git a/src/plugins/timelist/timelist.scss b/src/plugins/timelist/timelist.scss
@@ -120,7 +120,9 @@
     grid-column-gap: $interiorMargin;
 
     &[s-selected] {
-      box-shadow: inset rgba($colorSelectedFg, 0.8) 0 0 0 1px;
+      box-shadow:
+        inset rgba($colorSelectedFg, 0.8) 0 0 0 1px,
+        $colorSelectedGlow 0 0 5px 1px;
       color: $colorSelectedFg !important;
 
       @include styleTliEm($colorSelectedFg);
@@ -134,21 +136,13 @@
       padding-top: 1px;
     }
 
-<<<<<<< HEAD
     &__activity-color-swatch {
       $d: 16px;
       border-radius: 50%;
       box-shadow: rgba(black, 0.3) 0 0 2px 1px;
       width: $d;
       height: $d;
     }
-=======
-        &[s-selected] {
-            box-shadow: 
-                inset rgba($colorSelectedFg, 0.8) 0 0 0 1px,
-                $colorSelectedGlow 0 0 5px 1px;
-            color: $colorSelectedFg !important;
->>>>>>> b457d8a2c (Add shadows to panes. Style changes to timelist. Shadows to object tree.)
 
     &__title-and-bounds {
       > * + * {

diff --git a/src/styles/notebook.scss b/src/styles/notebook.scss
@@ -591,51 +591,6 @@
 
     [class*='__item-description'] {
       min-width: 200px;
-    &__name,
-    &__link {
-        // Holds __link and __context-available
-        display: flex;
-        align-items: center;
-    }
-
-    &__link {
-        flex: 1 1 auto;
-
-        &:before {
-            display: block;
-            font-size: 1em;
-            margin-right: $interiorMarginSm;
-        }
-    }
-
-    &__context-available {
-        font-size: 0.7em;
-        margin-left: $interiorMarginSm;
-    }
-
-    &__snap-thumb {
-        @include snapThumb();
-    }
-
-    &__actions {
-        margin: $interiorMarginSm;
-    }
-
-    &__actions-menu {
-        width: 55vh;
-        max-width: 500px;
-        height: 130px;
-        z-index: 70;
-
-        [class*='__icon'] {
-            filter: $colorKeyFilter;
-            margin: 0%;
-            height: 4vh;
-        }
-
-        [class*='__item-description'] {
-            min-width: 200px;
-        }
     }
   }
 }
@@ -947,4 +902,4 @@ body.mobile {
   &__name:focus {
     text-overflow: clip;
   }
-}
+}