diff --git a/src/components/OrganizationDashCards/CardItem.module.css b/src/components/OrganizationDashCards/CardItem.module.css index c329ab3c1b..da5feddf3e 100644 --- a/src/components/OrganizationDashCards/CardItem.module.css +++ b/src/components/OrganizationDashCards/CardItem.module.css @@ -4,7 +4,7 @@ align-items: center; background-color: #f1f3f68f; border-radius: 8px; - padding: 16px; + padding: 15px; margin-top: 20px; } @@ -15,7 +15,7 @@ display: flex; justify-content: center; align-items: center; - margin-left: 18px; + /* margin-right: 18px; */ } .cardItem .iconWrapper .themeOverlay { @@ -27,6 +27,7 @@ left: 0; opacity: 0.12; border-radius: 4px; + /* margin-right: 18px; */ } .cardItem .iconWrapper .dangerOverlay { @@ -48,7 +49,7 @@ word-wrap: break-word; overflow: hidden; display: -webkit-box; - -webkit-line-clamp: 2; + -webkit-line-clamp: 1; -webkit-box-orient: vertical; } @@ -74,5 +75,5 @@ .content { display: flex; flex-direction: column; - max-width: 60%; + max-width: 85%; } diff --git a/src/screens/OrganizationDashboard/OrganizationDashboard.module.css b/src/screens/OrganizationDashboard/OrganizationDashboard.module.css index 485200b1ae..b65b822c49 100644 --- a/src/screens/OrganizationDashboard/OrganizationDashboard.module.css +++ b/src/screens/OrganizationDashboard/OrganizationDashboard.module.css @@ -22,3 +22,6 @@ justify-content: center; align-items: center; } +.BottomRow { + margin-top: 45px; +} diff --git a/src/screens/OrganizationDashboard/OrganizationDashboard.tsx b/src/screens/OrganizationDashboard/OrganizationDashboard.tsx index 5205cae25b..dc3e0489a1 100644 --- a/src/screens/OrganizationDashboard/OrganizationDashboard.tsx +++ b/src/screens/OrganizationDashboard/OrganizationDashboard.tsx @@ -210,93 +210,6 @@ function organizationDashboard(): JSX.Element { )} - - - -
-
- {t('upcomingEvents')} -
- -
- - {loadingEvent ? ( - [...Array(4)].map((_, index) => { - return ; - }) - ) : upcomingEvents.length == 0 ? ( -
-
{t('noUpcomingEvents')}
-
- ) : ( - upcomingEvents.map( - (event: InterfaceQueryOrganizationEventListItem) => { - return ( - - ); - } - ) - )} -
-
- - - -
-
{t('latestPosts')}
- -
- - {loadingPost ? ( - [...Array(4)].map((_, index) => { - return ; - }) - ) : postData?.postsByOrganizationConnection.edges.length == - 0 ? ( - /* eslint-disable */ -
-
{t('noPostsPresent')}
-
- ) : ( - /* eslint-enable */ - postData?.postsByOrganizationConnection.edges - .slice(0, 5) - .map((post: any) => { - return ( - - ); - }) - )} -
-
- -
@@ -341,6 +254,91 @@ function organizationDashboard(): JSX.Element { + + + +
+
{t('upcomingEvents')}
+ +
+ + {loadingEvent ? ( + [...Array(4)].map((_, index) => { + return ; + }) + ) : upcomingEvents.length == 0 ? ( +
+
{t('noUpcomingEvents')}
+
+ ) : ( + upcomingEvents.map( + (event: InterfaceQueryOrganizationEventListItem) => { + return ( + + ); + } + ) + )} +
+
+ + + +
+
{t('latestPosts')}
+ +
+ + {loadingPost ? ( + [...Array(4)].map((_, index) => { + return ; + }) + ) : postData?.postsByOrganizationConnection.edges.length == + 0 ? ( + /* eslint-disable */ +
+
{t('noPostsPresent')}
+
+ ) : ( + /* eslint-enable */ + postData?.postsByOrganizationConnection.edges + .slice(0, 5) + .map((post: any) => { + return ( + + ); + }) + )} +
+
+ +
);