once again

Author: sukhwinder33445

library/Notifications/Widget/TimeGrid/BaseGrid.php

@@ -427,9 +427,7 @@ final protected function yieldFixedEntries(Traversable $entries): Generator
             }
 
             if ($entry instanceof FutureEntry) {
-                // (no. of days * - 2) - 1, example: 7 days (week) = -15
-                $colStart = (($this->getNoOfVisuallyConnectedHours() / 24) * - 2) - 1;
-                //$colStart = ($this->getNoOfVisuallyConnectedHours() / 24 + 1) * - 1;
+                $colStart = 1;
                 $colEnd = $gridBorderAt;
             } else {
                 $actualStart = Util::roundToNearestThirtyMinute($entry->getStart());

library/Notifications/Widget/Timeline/FutureEntry.php

@@ -14,22 +14,22 @@ class FutureEntry extends Entry
 {
     public function getColor(int $transparency): string
     {
-        return sprintf('~"hsl(%d %d%% 50%% / %d%%)"', 166, 90, $transparency);
+        return sprintf('~"hsl(166 90%% 50%% / %d%%)"', $transparency);
     }
 
     protected function assembleContainer(BaseHtmlElement $container): void
     {
-        $container
-            ->addAttributes(new Attributes(['class' => 'future']))
-            ->addHtml(
-                new HtmlElement(
-                'div',
-                Attributes::create([
-                    'class' => 'badgeX',
-                    'title' => $this->translate('rotation starts in the future')
-                ]),
-                new Icon('angle-right')
-            )
+        $futureBadge = new HtmlElement(
+            'div',
+            new Attributes([
+                'title' => $this->translate('Rotation starts in the future'),
+                $container->getAttributes()->get('class')
+            ]),
+            new Icon('angle-right')
         );
+
+        $container
+            ->setAttribute('class' , 'future-entry') // override the default class
+            ->addHtml($futureBadge);
     }
 }

public/css/timeline.less

@@ -44,33 +44,34 @@
       }
     }
 
-    .overlay .entry {
-      margin-top: 1em;
-      margin-bottom: 1em;
-
-      .title {
-        height: 100%;
-        flex-wrap: nowrap;
-        align-items: baseline;
-        padding: .15em .5em;
-
-        .name {
-          .text-ellipsis();
+    .overlay {
+      .entry {
+        margin-top: 1em;
+        margin-bottom: 1em;
+
+        .title {
+          height: 100%;
+          flex-wrap: nowrap;
+          align-items: baseline;
+          padding: .15em .5em;
+
+          .name {
+            .text-ellipsis();
+          }
         }
       }
 
-      &.future {
+      .future-entry {
         display: flex;
         justify-content: end;
-       // overflow: visible;
 
-        .badgeX {
+        .entry {
           display: flex;
           align-items: center;
           justify-content: center;
 
           position: relative;
-          padding-left: 6px; // 4px before + 1px border + 2px after + 1px border
+          padding-left: 6px; // 2px before + 1px border + 2px after + 1px border
 
           width: 2em;
           flex-shrink: 0;
@@ -84,12 +85,12 @@
             border-right: transparent;
             height: ~"calc(100% + 2px)"; // border top and bottom
             width: 100%;
-            left: 4px; // 1px border + 3px distance
+            left: 2px;
             .rounded-corners(0.25em);
           }
 
           &:after {
-            left: 7px; // 4px before + 1px border + 2px after
+            left: 5px; // 2px before + 1px border + 2px after
           }
         }
       }