Skip to content

Commit ac125bb

Browse files
committed
Update notification dropdown colors, fix payment/report notifications pages with glass morphism theme, and standardize chart component sizes
1 parent bcf4479 commit ac125bb

4 files changed

Lines changed: 53 additions & 15 deletions

File tree

src/components/payment/PaymentNotifications/PaymentNotifications.styles.ts

Lines changed: 21 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,29 @@
11
import styled, { css } from 'styled-components';
22
import { Input, Button, Divider, Badge, Tag } from 'antd';
3-
import { FONT_SIZE, BORDER_RADIUS, FONT_WEIGHT } from '@app/styles/themes/constants';
3+
import { FONT_SIZE, BORDER_RADIUS, FONT_WEIGHT, LAYOUT } from '@app/styles/themes/constants';
4+
5+
export const ScrollableWrapper = styled.div`
6+
height: calc(100vh - ${LAYOUT.desktop.headerHeight} - 4rem);
7+
overflow-y: auto;
8+
overflow-x: hidden;
9+
padding-right: 0.5rem;
10+
11+
/* Hide scrollbars completely while maintaining functionality */
12+
&::-webkit-scrollbar {
13+
width: 0;
14+
height: 0;
15+
display: none;
16+
}
17+
18+
/* Firefox */
19+
scrollbar-width: none;
20+
21+
/* IE/Edge */
22+
-ms-overflow-style: none;
23+
`;
424

525
export const FiltersWrapper = styled.div`
626
margin-bottom: 1.5rem;
7-
padding: 1rem;
8-
background: rgba(0, 255, 255, 0.03);
9-
backdrop-filter: blur(10px);
10-
-webkit-backdrop-filter: blur(10px);
11-
border: 1px solid rgba(0, 255, 255, 0.1);
12-
border-radius: ${BORDER_RADIUS};
1327
`;
1428

1529
export const SplitDivider = styled(Divider)`

src/components/payment/PaymentNotifications/PaymentNotifications.tsx

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,9 @@ export const PaymentNotifications: React.FC<PaymentNotificationsProps> = ({ clas
6060
};
6161

6262
return (
63-
<BaseCard className={className} title={t('payment.notifications.title', 'Payment Notifications')} padding="1.25rem">
64-
<S.FiltersWrapper>
63+
<S.ScrollableWrapper>
64+
<BaseCard className={className} title={t('payment.notifications.title', 'Payment Notifications')} padding="1.25rem">
65+
<S.FiltersWrapper>
6566
<BaseRow gutter={[16, 16]} align="middle">
6667
<BaseCol xs={24} md={8}>
6768
<BaseSelect
@@ -209,7 +210,8 @@ export const PaymentNotifications: React.FC<PaymentNotificationsProps> = ({ clas
209210
{t('payment.notifications.emptyDescription', 'Payment notifications will appear here when users subscribe to your services')}
210211
</S.Text>
211212
</div>
212-
)}
213-
</BaseCard>
213+
)}
214+
</BaseCard>
215+
</S.ScrollableWrapper>
214216
);
215217
};

src/components/report/ReportNotifications/ReportNotifications.styles.ts

Lines changed: 21 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,26 @@
11
import styled, { css } from 'styled-components';
22
import { Input, Button, Divider, Badge, Tag } from 'antd';
3-
import { FONT_SIZE, BORDER_RADIUS, FONT_WEIGHT } from '@app/styles/themes/constants';
3+
import { FONT_SIZE, BORDER_RADIUS, FONT_WEIGHT, LAYOUT } from '@app/styles/themes/constants';
4+
5+
export const ScrollableWrapper = styled.div`
6+
height: calc(100vh - ${LAYOUT.desktop.headerHeight} - 4rem);
7+
overflow-y: auto;
8+
overflow-x: hidden;
9+
padding-right: 0.5rem;
10+
11+
/* Hide scrollbars completely while maintaining functionality */
12+
&::-webkit-scrollbar {
13+
width: 0;
14+
height: 0;
15+
display: none;
16+
}
17+
18+
/* Firefox */
19+
scrollbar-width: none;
20+
21+
/* IE/Edge */
22+
-ms-overflow-style: none;
23+
`;
424

525
export const FiltersWrapper = styled.div`
626
margin-bottom: 1.5rem;

src/components/report/ReportNotifications/ReportNotifications.tsx

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -143,8 +143,9 @@ export const ReportNotifications: React.FC<ReportNotificationsProps> = ({ classN
143143
};
144144

145145
return (
146-
<BaseCard className={className} title={t('report.notifications.title', 'Report Notifications')} padding="1.25rem">
147-
<S.FiltersWrapper>
146+
<S.ScrollableWrapper>
147+
<BaseCard className={className} title={t('report.notifications.title', 'Report Notifications')} padding="1.25rem">
148+
<S.FiltersWrapper>
148149
<BaseRow gutter={[16, 16]} align="middle">
149150
<BaseCol xs={24} md={8}>
150151
<BaseSelect
@@ -365,6 +366,7 @@ export const ReportNotifications: React.FC<ReportNotificationsProps> = ({ classN
365366
</div>
366367
)}
367368
</Modal>
368-
</BaseCard>
369+
</BaseCard>
370+
</S.ScrollableWrapper>
369371
);
370372
};

0 commit comments

Comments
 (0)