Skip to content

Commit 476248f

Browse files
Merge pull request #265 from mayuran-deriv/mayuran/font-and-color-change
Mayuran/ENGT-2711/[Deriv API] Change the font family and color for the
2 parents 5d83df1 + cb986bf commit 476248f

File tree

20 files changed

+119
-32
lines changed

20 files changed

+119
-32
lines changed

src/components/Footer/Footer.module.scss

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,12 +32,15 @@
3232
flex-direction: column;
3333
height: 100px;
3434
margin-bottom: rem(4.8);
35+
h6 {
36+
color: var(--ifm-font-color-base);
37+
}
3538
}
3639

3740
.SectionTitle {
3841
font-family: 'Ubuntu', sans-serif;
3942
font-size: rem(1.6) !important;
40-
color: var(--core-color-solid-slate-1400, #000);
43+
color: var(--ifm-font-color-base);
4144
text-align: left;
4245
}
4346

@@ -72,16 +75,20 @@
7275
align-items: center;
7376
gap: rem(0.5);
7477
text-decoration: none;
78+
color: var(--ifm-font-color-base);
7579
}
7680

7781
.labelcolor {
78-
color: var(--component-textIcon-normal-prominent);
82+
color: var(--ifm-font-color-base);
7983
}
8084

8185
.SectionContent {
8286
color: #000;
8387
font-size: rem(1.4);
8488
margin-bottom: rem(1.6);
89+
p {
90+
color: var(--ifm-font-color-base);
91+
}
8592
}
8693

8794
.Communities {
@@ -98,6 +105,9 @@
98105
gap: rem(0.8);
99106
white-space: nowrap;
100107
justify-content: center;
108+
button {
109+
color: var(--ifm-font-color-base);
110+
}
101111
}
102112

103113
.PaddedButton {
@@ -127,6 +137,9 @@
127137
line-height: 22px;
128138
display: flex;
129139
width: 100%;
140+
button {
141+
color: var(--ifm-font-color-base);
142+
}
130143
}
131144

132145
.MobileAccordion {

src/components/UserNavbarItem/UserNavbarItem.module.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
}
1818

1919
.SignedInButton {
20-
color: var(--colors-coral500);
20+
color: var(--ifm-font-color-base);
2121
font-weight: bold;
2222
display: flex !important;
2323
font-size: rem(1.4);

src/features/Apiexplorer/RequestJSONBox/RequestJSONBox.module.scss

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,15 +37,15 @@
3737
gap: rem(0.5);
3838
padding: rem(2);
3939

40-
button{
40+
button {
4141
min-width: 96px;
4242
height: 48px;
4343
}
4444

4545
button:nth-child(1) {
46-
border: var(--component-button-border-width-sm) solid var(--component-button-bg-coral-primary-default);
46+
border: var(--component-button-border-width-sm) solid
47+
var(--component-button-bg-coral-primary-default);
4748
}
48-
4949
}
5050
}
5151

@@ -66,4 +66,4 @@
6666

6767
div[role='dialog'] {
6868
padding-top: rem(0.8);
69-
}
69+
}

src/features/Apiexplorer/styles.module.scss

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,9 @@
1111
justify-content: space-between;
1212
width: 100%;
1313
margin-top: rem(4);
14+
h2 {
15+
color: var(--ifm-font-color-base);
16+
}
1417

1518
.pageWrapper {
1619
display: flex;
@@ -43,6 +46,10 @@
4346
align-items: stretch;
4447
gap: 10px;
4548
z-index: 2;
49+
p,
50+
span {
51+
color: var(--ifm-font-color-base);
52+
}
4653

4754
@include mobile-sm {
4855
flex-direction: column;
@@ -77,4 +84,4 @@
7784
@include tablet {
7885
width: 100%;
7986
}
80-
}
87+
}

