Skip to content

Commit a8c5d3f

Browse files
authored
Merge pull request #140 from ModusCreateOrg/ADE-203
[ADE-203] UI fixes
2 parents 4da8112 + 7e546fc commit a8c5d3f

File tree

5 files changed

+29
-19
lines changed

5 files changed

+29
-19
lines changed

frontend/src/common/utils/i18n/resources/en/reportDetail.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@
6767
},
6868
"normal-values": {
6969
"title": "Normal values",
70-
"empty": "No values available.",
70+
"empty": "No values to display",
7171
"empty-description": "No normal values within the normal range were detected."
7272
},
7373
"conclusion": {

frontend/src/pages/Processing/ProcessingPage.scss

Lines changed: 19 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
border-radius: 32px;
77
height: 100%;
88
margin: 0;
9-
padding: 24px;
9+
padding: 20px;
1010
display: flex;
1111
flex-direction: column;
1212
position: relative;
@@ -24,6 +24,7 @@
2424
// Styles for the Avatar component
2525
.ls-avatar {
2626
--size: 60px !important;
27+
2728
margin: 0;
2829

2930
// This makes sure even round avatars are sized correctly
@@ -42,7 +43,7 @@
4243
&__subtitle {
4344
font-size: 20px;
4445
color: #9ba1ab;
45-
margin: 0 0 5px 0;
46+
margin: 0 0 5px;
4647
font-weight: 400;
4748
}
4849

@@ -64,6 +65,7 @@
6465
width: 230px;
6566
height: 230px;
6667
animation: pulse 2s infinite ease-in-out;
68+
margin: auto;
6769
}
6870

6971
// Error component styling - final adjustments
@@ -86,24 +88,24 @@
8688
}
8789

8890
&__error-header {
89-
margin-bottom: 40px;
91+
margin-bottom: 120px;
9092
text-align: left;
9193
align-self: flex-start;
9294
width: 100%;
9395
}
9496

9597
&__error-oops {
96-
font-size: 24px;
98+
font-size: 18px;
9799
font-weight: 400;
98100
color: #8e8e93;
99101
margin: 0 0 4px;
100102
}
101103

102104
&__error-title {
103-
font-size: 34px;
104-
font-weight: 700;
105+
font-size: 26px;
106+
font-weight: 600;
105107
margin: 0;
106-
color: #1c1c1e;
108+
color: #313e4c;
107109
line-height: 1.2;
108110
}
109111

@@ -146,19 +148,20 @@
146148
flex-direction: row;
147149
gap: 12px;
148150
width: 100%;
149-
padding: 0 8px; // Reduced side padding to make buttons wider
150-
max-width: 450px; // Increased max-width from 400px
151+
padding: 0 5px;
151152
margin-left: auto;
152153
margin-right: auto;
153-
margin-bottom: 8px; // Further reduced from 20px to 8px
154+
margin-bottom: 8px;
154155

155156
ion-button {
156157
margin: 0;
157-
height: 48px;
158+
height: 54px;
159+
158160
--border-radius: 8px;
159161
--border-width: 1px;
160162
--padding-top: 0;
161163
--padding-bottom: 0;
164+
162165
font-size: 16px;
163166
font-weight: 600;
164167
text-transform: none;
@@ -171,10 +174,10 @@
171174
--color: #4361ee;
172175
--border-color: #4361ee;
173176
--background: transparent;
174-
--background-hover: rgba(67, 97, 238, 0.1);
175-
--background-activated: rgba(67, 97, 238, 0.2);
177+
--background-hover: rgb(67 97 238 / 10%);
178+
--background-activated: rgb(67 97 238 / 20%);
176179
--box-shadow: none;
177-
--ripple-color: rgba(67, 97, 238, 0.1);
180+
--ripple-color: rgb(67 97 238 / 10%);
178181
}
179182

180183
&__upload-btn {
@@ -192,10 +195,12 @@
192195
transform: scale(0.95);
193196
opacity: 0.8;
194197
}
198+
195199
50% {
196200
transform: scale(1);
197201
opacity: 1;
198202
}
203+
199204
100% {
200205
transform: scale(0.95);
201206
opacity: 0.8;

frontend/src/pages/Reports/ReportDetailPage.scss

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,6 @@
193193

194194
&__section-empty {
195195
padding: 24px 16px 32px;
196-
background-color: #fff;
197196
}
198197

199198
&__section-empty-content {
@@ -554,10 +553,11 @@
554553
&__results-cell--test {
555554
flex: 2;
556555
font-size: 12px;
557-
min-width: 160px;
556+
min-width: 40px;
558557
overflow-wrap: break-word;
559558
white-space: normal; // Allow text to wrap
560559
word-break: break-word; // Ensure long words break
560+
line-height: 1.4em;
561561
}
562562

563563
&__results-cell--value {
@@ -579,11 +579,14 @@
579579
white-space: normal; // Allow text to wrap
580580
word-break: break-word; // Ensure long words break
581581
overflow-wrap: break-word;
582+
line-height: 1.4em;
583+
margin-left: 6px;
584+
margin-top: 4px;
585+
margin-bottom: 4px;
582586
}
583587

584588
&__results-cell-header--test {
585589
flex: 2;
586-
min-width: 160px;
587590
overflow-wrap: break-word;
588591
white-space: normal; // Allow text to wrap
589592
word-break: break-word; // Ensure long words break

frontend/src/pages/Reports/components/OriginalReportTab.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ const OriginalReportTab: React.FC<OriginalReportTabProps> = ({ reportData }) =>
7777
</div>
7878

7979
{/* Medical Comments Section */}
80-
{reportData.medicalComments.length > 0 && (
80+
{reportData.medicalComments?.length > 0 && (
8181
<div className="report-detail-page__comments-section">
8282
<h4 className="report-detail-page__comments-title">Medical Comments:</h4>
8383
<div className="report-detail-page__comments-text">{reportData.medicalComments}</div>

frontend/src/pages/Reports/components/ReportHeader.tsx

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,8 @@ const ReportHeader: React.FC<ReportHeaderProps> = ({ reportData, onClose }) => {
2222
</button>
2323
</div>
2424

25+
<hr style={{ backgroundColor: '#D7DBEC', height: '1px', width: '100%', marginTop: '25px' }} />
26+
2527
{/* Category & Title */}
2628
<div className="report-detail-page__category-wrapper">
2729
<span className="report-detail-page__category">

0 commit comments

Comments
 (0)