Merge pull request #8456 from ever-co/fix/align-date

[Fix] No wrap timespan sreenshots item
ever-co · Oct 18, 2024 · e3c2753 · e3c2753
2 parents 010c025 + af426cb
commit e3c2753
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 19 deletions.
diff --git a/...ore/shared/src/lib/timesheet/screenshots/screenshots-item/screenshots-item.component.html b/...ore/shared/src/lib/timesheet/screenshots/screenshots-item/screenshots-item.component.html
@@ -93,8 +93,10 @@
 		</ng-template>
 		<div class="slot-info text-left p-3">
 			<div class="time-span mb-4 mt-1 hour-label">
-				{{ timeSlot.startedAt | utcToTimezone : timezone | timeFormat : this.timeFormat }} -
-				{{ timeSlot.stoppedAt | utcToTimezone : timezone | timeFormat : this.timeFormat }}
+				<div class="inline-time-span">
+					{{ timeSlot.startedAt | utcToTimezone : timezone | timeFormat : this.timeFormat }} -
+					{{ timeSlot.stoppedAt | utcToTimezone : timezone | timeFormat : this.timeFormat }}
+				</div>
 				<div class="text-caption caption mt-2">
 					{{ timeSlot.startedAt | utcToTimezone : timezone | dateFormat }}
 				</div>

diff --git a/...ore/shared/src/lib/timesheet/screenshots/screenshots-item/screenshots-item.component.scss b/...ore/shared/src/lib/timesheet/screenshots/screenshots-item/screenshots-item.component.scss
@@ -20,9 +20,9 @@
     &:hover {
       box-shadow: 0px 36px 18px -24px rgba(0, 0, 0, 0.15);
     }
-	&.danger-bordered {
-		border: 2px solid nb-theme(color-danger-500) !important;
-	}
+    &.danger-bordered {
+      border: 2px solid nb-theme(color-danger-500) !important;
+    }
   }
   .curser-pointer {
     cursor: pointer;
@@ -116,7 +116,7 @@
       }
     }
   }
-  .no-activity{
+  .no-activity {
     background-color: var(--gauzy-sidebar-background-4);
     border-radius: var(--border-radius);
   }
@@ -130,13 +130,13 @@
 }
 
 ::ng-deep {
-	.cdk-overlay-container {
-		nb-overlay-container {
-			nb-list {
-				overflow: hidden !important;
-			}
-		}
-	}
+  .cdk-overlay-container {
+    nb-overlay-container {
+      nb-list {
+        overflow: hidden !important;
+      }
+    }
+  }
 }
 
 .slot-info {
@@ -147,10 +147,15 @@
   text-align: left;
 
   .caption {
-		font-size: 11px;
-		font-weight: 400;
-		line-height: 11px;
-		letter-spacing: 0em;
-		color: var(--gauzy-text-color-2);
-	}
+    font-size: 11px;
+    font-weight: 400;
+    line-height: 11px;
+    letter-spacing: 0em;
+    color: var(--gauzy-text-color-2);
+  }
+
+  .inline-time-span {
+    white-space: nowrap;
+    font-size: 0.75rem;
+  }
 }