From 695fa7d1b0815af5b3e6bcd4655eaa5ad726b4cb Mon Sep 17 00:00:00 2001
From: RachelElysia <71795832+RachelElysia@users.noreply.github.com>
Date: Fri, 2 Jun 2023 09:43:53 -0400
Subject: [PATCH] Fleet UI: Activity dashed lines to be variable length using
 grids (#12101)

---
 changes/issue-11773-activity-styling-fix      |  1 +
 .../ActivityItem/ActivityItem.tsx             |  1 +
 .../ActivityFeed/ActivityItem/_styles.scss    | 46 ++++++++++---------
 3 files changed, 26 insertions(+), 22 deletions(-)
 create mode 100644 changes/issue-11773-activity-styling-fix

diff --git a/changes/issue-11773-activity-styling-fix b/changes/issue-11773-activity-styling-fix
new file mode 100644
index 0000000000..6a035d2c8f
--- /dev/null
+++ b/changes/issue-11773-activity-styling-fix
@@ -0,0 +1 @@
+- Clean up dashed line styling on multiline activities
diff --git a/frontend/pages/DashboardPage/cards/ActivityFeed/ActivityItem/ActivityItem.tsx b/frontend/pages/DashboardPage/cards/ActivityFeed/ActivityItem/ActivityItem.tsx
index 35c47ffe57..b9d91ed740 100644
--- a/frontend/pages/DashboardPage/cards/ActivityFeed/ActivityItem/ActivityItem.tsx
+++ b/frontend/pages/DashboardPage/cards/ActivityFeed/ActivityItem/ActivityItem.tsx
@@ -629,6 +629,7 @@ const ActivityItem = ({
           </ReactTooltip>
         </p>
       </div>
+      <div className={`${baseClass}__dash`} />
     </div>
   );
 };
diff --git a/frontend/pages/DashboardPage/cards/ActivityFeed/ActivityItem/_styles.scss b/frontend/pages/DashboardPage/cards/ActivityFeed/ActivityItem/_styles.scss
index 007bc74db6..f6042f1980 100644
--- a/frontend/pages/DashboardPage/cards/ActivityFeed/ActivityItem/_styles.scss
+++ b/frontend/pages/DashboardPage/cards/ActivityFeed/ActivityItem/_styles.scss
@@ -1,34 +1,27 @@
 .activity-item {
-  display: flex;
-  flex-direction: row;
-  align-items: center;
-  padding-bottom: $pad-large;
+  display: grid; // Grid system is used to create variable dashed line lengths
+  grid-template-columns: 16px 16px 1fr;
+  grid-template-rows: 32px max-content;
 
   .avatar-wrapper {
-    position: relative;
+    grid-column-start: 1;
+    width: 32px;
+    height: 32px;
   }
 
-  &:before {
-    content: "";
-    position: relative;
-    height: 36px !important;
-    z-index: 0;
-    top: 35px;
-    left: 17px;
-    border-left: 1px dashed $ui-fleet-black-10;
-    height: 100%;
-  }
-
-  &:last-child:before {
-    border-left: 0;
-  }
-
-  &__avatar-image {
-    z-index: 2;
+  &__dash {
+    border-right: 1px dashed $ui-fleet-black-10;
+    grid-column-start: 1;
+    grid-row-start: 2;
+    grid-row-end: 3;
   }
 
   &__details {
+    grid-column-start: 3;
+    grid-row-start: 1;
+    grid-row-end: 3;
     padding-left: $pad-large;
+    padding-bottom: $pad-large;
 
     .premium-icon-tip {
       position: relative;
@@ -59,4 +52,13 @@
   &__show-query-icon {
     margin-left: $pad-xsmall;
   }
+
+  &:last-child {
+    .activity-item__dash {
+      border-right: none;
+    }
+    .activity-item__details {
+      padding-bottom: $pad-xxlarge;
+    }
+  }
 }