Elgato_dark/fleet
1
0
Fork 0
mirror of https://github.com/fleetdm/fleet synced 2026-05-23 17:08:53 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 83

Spiffier activity feed with line (#1594)

Browse source
This commit is contained in:
RachelElysia 2021-08-09 16:53:41 -04:00 committed by GitHub
parent 5b5dca32e9
commit e99dee52ec
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 26 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
frontend/pages/Homepage/ActivityFeed/ActivityFeed.tsx
View file

@ -143,14 +143,17 @@ const ActivityFeed = (): JSX.Element => {
);
};
const renderActivities = activities.map((activity: IActivity, i: number) =>
renderActivityBlock(activity, i)
);
return (
<div className={baseClass}>
{isLoadingError && renderError()}
{!isLoadingError && !isLoading && isEmpty(activities)
? renderNoActivities()
: activities.map((activity: IActivity, i: number) =>
renderActivityBlock(activity, i)
)}
{!isLoadingError && !isLoading && isEmpty(activities) ? (
renderNoActivities()
) : (
<div>{renderActivities}</div>
)}
{isLoading && <Spinner />}
{!isLoadingError && !isEmpty(activities) && showMore && (
<Button

18
frontend/pages/Homepage/ActivityFeed/_styles.scss
View file

@ -9,12 +9,30 @@
padding-bottom: $pad-large;
}
&__block:before {
content: "";
position: relative;
height: 50px !important;
z-index: 0;
top: 35px;
left: 17px;
border-left: 1px dashed $ui-fleet-blue-15;
height: 100%;
}
&__block:last-child:before {
border-left: 0;
}
&__avatar-frame {
display: flex;
width: 32px;
height: 32px;
}
&__avatar-image {
z-index: 2;
}
&__details {
padding-left: $pad-large;