Skip to content

Commit 8262eec

Browse files
authored
Merge pull request #103 from ModusCreateOrg/ADE-198
ADE-198 - UI Improvements
2 parents 4cce560 + c7676c7 commit 8262eec

File tree

5 files changed

+54
-18
lines changed

5 files changed

+54
-18
lines changed

backend/cdk.context.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
{
22
"acknowledged-issue-numbers": [
3-
32775
3+
32775,
4+
31885
45
],
56
"availability-zones:account=841162674562:region=us-east-1": [
67
"us-east-1a",

frontend/src/pages/Home/components/ReportItem/ReportItem.scss

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
}
1313

1414
&__category-label {
15-
font-size: 12px;
15+
font-size: 13px;
1616
color: #4355b9;
1717
margin-bottom: 4px;
1818
font-weight: 700;
@@ -38,7 +38,7 @@
3838
}
3939

4040
&__date {
41-
font-size: 12px;
41+
font-size: 13px;
4242
color: #777;
4343
}
4444

@@ -47,19 +47,21 @@
4747
display: flex;
4848
align-items: center;
4949
justify-content: center;
50+
align-self: center;
51+
margin-right: 6px;
5052

5153
&-icon {
52-
font-size: 22px;
54+
font-size: 12px;
5355
color: #aaa;
5456
transition: all 0.2s ease;
55-
width: 1em;
56-
height: 1em;
57+
width: 12px;
58+
height: 12px;
5759
display: flex;
5860
align-items: center;
5961
justify-content: center;
6062
background-color: white;
6163
border-radius: 50%;
62-
padding: 8px;
64+
padding: 11px;
6365
box-sizing: content-box;
6466
box-shadow: 0 1px 3px rgba(0, 0, 0, 0.08);
6567

@@ -72,8 +74,8 @@
7274
}
7375

7476
&__icon {
75-
width: 40px;
76-
height: 40px;
77+
width: 56px;
78+
height: 56px;
7779
border-radius: 50%;
7880
display: flex;
7981
align-items: center;
@@ -89,8 +91,8 @@
8991
}
9092

9193
img {
92-
width: 24px;
93-
height: 24px;
94+
width: 28px;
95+
height: 28px;
9496
filter: none; /* Remove previous filter that made the SVG white */
9597
}
9698
}

frontend/src/pages/Home/components/ReportItem/ReportItem.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,8 @@ const ReportItem: React.FC<ReportItemProps> = ({
5555
<img
5656
src={getCategoryIconSrc(categoryStr)}
5757
alt={t(getCategoryTranslationKey(), { ns: 'report' })}
58-
width="24"
59-
height="24"
58+
width="28"
59+
height="28"
6060
/>
6161
</div>
6262
);

frontend/src/pages/Reports/ReportsListPage.scss

Lines changed: 32 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
11
.reports-list-page {
2-
--background: url('../../../assets/Reports_bg.png') no-repeat center center;
3-
42
&__header {
53
box-shadow: none;
64

75
ion-toolbar {
8-
--border-width: 0;
6+
--border-width: 0 !important;
97
--min-height: 60px;
108
padding: 10px 16px;
119
display: flex;
@@ -60,6 +58,37 @@
6058

6159
&__segment-wrapper {
6260
padding: 0 1rem;
61+
margin-top: 4px;
62+
63+
ion-segment {
64+
--background: #EBEEF8;
65+
border-radius: 9999px;
66+
overflow: hidden;
67+
padding: 4px;
68+
69+
ion-segment-button {
70+
--background: #EBEEF8;
71+
--background-checked: #FFFFFF;
72+
--color: #313E4C;
73+
--color-checked: #313E4C;
74+
--indicator-color: transparent;
75+
--border-radius: 9999px;
76+
--border-style: none;
77+
font-weight: 500;
78+
text-transform: none;
79+
min-height: 36px;
80+
margin: 0;
81+
transition: background-color 0.3s ease;
82+
83+
&::part(indicator) {
84+
display: none;
85+
}
86+
87+
&::part(native) {
88+
padding: 6px 16px;
89+
}
90+
}
91+
}
6392
}
6493

6594
&__category-tags {
@@ -73,7 +102,6 @@
73102

74103
&__content-container {
75104
--padding-top: 0;
76-
--background: var(--ion-background-color);
77105
}
78106

79107
&__content {

frontend/src/theme/theme-overrides.css

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/*
1+
/*
22
* Theme overrides for Ionic
33
* This file contains overrides for Ionic's default theme variables
44
*/
@@ -58,6 +58,11 @@ ion-content {
5858
--padding-top: var(--ion-safe-area-top, 1rem);
5959
}
6060

61+
/* Background for the entire app */
62+
body, ion-app, ion-content {
63+
background: url('../../assets/Reports_bg.png') no-repeat center center !important;
64+
}
65+
6166
/* Remove left padding from router outlet to avoid double padding */
6267
ion-router-outlet {
6368
padding-top: 0;

0 commit comments

Comments
 (0)