Skip to content

Commit 8d619f9

Browse files
authored
Merge pull request #94 from ModusCreateOrg/ADE-197
[ADE-197] CSS improvements
2 parents bc71acf + 87c9989 commit 8d619f9

File tree

5 files changed

+18
-11
lines changed

5 files changed

+18
-11
lines changed

frontend/assets/Reports_bg.png

907 KB
Loading

frontend/src/pages/Home/HomePage.scss

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
.home-page {
2+
background: url('../../../assets/Reports_bg.png') no-repeat center center;
23
background-color: var(--ion-color-light);
34
min-height: 100%;
45

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

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
.report-item {
22
display: flex;
33
padding: 16px;
4-
background: white;
54
border-radius: 12px;
65
margin-bottom: 12px;
76
box-shadow: 0 2px 4px rgba(0, 0, 0, 0.05);
@@ -53,9 +52,21 @@
5352
&-icon {
5453
font-size: 22px;
5554
color: #aaa;
55+
transition: all 0.2s ease;
56+
width: 1em;
57+
height: 1em;
58+
display: flex;
59+
align-items: center;
60+
justify-content: center;
61+
background-color: white;
62+
border-radius: 50%;
63+
padding: 8px;
64+
box-sizing: content-box;
65+
box-shadow: 0 1px 3px rgba(0, 0, 0, 0.08);
5666

5767
&--active {
58-
color: #4355b9;
68+
color: white;
69+
background-color: #4355b9;
5970
}
6071
}
6172
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import { IonIcon } from '@ionic/react';
22
import { format } from 'date-fns';
33
import { useTranslation } from 'react-i18next';
44
import { MedicalReport, ReportCategory } from 'common/models/medicalReport';
5-
import { bookmark, bookmarkOutline } from 'ionicons/icons';
5+
import { bookmarkOutline } from 'ionicons/icons';
66
import './ReportItem.scss';
77

88
// Import SVG icons
@@ -99,7 +99,7 @@ const ReportItem: React.FC<ReportItemProps> = ({
9999
{showBookmarkButton && (
100100
<div className="report-item__bookmark" onClick={handleBookmarkClick}>
101101
<IonIcon
102-
icon={bookmarked ? bookmark : bookmarkOutline}
102+
icon={bookmarkOutline}
103103
className={`report-item__bookmark-icon ${
104104
bookmarked ? 'report-item__bookmark-icon--active' : ''
105105
}`}

frontend/src/pages/Reports/ReportsListPage.scss

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,10 @@
11
.reports-list-page {
2-
--background: white;
2+
--background: url('../../../assets/Reports_bg.png') no-repeat center center;
33

44
&__header {
5-
background: white;
65
box-shadow: none;
76

87
ion-toolbar {
9-
--background: white;
108
--border-width: 0;
119
--min-height: 60px;
1210
padding: 10px 16px;
@@ -65,7 +63,6 @@
6563
align-items: center;
6664
justify-content: center;
6765
border-radius: 50%;
68-
background-color: white;
6966
box-shadow: 0 1px 3px rgba(0, 0, 0, 0.08);
7067
border: 1px solid rgba(0, 0, 0, 0.03);
7168
}
@@ -77,13 +74,11 @@
7774
}
7875

7976
&__content-container {
80-
--background: white;
8177
--padding-top: 0;
8278
}
8379

8480
&__filter {
8581
padding: 8px 16px;
86-
background-color: white;
8782
}
8883

8984
&__segment-wrapper {
@@ -96,7 +91,7 @@
9691

9792
ion-segment-button {
9893
--color: #777;
99-
--color-checked: #4355b9;
94+
--color-checked: #000;
10095
--indicator-color: white;
10196
--background-checked: white;
10297
--border-radius: 50px;

0 commit comments

Comments
 (0)