diff --git a/app/soapbox/features/admin/components/dashcounter.tsx b/app/soapbox/features/admin/components/dashcounter.tsx index 1ad43b5e0..a42986535 100644 --- a/app/soapbox/features/admin/components/dashcounter.tsx +++ b/app/soapbox/features/admin/components/dashcounter.tsx @@ -45,7 +45,7 @@ interface IDashCounters { /** Wrapper container for dash counters. */ const DashCounters: React.FC = ({ children }) => { return ( -
+
{children}
); diff --git a/app/soapbox/features/admin/tabs/dashboard.tsx b/app/soapbox/features/admin/tabs/dashboard.tsx index 6bd77bad2..66037845e 100644 --- a/app/soapbox/features/admin/tabs/dashboard.tsx +++ b/app/soapbox/features/admin/tabs/dashboard.tsx @@ -2,6 +2,8 @@ import React from 'react'; import { FormattedMessage } from 'react-intl'; import { getSubscribersCsv, getUnsubscribersCsv, getCombinedCsv } from 'soapbox/actions/email-list'; +import List, { ListItem } from 'soapbox/components/list'; +import { CardTitle, IconButton, Stack } from 'soapbox/components/ui'; import { useAppDispatch, useOwnAccount, useFeatures, useInstance } from 'soapbox/hooks'; import sourceCode from 'soapbox/utils/code'; import { download } from 'soapbox/utils/download'; @@ -49,7 +51,7 @@ const Dashboard: React.FC = () => { if (!account) return null; return ( - <> + { {account.admin && } -
-
-

-
    -
  • {sourceCode.displayName} {sourceCode.version}
  • -
  • {v.software + (v.build ? `+${v.build}` : '')} {v.version}
  • -
-
- {features.emailList && account.admin && ( - - )} -
- + } + /> + + + }> + {sourceCode.displayName} {sourceCode.version} + + + }> + {v.software + (v.build ? `+${v.build}` : '')} {v.version} + + + + {(features.emailList && account.admin) && ( + <> + } + /> + + + + + + + + + + + + + + + + )} +
); }; diff --git a/app/styles/components/admin.scss b/app/styles/components/admin.scss index 5749909b4..647c78264 100644 --- a/app/styles/components/admin.scss +++ b/app/styles/components/admin.scss @@ -1,30 +1,3 @@ -.dashwidgets { - display: flex; - flex-wrap: wrap; - margin: 0 -5px; - padding: 0 20px 20px 20px; -} - -.dashwidget { - flex: 1; - margin-bottom: 20px; - padding: 0 5px; - - h4 { - text-transform: uppercase; - font-size: 13px; - font-weight: 700; - color: hsla(var(--primary-text-color_hsl), 0.6); - padding-bottom: 8px; - margin-bottom: 8px; - border-bottom: 1px solid var(--accent-color--med); - } - - a { - color: var(--brand-color); - } -} - .unapproved-account { padding: 15px 20px; font-size: 14px;