Skip to content

Commit f44a3ee

Browse files
committed
UI improvements: Add titles, rename sections, update colors - Relay Settings and Advanced Settings titles added, Content Moderation renamed, font colors updated to white, table borders removed
1 parent f6f4ba0 commit f44a3ee

6 files changed

Lines changed: 57 additions & 29 deletions

File tree

src/components/blocked-pubkeys/BlockedPubkeys.tsx

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ import { LockFilled } from '@ant-design/icons';
1111
import styled from 'styled-components';
1212
import { DashboardWrapper } from '@app/pages/DashboardPages/DashboardPage.styles';
1313
import { BaseRow } from '@app/components/common/BaseRow/BaseRow';
14+
import { PageTitle } from '@app/components/common/PageTitle/PageTitle';
1415
import { Balance } from '@app/components/relay-dashboard/Balance/Balance';
1516
import { TotalEarning } from '@app/components/relay-dashboard/totalEarning/TotalEarning';
1617
import { ActivityStory } from '@app/components/relay-dashboard/transactions/Transactions';
@@ -56,6 +57,7 @@ export const BlockedPubkeys: React.FC = () => {
5657

5758
return (
5859
<DashboardWrapper>
60+
<PageTitle>Content Moderation</PageTitle>
5961
<BaseRow>
6062
<PageStyles.LeftSideCol xl={16} xxl={17}>
6163
<S.BaseColRoot>
@@ -64,7 +66,7 @@ export const BlockedPubkeys: React.FC = () => {
6466
<div style={{ display: 'flex', justifyContent: 'space-between', alignItems: 'center' }}>
6567
<div>
6668
<Title level={3}>
67-
Access Control <LockFilled />
69+
Content Moderation <LockFilled />
6870
</Title>
6971
<Text style={{ color: 'var(--text-light-color)' }}>
7072
Control access to your relay and manage flagged pubkeys

src/components/relay-settings/layouts/DesktopLayout.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ export const DesktopLayout: React.FC<DesktopLayoutProps> = ({
105105
<BaseRow gutter={[60, 60]}>
106106
<BaseCol xs={24}>
107107
<S.HeadingContainer>
108-
<S.LabelSpan>{'Options'}</S.LabelSpan>
108+
<S.LabelSpan>{'Relay Settings'}</S.LabelSpan>
109109
</S.HeadingContainer>
110110

111111
<NetworkSection

src/components/relay-settings/layouts/MobileLayout.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ export const MobileLayout: React.FC<MobileLayoutProps> = ({
100100
<BaseRow gutter={[20, 24]}>
101101
<BaseCol span={24}>
102102
<S.HeadingContainer>
103-
<S.LabelSpan>{'Options'}</S.LabelSpan>
103+
<S.LabelSpan>{'Relay Settings'}</S.LabelSpan>
104104
</S.HeadingContainer>
105105

106106
<NetworkSection

src/components/settings/SettingsPage.tsx

Lines changed: 26 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -9,18 +9,22 @@ import WalletSettings from './WalletSettings';
99
import GeneralSettings from './GeneralSettings';
1010
import RelayInfoSettings from './RelayInfoSettings';
1111
import * as S from '@app/pages/DashboardPages/DashboardPage.styles';
12+
import * as PageStyles from '@app/pages/uiComponentsPages/UIComponentsPage.styles';
1213
import { CollapsibleSection } from '@app/components/relay-settings/shared/CollapsibleSection/CollapsibleSection';
1314
import { Balance } from '@app/components/relay-dashboard/Balance/Balance';
1415
import { TotalEarning } from '@app/components/relay-dashboard/totalEarning/TotalEarning';
1516
import { ActivityStory } from '@app/components/relay-dashboard/transactions/Transactions';
1617

1718
const SettingsPage: React.FC = () => {
1819
return (
19-
<>
20+
<S.DashboardWrapper>
2021
<PageTitle>Advanced Settings</PageTitle>
21-
<S.DashboardWrapper>
22-
<BaseRow>
23-
<S.LeftSideCol xl={16} xxl={17} id="desktop-content">
22+
<BaseRow>
23+
<S.LeftSideCol xl={16} xxl={17} id="desktop-content">
24+
<PageStyles.HeadingContainer>
25+
<PageStyles.LabelSpan>Advanced Settings</PageStyles.LabelSpan>
26+
</PageStyles.HeadingContainer>
27+
2428
<CollapsibleSection header="General Settings">
2529
<GeneralSettings />
2630
</CollapsibleSection>
@@ -44,26 +48,25 @@ const SettingsPage: React.FC = () => {
4448
<CollapsibleSection header="Wallet Settings">
4549
<WalletSettings />
4650
</CollapsibleSection>
47-
</S.LeftSideCol>
51+
</S.LeftSideCol>
4852

49-
<S.RightSideCol xl={8} xxl={7}>
50-
<S.RightSideContentWrapper>
51-
<div id="balance" className="liquid-element">
52-
<Balance />
53-
</div>
54-
<S.Space />
55-
<div id="total-earning" className="liquid-element">
56-
<TotalEarning />
57-
</div>
58-
<S.Space />
59-
<div id="activity-story" className="liquid-element">
60-
<ActivityStory />
61-
</div>
62-
</S.RightSideContentWrapper>
63-
</S.RightSideCol>
64-
</BaseRow>
65-
</S.DashboardWrapper>
66-
</>
53+
<S.RightSideCol xl={8} xxl={7}>
54+
<S.RightSideContentWrapper>
55+
<div id="balance" className="liquid-element">
56+
<Balance />
57+
</div>
58+
<S.Space />
59+
<div id="total-earning" className="liquid-element">
60+
<TotalEarning />
61+
</div>
62+
<S.Space />
63+
<div id="activity-story" className="liquid-element">
64+
<ActivityStory />
65+
</div>
66+
</S.RightSideContentWrapper>
67+
</S.RightSideCol>
68+
</BaseRow>
69+
</S.DashboardWrapper>
6770
);
6871
};
6972

src/components/tables/Tables/Tables.styles.ts

Lines changed: 25 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -218,7 +218,7 @@ export const Card = styled(CommonCard)`
218218
rgba(0, 178, 178, 0.03) 100%);
219219
220220
.ant-card-head-title {
221-
color: rgba(0, 178, 178, 0.9);
221+
color: rgba(255, 255, 255, 0.95);
222222
text-shadow:
223223
0 0 12px rgba(0, 178, 178, 0.4),
224224
0 2px 4px rgba(0, 0, 0, 0.4);
@@ -251,10 +251,33 @@ export const Card = styled(CommonCard)`
251251
div.ant-table-container,
252252
.ant-table.ant-table-bordered > .ant-table-container > .ant-table-content > table {
253253
border-radius: ${borderRad};
254-
border: 1px solid rgba(0, 178, 178, 0.12);
254+
border: none !important;
255255
overflow: hidden;
256256
}
257257
258+
/* Remove all table borders */
259+
.ant-table {
260+
border: none !important;
261+
}
262+
263+
.ant-table-container {
264+
border: none !important;
265+
}
266+
267+
.ant-table-bordered {
268+
border: none !important;
269+
}
270+
271+
.ant-table-bordered > .ant-table-container {
272+
border: none !important;
273+
}
274+
275+
/* Remove any remaining left/right borders */
276+
table {
277+
border-left: none !important;
278+
border-right: none !important;
279+
}
280+
258281
.ant-table-container {
259282
box-shadow:
260283
inset 0 2px 4px rgba(0, 178, 178, 0.08),

src/components/tables/Tables/Tables.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ export const Tables: React.FC = () => {
3232
style={{
3333
background: 'linear-gradient(135deg, rgba(0, 178, 178, 0.12) 0%, rgba(0, 139, 178, 0.08) 100%)',
3434
border: '2px solid rgba(0, 178, 178, 0.25)',
35-
color: 'rgba(0, 178, 178, 0.9)',
35+
color: 'rgba(255, 255, 255, 0.95)',
3636
padding: '8px 16px',
3737
borderRadius: '12px',
3838
fontSize: '14px',

0 commit comments

Comments
 (0)