Skip to content

Commit b8c3dc5

Browse files
committed
Use Inter font as default
1 parent e0ac20c commit b8c3dc5

File tree

6 files changed

+107
-41
lines changed

6 files changed

+107
-41
lines changed

frontend/src/common/components/Modal/ConfirmationModal.scss

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
}
1212

1313
&__title {
14-
font-family: 'Inter', sans-serif;
14+
font-family: var(--font-family-base);
1515
font-size: 22px;
1616
font-weight: 600;
1717
color: #313e4c;
@@ -20,7 +20,7 @@
2020
}
2121

2222
&__message {
23-
font-family: 'Inter', sans-serif;
23+
font-family: var(--font-family-base);
2424
font-size: 16px;
2525
font-weight: 400;
2626
color: #313e4c;
@@ -42,7 +42,7 @@
4242
font-size: 20px;
4343
font-weight: 600;
4444
text-transform: none;
45-
45+
4646
&--cancel {
4747
--background: #ffffff;
4848
--background-hover: rgba(67, 95, 240, 0.04);
@@ -53,7 +53,7 @@
5353
--border-style: solid;
5454
--box-shadow: none;
5555
}
56-
56+
5757
&--confirm {
5858
--background: #ffffff; /* White background for Yes button */
5959
--background-hover: rgba(175, 27, 63, 0.04);
@@ -81,4 +81,4 @@
8181
border-radius: 2px;
8282
margin-top: 12px;
8383
}
84-
}
84+
}

frontend/src/pages/Home/HomePage.scss

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -252,7 +252,7 @@
252252

