Skip to content

Commit c12f94c

Browse files
author
Poojan
committed
Fixed issues
1 parent 116a5d2 commit c12f94c

File tree

2 files changed

+14
-41
lines changed

2 files changed

+14
-41
lines changed

client/modules/About/About.styles.js

Lines changed: 14 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
import styled, { createGlobalStyle } from 'styled-components';
22
import { remSize, prop } from '../../theme';
33

4-
54
export const GlobalStyle = createGlobalStyle`
65
html, body, #root {
76
background-color: ${prop('backgroundColor')};
@@ -15,12 +14,10 @@ export const GlobalStyle = createGlobalStyle`
1514
}
1615
`;
1716

18-
1917
export const AboutPageContent = styled.div`
2018
margin: ${remSize(42)} ${remSize(295)};
21-
background-color: ${prop('backgroundColor')};
2219
color: ${prop('primaryTextColor')};
23-
min-height: 100vh;
20+
background-color: ${prop('backgroundColor')};
2421
2522
@media (max-width: 1279px) {
2623
margin: ${remSize(20)};
@@ -30,11 +27,7 @@ export const AboutPageContent = styled.div`
3027
}
3128
`;
3229

33-
3430
export const Intro = styled.div`
35-
background-color: ${prop('backgroundColor')};
36-
color: ${prop('primaryTextColor')};
37-
3831
& h1 {
3932
font-size: ${remSize(32)};
4033
font-weight: 700;
@@ -50,27 +43,26 @@ export const Intro = styled.div`
5043
width: ${remSize(110)};
5144
justify-content: space-evenly;
5245
color: ${prop('primaryTextColor')};
53-
background-color: ${prop('backgroundColor')};
46+
text-decoration: none;
5447
5548
&:hover {
5649
color: ${prop('Button.primary.default.background')};
5750
background-color: ${prop('Button.primary.hover.background')};
5851
border-color: ${prop('Button.primary.hover.border')};
5952
text-decoration: none;
6053
61-
svg path {
62-
fill: ${prop('Button.primary.default.background')};
54+
& svg {
55+
& path {
56+
fill: ${prop('Button.primary.default.background')};
57+
}
6358
}
6459
}
6560
}
6661
`;
6762

68-
6963
export const IntroHeadline = styled.div`
7064
display: flex;
7165
align-items: center;
72-
background-color: ${prop('backgroundColor')};
73-
color: ${prop('primaryTextColor')};
7466
7567
& div {
7668
height: 100%;
@@ -81,8 +73,10 @@ export const IntroHeadline = styled.div`
8173
color: ${prop('primaryTextColor')};
8274
}
8375
84-
& svg path {
85-
fill: ${prop('logoColor')};
76+
& svg {
77+
& path {
78+
fill: ${prop('logoColor')};
79+
}
8680
}
8781
8882
@media (max-width: 769px) {
@@ -95,12 +89,10 @@ export const IntroHeadline = styled.div`
9589
}
9690
`;
9791

98-
9992
export const IntroDescription = styled.div`
10093
line-height: ${remSize(27)};
10194
font-size: ${remSize(16)};
10295
margin: ${remSize(24)} 0;
103-
background-color: ${prop('backgroundColor')};
10496
color: ${prop('primaryTextColor')};
10597
10698
p {
@@ -109,11 +101,8 @@ export const IntroDescription = styled.div`
109101
}
110102
`;
111103

112-
113104
export const Section = styled.div`
114105
margin: ${remSize(50)} 0;
115-
background-color: ${prop('backgroundColor')};
116-
color: ${prop('primaryTextColor')};
117106
118107
& h2 {
119108
font-size: ${remSize(24)};
@@ -127,31 +116,25 @@ export const Section = styled.div`
127116
}
128117
`;
129118

130-
131119
export const SectionContainer = styled.div`
132120
display: flex;
133121
justify-content: row;
134122
padding-top: 0;
135123
font-size: ${remSize(16)};
136124
width: 100%;
137125
flex-wrap: wrap;
138-
background-color: ${prop('backgroundColor')};
139-
color: ${prop('primaryTextColor')};
140126
141127
@media (max-width: 769px) {
142128
display: grid;
143129
}
144130
`;
145131

146-
147132
export const SectionItem = styled.div`
148133
width: 33%;
149134
display: flex;
150135
line-height: ${remSize(19.5)};
151136
font-size: ${remSize(14)};
152137
padding: 0 ${remSize(30)} ${remSize(30)} 0;
153-
background-color: ${prop('backgroundColor')};
154-
color: ${prop('primaryTextColor')};
155138
156139
& p {
157140
margin-top: ${remSize(7)};
@@ -167,7 +150,7 @@ export const SectionItem = styled.div`
167150
&:hover {
168151
text-decoration: underline;
169152
text-decoration-thickness: 0.1em;
170-
color: ${prop('primaryTextColor')};
153+
color: ${prop('Button.primary.hover.background')};
171154
}
172155
}
173156
@@ -191,11 +174,8 @@ export const SectionItem = styled.div`
191174
}
192175
`;
193176

194-
195177
export const Contact = styled.div`
196178
margin-bottom: ${remSize(50)};
197-
background-color: ${prop('backgroundColor')};
198-
color: ${prop('primaryTextColor')};
199179
200180
& h2 {
201181
font-size: ${remSize(24)};
@@ -208,11 +188,9 @@ export const Contact = styled.div`
208188
width: 100%;
209189
margin: ${remSize(20)} 0;
210190
font-size: ${remSize(16)};
211-
color: ${prop('primaryTextColor')};
212191
}
213192
`;
214193

215-
216194
export const ContactTitle = styled.p`
217195
width: 50%;
218196
color: ${prop('primaryTextColor')};
@@ -222,7 +200,6 @@ export const ContactTitle = styled.p`
222200
}
223201
`;
224202

225-
226203
export const ContactHandles = styled.p`
227204
width: 50%;
228205
color: ${prop('primaryTextColor')};
@@ -233,7 +210,7 @@ export const ContactHandles = styled.p`
233210
234211
&:hover {
235212
text-decoration: underline;
236-
color: ${prop('logoColor')};
213+
color: ${prop('Button.primary.hover.background')};
237214
}
238215
}
239216
@@ -242,14 +219,11 @@ export const ContactHandles = styled.p`
242219
}
243220
`;
244221

245-
246222
export const Footer = styled.div`
247223
border-top: 0.1rem dashed ${prop('primaryTextColor')};
248224
padding: 0 ${remSize(20)} ${remSize(70)} 0;
249225
width: 100%;
250226
font-size: ${remSize(16)};
251-
background-color: ${prop('backgroundColor')};
252-
color: ${prop('primaryTextColor')};
253227
254228
& div {
255229
display: flex;
@@ -263,8 +237,9 @@ export const Footer = styled.div`
263237
text-decoration: underline;
264238
265239
&:hover {
240+
text-decoration: underline;
266241
text-decoration-thickness: 0.1em;
267-
color: ${prop('logoColor')};
242+
color: ${prop('Button.primary.hover.background')};
268243
}
269244
}
270245

client/modules/About/pages/About.jsx

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ import {
2121
} from '../About.styles';
2222

2323
import { ContactSectionLinks, AboutSectionInfo } from '../statics/aboutData';
24-
2524
import Nav from '../../IDE/components/Header/Nav';
2625
import RootPage from '../../../components/RootPage';
2726
import packageData from '../../../../package.json';
@@ -60,7 +59,6 @@ const About = () => {
6059
return (
6160
<RootPage>
6261
<GlobalStyle />
63-
6462
<Helmet>
6563
<title>{t('About.TitleHelmet')}</title>
6664
</Helmet>

0 commit comments

Comments
 (0)