src/features/Home/ApiFeatures/ApiFeatures.module.scss

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,14 @@
2323
box-sizing: border-box;
2424
display: flex;
2525
flex-direction: column;
26-
26+
h2 {
27+
color: var(--ifm-font-color-base);
28+
}
2729
header {
2830
display: flex;
2931
flex-direction: column;
3032
gap: rem(2);
33+
color: var(--ifm-font-color-base);
3134
@media screen and (max-width: 992px) {
3235
> h2 {
3336
text-align: center;
@@ -41,11 +44,13 @@
4144
.FeatureParagraph {
4245
font-weight: 400;
4346
line-height: rem(3);
47+
color: var(--ifm-font-color-base);
4448
}
4549
.FeatureList {
4650
margin-left: rem(-2);
4751
font-weight: 400;
4852
padding-left: rem(2);
53+
color: var(--ifm-font-color-base);
4954
@media screen and (max-width: 992px) {
5055
font-size: rem(1.4);
5156
}

src/features/Home/Benefits/Benefits.module.scss

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
.Heading {
99
margin-bottom: rem(4);
1010
padding: 0 rem(2);
11+
color: var(--ifm-font-color-base);
1112
}
1213

1314
.BenefitsIcons {
@@ -77,10 +78,12 @@
7778
> p {
7879
line-height: rem(3.6);
7980
font-size: rem(2.4);
81+
color: var(--ifm-font-color-base);
8082
}
8183

8284
.headingSize {
8385
font-size: rem(3.2);
86+
color: var(--ifm-font-color-base);
8487
}
8588
}
8689
@media screen and (max-width: 992px) {
@@ -98,6 +101,7 @@
98101
> p {
99102
line-height: rem(3.6);
100103
font-size: rem(1.8);
104+
color: var(--ifm-font-color-base);
101105
}
102106
}
103107
}
@@ -110,6 +114,9 @@
110114
flex-direction: column;
111115
justify-content: center;
112116
align-items: center;
117+
.BenefitsIconText {
118+
color: var(--ifm-font-color-base);
119+
}
113120
@media screen and (max-width: 992px) {
114121
> figcaption {
115122
font-size: var(--fontSizes-sm);

src/features/Home/Benefits/Benefits.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ const BenefitsIcon = ({ icon, text, alt }: TBenefitsIcon) => {
1818
src={`/img/${icon}.svg`}
1919
alt={alt}
2020
/>
21-
<Text as='figcaption' type='subtitle-2'>
21+
<Text as='figcaption' type='subtitle-2' className={styles.BenefitsIconText}>
2222
{text}
2323
</Text>
2424
</figure>

src/features/Home/ClientLibraries/ClientLibraries.module.scss

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
.Heading {
1414
margin: rem(1) 0;
1515
padding: 0 rem(2);
16+
color: var(--ifm-font-color-base);
1617
}
1718
.SubText {
1819
font-family: var(--ibm-font-family-base);

src/features/Home/GetStarted/GetStarted.module.scss

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
.getStartedHeading {
2222
text-align: center;
2323
padding: 0 rem(2.5) rem(4) rem(2.5);
24+
color: var(--ifm-font-color-base);
2425
}
2526

2627
.termConditions {
@@ -39,6 +40,9 @@
3940
flex-direction: column;
4041
gap: rem(2);
4142
}
43+
p {
44+
color: var(--ifm-font-color-base);
45+
}
4246
}
4347
.mainPageCard {
4448
display: flex;
@@ -91,6 +95,7 @@
9195
display: flex;
9296
width: 100%;
9397
justify-content: space-between;
98+
color: var(--ifm-font-color-base);
9499
.guideIcon,
95100
.signUpIcon,
96101
.registerYourAppIcon {

src/features/Home/WaysToEarn/WaysToEarn.module.scss

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
max-width: 384px;
2727
margin-bottom: rem(2.5);
2828
padding: 0 rem(2);
29+
color: var(--ifm-font-color-base);
2930
}
3031

3132
.Ways {
@@ -44,6 +45,7 @@
4445
}
4546
p {
4647
width: 92%;
48+
color: var(--ifm-font-color-base);
4749
}
4850
.WaysImg {
4951
width: 32px;

0 commit comments

Comments
 (0)