interim

RocketCommunicationsInc · May 7, 2024 · c190b9a · c190b9a
1 parent 7890d19
commit c190b9a
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 6 deletions.
diff --git a/packages/web-components/src/components/rux-timeline/rux-ruler/rux-ruler.scss b/packages/web-components/src/components/rux-timeline/rux-ruler/rux-ruler.scss
@@ -10,7 +10,7 @@
     display: flex;
     align-items: center;
     padding: 12px 20px;
-    justify-content: center;
+    justify-content: var(--ruler-text-placement);
 }
 
 .ruler-time.has-date-scroll {

diff --git a/packages/web-components/src/components/rux-timeline/rux-ruler/rux-ruler.tsx b/packages/web-components/src/components/rux-timeline/rux-ruler/rux-ruler.tsx
@@ -78,6 +78,7 @@ export class RuxRuler {
         //Set Last Column
         let unitOfTime = 60
         const end = unitOfTime * this.firstNewDay! + 2
+        console.log(prevDay)
 
         return (
             <span
@@ -95,14 +96,13 @@ export class RuxRuler {
     timePattern = /^00:.+$/
 
     shouldShowDate(time: string) {
-        if (this.interval !== 'hour') {
+        if (!['hour', 'minute'].includes(this.interval)) {
             return false
         }
 
         if (!this.showStartOfDay) {
             return false
         }
-
         return this.timePattern.test(time)
     }
 
@@ -129,7 +129,9 @@ export class RuxRuler {
                                             ),
                                             'has-date-scroll':
                                                 (this.showStartOfDay &&
-                                                    this.interval === 'hour') ||
+                                                    ['hour', 'minute'].includes(
+                                                        this.interval
+                                                    )) ||
                                                 false,
                                         }}
                                         style={{
@@ -157,8 +159,7 @@ export class RuxRuler {
                         }
                     )}
                     {this.showStartOfDay &&
-                    this.interval === 'hour' &&
-                    this.firstNewDay
+                    ['hour', 'minute'].includes(this.interval)
                         ? this.getPartialDay()
                         : null}
                 </div>

diff --git a/packages/web-components/src/components/rux-timeline/rux-timeline.scss b/packages/web-components/src/components/rux-timeline/rux-timeline.scss
@@ -47,10 +47,12 @@
     }
 
     --grid-line-color: transparent;
+    --ruler-text-placement: start;
 }
 
 :host([show-grid]) {
     --grid-line-color: var(--color-background-base-default);
+    --ruler-text-placement: center;
 }
 
 .rux-timeline {