again

Author: sukhwinder33445

library/Notifications/Widget/TimeGrid/BaseGrid.php

@@ -429,7 +429,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 = ($this->getNoOfVisuallyConnectedHours() / 24 + 1) * - 1;
                 $colEnd = $gridBorderAt;
             } else {
                 $actualStart = Util::roundToNearestThirtyMinute($entry->getStart());

library/Notifications/Widget/Timeline/FutureEntry.php

@@ -19,19 +19,15 @@ public function getColor(int $transparency): string
 
     protected function assembleContainer(BaseHtmlElement $container): void
     {
-        /*$this
-            ->addHtml(new Icon('angle-right'))
-            ->addAttributes(new Attributes([
-                'class' => 'future',
-                'title' => $this->translate('rotation starts in the future')
-            ]));*/
-
-        $this->addAttributes(new Attributes(['class' => 'future-rotation-container']));
-
-        $container->addHtml(
-            new HtmlElement(
+        $container
+            ->addAttributes(new Attributes(['class' => 'future']))
+            ->addHtml(
+                new HtmlElement(
                 'div',
-                Attributes::create(['class' => 'future', 'title' =>  $this->translate('rotation starts in the future')]),
+                Attributes::create([
+                    'class' => 'badgeX',
+                    'title' => $this->translate('rotation starts in the future')
+                ]),
                 new Icon('angle-right')
             )
         );

public/css/timeline.less

@@ -59,19 +59,21 @@
         }
       }
 
-      &.future-rotation-container {
+      &.future {
         display: flex;
         justify-content: end;
+       // overflow: visible;
 
-        .future {
+        .badgeX {
           display: flex;
           align-items: center;
           justify-content: center;
 
           position: relative;
-          padding-left: 6px; // 2px before + 1px border + 2px after + 1px border
+          padding-left: 6px; // 4px before + 1px border + 2px after + 1px border
 
           width: 2em;
+          flex-shrink: 0;
 
           &:before,
           &:after {
@@ -82,12 +84,12 @@
             border-right: transparent;
             height: ~"calc(100% + 2px)"; // border top and bottom
             width: 100%;
-            left: 2px;
+            left: 4px; // 1px border + 3px distance
             .rounded-corners(0.25em);
           }
 
           &:after {
-            left: 5px; // 2px before + 1px border + 2px after
+            left: 7px; // 4px before + 1px border + 2px after
           }
         }
       }