253253
// Add a more specific selector to override Ionic's default styles
254254
ion-card.home-page__ai-card ion-card-content h3.home-page__ai-card-title {
255-
font-family: 'Inter', serif;
255+
font-family: var(--font-family-base);
256256
color: white;
257257
font-size: 1.25rem;
258258
font-weight: 700;
@@ -263,7 +263,7 @@ ion-card.home-page__ai-card ion-card-content h3.home-page__ai-card-title {
263263
}
264264

265265
ion-card.home-page__ai-card ion-card-content span.home-page__ai-card-button-inline {
266-
font-family: 'Merriweather', serif;
266+
font-family: var(--font-family-secondary);
267267
font-size: 0.875rem;
268268
color: #ffbe5b;
269269
font-weight: 500;

frontend/src/pages/Reports/ReportDetailPage.scss

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
}
2323

2424
&__title {
25-
font-family: 'Inter', sans-serif;
25+
font-family: var(--font-family-base);
2626
font-size: 22px;
2727
font-weight: 600;
2828
margin: 0;
@@ -54,7 +54,7 @@
5454
}
5555

5656
&__category {
57-
font-family: 'Inter', sans-serif;
57+
font-family: var(--font-family-base);
5858
font-size: 12px;
5959
font-weight: 600;
6060
color: #435ff0;
@@ -81,7 +81,7 @@
8181
}
8282

8383
&__subtitle {
84-
font-family: 'Inter', sans-serif;
84+
font-family: var(--font-family-base);
8585
font-size: 18px;
8686
font-weight: 600;
8787
margin: 4px 0 16px;
@@ -220,15 +220,15 @@
220220
}
221221

222222
&__section-empty-title {
223-
font-family: 'Inter', sans-serif;
223+
font-family: var(--font-family-base);
224224
font-size: 18px;
225225
font-weight: 600;
226226
color: #313e4c;
227227
margin: 0 0 16px;
228228
}
229229

230230
&__section-empty-description {
231-
font-family: 'Inter', sans-serif;
231+
font-family: var(--font-family-base);
232232
font-size: 14px;
233233
font-weight: 400;
234234
color: #313e4c;
@@ -488,15 +488,15 @@
488488
}
489489

490490
&__results-cell {
491-
font-family: 'Inter', sans-serif;
491+
font-family: var(--font-family-base);
492492
font-size: 12px;
493493
font-weight: 600;
494494
color: #5c6d80;
495495

496496
&--test {
497497
flex: 1;
498498
text-align: left;
499-
font-family: 'Inter', sans-serif;
499+
font-family: var(--font-family-base);
500500
font-size: 13px;
501501
color: #313e4c;
502502
font-weight: 400;
@@ -505,7 +505,7 @@
505505
&--value {
506506
width: 100px;
507507
text-align: right;
508-
font-family: 'Inter', sans-serif;
508+
font-family: var(--font-family-base);
509509
font-size: 13px;
510510
color: #313e4c;
511511
font-weight: 600;
@@ -515,7 +515,7 @@
515515
&--ref {
516516
width: 80px;
517517
text-align: right;
518-
font-family: 'Inter', sans-serif;
518+
font-family: var(--font-family-base);
519519
font-size: 12px;
520520
color: #5c6d80;
521521
font-weight: 400;
@@ -531,7 +531,7 @@
531531
border-bottom: 1px solid #ebeef8;
532532

533533
span {
534-
font-family: 'Inter', sans-serif;
534+
font-family: var(--font-family-base);
535535
font-weight: 600;
536536
font-size: 13px;
537537
color: #313e4c;
@@ -553,14 +553,14 @@
553553
}
554554

555555
&__primary-sample-label {
556-
font-family: 'Inter', sans-serif;
556+
font-family: var(--font-family-base);
557557
font-size: 13px;
558558
color: #667091;
559559
font-weight: 400;
560560
}
561561

562562
&__primary-sample-value {
563-
font-family: 'Inter', sans-serif;
563+
font-family: var(--font-family-base);
564564
font-size: 13px;
565565
font-weight: 600;
566566
color: #313e4c;
@@ -584,7 +584,7 @@
584584
&--test {
585585
flex: 1;
586586
text-align: left;
587-
font-family: 'Inter', sans-serif;
587+
font-family: var(--font-family-base);
588588
font-size: 13px;
589589
color: #313e4c;
590590
font-weight: 400;
@@ -596,7 +596,7 @@
596596
align-items: center;
597597
width: 100px;
598598
text-align: right;
599-
font-family: 'Inter', sans-serif;
599+
font-family: var(--font-family-base);
600600
font-size: 13px;
601601
color: #313e4c;
602602
font-weight: 600;
@@ -606,7 +606,7 @@
606606
&--ref {
607607
width: 80px;
608608
text-align: right;
609-
font-family: 'Inter', sans-serif;
609+
font-family: var(--font-family-base);
610610
font-size: 12px;
611611
color: #5c6d80;
612612
font-weight: 400;
@@ -623,7 +623,7 @@
623623
}
624624

625625
&__comments-title {
626-
font-family: 'Inter', sans-serif;
626+
font-family: var(--font-family-base);
627627
font-size: 18px;
628628
font-weight: 600;
629629
color: #313e4c;
@@ -632,7 +632,7 @@
632632
}
633633

634634
&__comments-text {
635-
font-family: 'Inter', sans-serif;
635+
font-family: var(--font-family-base);
636636
font-size: 16px;
637637
color: #313e4c;
638638
line-height: 24px;
@@ -649,7 +649,7 @@
649649
}
650650

651651
&__uploaded-file-title {
652-
font-family: 'Inter', sans-serif;
652+
font-family: var(--font-family-base);
653653
font-size: 13px;
654654
font-weight: 600;
655655
color: #313e4c;
@@ -681,7 +681,7 @@
681681
}
682682

683683
&__file-name {
684-
font-family: 'Inter', sans-serif;
684+
font-family: var(--font-family-base);
685685
font-size: 12px;
686686
font-weight: 500;
687687
color: #313e4c;
@@ -692,7 +692,7 @@
692692
display: flex;
693693
align-items: center;
694694
gap: 4px;
695-
font-family: 'Inter', sans-serif;
695+
font-family: var(--font-family-base);
696696
font-size: 12px;
697697
color: #5c6d80;
698698
}
@@ -743,7 +743,7 @@
743743
color: #313e4c;
744744
font-size: 14px;
745745
line-height: 20px;
746-
font-family: 'Inter', sans-serif;
746+
font-family: var(--font-family-base);
747747
font-weight: 400;
748748
}
749749
}

frontend/src/pages/Reports/components/FilterPanel/FilterPanel.scss

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
.filter-panel {
2-
font-family: 'Inter', serif;
2+
font-family: var(--font-family-base);
33
padding: 1.5rem 1rem;
44
display: flex;
55
flex-direction: column;
@@ -63,7 +63,7 @@
6363
}
6464

6565
&__apply-button {
66-
font-family: 'Inter', serif;
66+
font-family: var(--font-family-base);
6767
--background: #435FF0;
6868
--color: white;
6969
height: 48px;

frontend/src/theme/fonts.css

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,20 @@
1-
/*
2-
* Using local Merriweather fonts
1+
/*
2+
* Using Inter as the primary font and Merriweather as a secondary font
33
*/
44

5+
/* Import Inter font from Google Fonts */
6+
@import url('https://fonts.googleapis.com/css2?family=Inter:wght@100;200;300;400;500;600;700;800;900&display=swap');
7+
58
:root {
6-
--font-family-base: 'Merriweather', serif;
9+
--font-family-base: 'Inter', sans-serif;
10+
--font-family-secondary: 'Merriweather', serif;
711
}
812

913
body {
1014
font-family: var(--font-family-base);
1115
}
1216

17+
/* Merriweather font definitions */
1318
@font-face {
1419
font-family: 'Merriweather';
1520
src: url('../assets/fonts/Merriweather/Merriweather-Light.ttf');

frontend/src/theme/variables.css

Lines changed: 69 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,17 +9,78 @@ http://ionicframework.com/docs/theming/ */
99
--ls-breakpoint-lg: 992px;
1010
--ls-breakpoint-xl: 1200px;
1111

12-
--ion-color-primary: #0054e9;
13-
--ion-color-primary-rgb: 0, 84, 233;
12+
/* Primary colors */
13+
--ion-color-primary: #435ff0;
14+
--ion-color-primary-rgb: 67, 95, 240;
1415
--ion-color-primary-contrast: #ffffff;
1516
--ion-color-primary-contrast-rgb: 255, 255, 255;
16-
--ion-color-primary-shade: #0049c7;
17-
--ion-color-primary-tint: #1a64e0;
17+
--ion-color-primary-shade: #3b54d3;
18+
--ion-color-primary-tint: #566ff2;
1819

19-
--ion-color-danger: #ff9cb4;
20-
--ion-color-danger-rgb: 233, 0, 0;
20+
/* Secondary colors */
21+
--ion-color-secondary: #314053;
22+
--ion-color-secondary-rgb: 49, 64, 83;
23+
--ion-color-secondary-contrast: #ffffff;
24+
--ion-color-secondary-contrast-rgb: 255, 255, 255;
25+
--ion-color-secondary-shade: #2b3849;
26+
--ion-color-secondary-tint: #465364;
27+
28+
/* Tertiary colors */
29+
--ion-color-tertiary: #fd7bf4;
30+
--ion-color-tertiary-rgb: 253, 123, 244;
31+
--ion-color-tertiary-contrast: #000000;
32+
--ion-color-tertiary-contrast-rgb: 0, 0, 0;
33+
--ion-color-tertiary-shade: #df6cd7;
34+
--ion-color-tertiary-tint: #fd88f5;
35+
36+
/* Success colors */
37+
--ion-color-success: #2dd36f;
38+
--ion-color-success-rgb: 45, 211, 111;
39+
--ion-color-success-contrast: #000000;
40+
--ion-color-success-contrast-rgb: 0, 0, 0;
41+
--ion-color-success-shade: #28ba62;
42+
--ion-color-success-tint: #42d77d;
43+
44+
/* Warning colors */
45+
--ion-color-warning: #ffc409;
46+
--ion-color-warning-rgb: 255, 196, 9;
47+
--ion-color-warning-contrast: #000000;
48+
--ion-color-warning-contrast-rgb: 0, 0, 0;
49+
--ion-color-warning-shade: #e0ac08;
50+
--ion-color-warning-tint: #ffca22;
51+
52+
/* Danger colors */
53+
--ion-color-danger: #eb445a;
54+
--ion-color-danger-rgb: 235, 68, 90;
2155
--ion-color-danger-contrast: #ffffff;
2256
--ion-color-danger-contrast-rgb: 255, 255, 255;
23-
--ion-color-danger-shade: #c70000;
24-
--ion-color-danger-tint: #e01a1a;
57+
--ion-color-danger-shade: #cf3c4f;
58+
--ion-color-danger-tint: #ed576b;
59+
60+
/* Dark colors */
61+
--ion-color-dark: #222428;
62+
--ion-color-dark-rgb: 34, 36, 40;
63+
--ion-color-dark-contrast: #ffffff;
64+
--ion-color-dark-contrast-rgb: 255, 255, 255;
65+
--ion-color-dark-shade: #1e2023;
66+
--ion-color-dark-tint: #383a3e;
67+
68+
/* Medium colors */
69+
--ion-color-medium: #92949c;
70+
--ion-color-medium-rgb: 146, 148, 156;
71+
--ion-color-medium-contrast: #000000;
72+
--ion-color-medium-contrast-rgb: 0, 0, 0;
73+
--ion-color-medium-shade: #808289;
74+
--ion-color-medium-tint: #9d9fa6;
75+
76+
/* Light colors */
77+
--ion-color-light: #f4f5f8;
78+
--ion-color-light-rgb: 244, 245, 248;
79+
--ion-color-light-contrast: #000000;
80+
--ion-color-light-contrast-rgb: 0, 0, 0;
81+
--ion-color-light-shade: #d7d8da;
82+
--ion-color-light-tint: #f5f6f9;
83+
84+
/* Font family variables */
85+
--ion-font-family: var(--font-family-base);
2586
}

0 commit comments

Comments
 (0)