From aad8d4ebeff398e3d66e9d3529b371a1b205a907 Mon Sep 17 00:00:00 2001 From: Isabirye1515 Date: Wed, 9 Oct 2024 15:35:46 +0300 Subject: [PATCH] Fixed the header responsiveness --- .../src/components/common/PatientHeader.js | 16 +++---- .../resultsViewer/results-viewer.styles.scss | 42 ++++++++++++++----- .../patient/resultsViewer/results-viewer.tsx | 10 ++--- 3 files changed, 45 insertions(+), 23 deletions(-) diff --git a/frontend/src/components/common/PatientHeader.js b/frontend/src/components/common/PatientHeader.js index 6a293d23dd..6dd2095a87 100644 --- a/frontend/src/components/common/PatientHeader.js +++ b/frontend/src/components/common/PatientHeader.js @@ -25,13 +25,13 @@ const PatientHeader = (props) => { } = props; const patternUrl = GeoPattern.generate(id).toDataUri(); return ( - - -
+ + +
{id ? (
- +
{ />
- +
{patientName ? patientName : lastName + " " + firstName}
@@ -132,7 +132,7 @@ const PatientHeader = (props) => {
)} - + ) : (
@@ -165,10 +165,10 @@ const PatientHeader = (props) => {
)}
-
+
); }; -export default PatientHeader; +export default PatientHeader; \ No newline at end of file diff --git a/frontend/src/components/patient/resultsViewer/results-viewer.styles.scss b/frontend/src/components/patient/resultsViewer/results-viewer.styles.scss index b24674fcca..a96f517c27 100644 --- a/frontend/src/components/patient/resultsViewer/results-viewer.styles.scss +++ b/frontend/src/components/patient/resultsViewer/results-viewer.styles.scss @@ -132,9 +132,9 @@ border: 1px solid #ddd; padding: 20px; display: flex; - flex-direction: column; + flex-direction: row; align-items: flex-start; - justify-content: center; + justify-content: left; text-align: left; margin-top: 20px; background-color: #ffffff; @@ -143,29 +143,29 @@ padding: 2%; } .patient-header2 { - //background-color: #f5f5f5; + border: 1px solid #ddd; - // padding: 20px; + padding: 20px; display: flex; - flex-direction: column; + flex-direction: row; align-items: flex-start; - justify-content: center; + justify-content: left; text-align: left; margin-top: 20px; background-color: #ffffff; border-radius: 5px; margin-top: 1%; - padding: 2%; + padding: 20px; } .patient-header3 { //background-color: #f5f5f5; border: 1px solid #ddd; - // padding: 20px; + padding: 20px; display: flex; - flex-direction: column; + flex-direction: row; align-items: flex-start; - justify-content: center; + justify-content: left; text-align: left; background-color: #ffffff; border-radius: 5px; @@ -196,10 +196,32 @@ width: 5rem; height: 5rem; border-radius: 1px; + margin-right: 13px; } .patientAvatar2 { padding-right: 140px; width: 5rem; height: 5rem; border-radius: 1px; + margin-right: 13px; +} +@media screen and (max-width:520px){ + .patient-name { + font-size: 16px; + + margin-bottom: 5px; + } + + .patient-dob { + font-size: 14px; + color: #666; + margin-bottom: 5px; + } + + .patient-id { + font-size: 12px; + color: #888; + } + } + diff --git a/frontend/src/components/patient/resultsViewer/results-viewer.tsx b/frontend/src/components/patient/resultsViewer/results-viewer.tsx index 9f65123964..edfbaa7ca6 100644 --- a/frontend/src/components/patient/resultsViewer/results-viewer.tsx +++ b/frontend/src/components/patient/resultsViewer/results-viewer.tsx @@ -104,7 +104,7 @@ const RoutedResultsViewer: React.FC = () => { return ( <> - + {intl.formatMessage({ id: "home.label" })} @@ -116,7 +116,7 @@ const RoutedResultsViewer: React.FC = () => { - +
@@ -127,7 +127,7 @@ const RoutedResultsViewer: React.FC = () => { - + = () => { {roots?.length ? ( - + = () => { ) : ( - +