Skip to content

Commit b5359e7

Browse files
TwissiTwissi
authored
Merge pull request #105 from Twissi/links-79
Fixing a bunch of smaller issues and links
2 parents 2ac7970 + d3b125b commit b5359e7

16 files changed

+129
-101
lines changed

‎components/Events.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ function Event({ event }) {
2121
<div className='info'>
2222
<div className='eventName'>{name}</div>
2323
<div className='venue'>
24-
{venue && `${venue.name} - ${venue.city}`}
24+
{venue && `${venue.name} ${venue.city ? ' - ' + venue.city : ''}`}
2525
</div>
2626
</div>
2727
</div>
@@ -79,7 +79,7 @@ Event.propTypes = {
7979
local_time: PropTypes.string.isRequired,
8080
venue: PropTypes.shape({
8181
name: PropTypes.string.isRequired,
82-
city: PropTypes.string.isRequired,
82+
city: PropTypes.string,
8383
}),
8484
}).isRequired,
8585
}

‎components/Footer/Footer.tsx

+16-16
Original file line numberDiff line numberDiff line change
@@ -18,23 +18,23 @@ export default function Footer() {
1818
href={`/[lang]#find-events`}
1919
as={`/${locale}#find-events`}
2020
>
21-
<a>{t('footer.joinMeetup')}</a>
21+
<a className='invert'>{t('footer.joinMeetup')}</a>
2222
</Link>
2323
</li>
2424
<li>
2525
<Link
2626
href={`/[lang]/guides#organize-meetup`}
2727
as={`/${locale}/guides#organize-meetup`}
2828
>
29-
<a>{t('footer.organizeEvent')}</a>
29+
<a className='invert'>{t('footer.organizeEvent')}</a>
3030
</Link>
3131
</li>
3232
<li>
3333
<Link
3434
href={`/[lang]/guides#start-chapter`}
3535
as={`/${locale}/guides#start-chapter`}
3636
>
37-
<a>{t('footer.startChapter')}</a>
37+
<a className='invert'>{t('footer.startChapter')}</a>
3838
</Link>
3939
</li>
4040
<li>
@@ -43,7 +43,7 @@ export default function Footer() {
4343
as={`/${locale}/contribute#supporter`}
4444
scroll={false}
4545
>
46-
<a>{t('footer.becomeSupporter')}</a>
46+
<a className='invert'>{t('footer.becomeSupporter')}</a>
4747
</Link>
4848
</li>
4949
</ul>
@@ -56,6 +56,7 @@ export default function Footer() {
5656
href='https://twitter.com/opentechschool'
5757
target='_blank'
5858
rel='noopener noreferrer'
59+
className='invert'
5960
>
6061
Twitter
6162
</a>
@@ -65,6 +66,7 @@ export default function Footer() {
6566
href='https://www.facebook.com/OpenTechSchool'
6667
target='_blank'
6768
rel='noopener noreferrer'
69+
className='invert'
6870
>
6971
Facebook
7072
</a>
@@ -74,6 +76,7 @@ export default function Footer() {
7476
href='https://www.meetup.com/find/?allMeetups=true&keywords=opentechschool&radius=Infinity&sort=default'
7577
target='_blank'
7678
rel='noopener noreferrer'
79+
className='invert'
7780
>
7881
Meetup
7982
</a>
@@ -83,6 +86,7 @@ export default function Footer() {
8386
href='https://github.com/OpenTechSchool/'
8487
target='_blank'
8588
rel='noopener noreferrer'
89+
className='invert'
8690
>
8791
GitHub
8892
</a>
@@ -92,6 +96,7 @@ export default function Footer() {
9296
href='https://discourse.opentechschool.org/'
9397
target='_blank'
9498
rel='noopener noreferrer'
99+
className='invert'
95100
>
96101
Discourse
97102
</a>
@@ -106,23 +111,23 @@ export default function Footer() {
106111
href={`/[lang]/about#history`}
107112
as={`/${locale}/about#history`}
108113
>
109-
<a>{t('footer.history')}</a>
114+
<a className='invert'>{t('footer.history')}</a>
110115
</Link>
111116
</li>
112117
<li>
113118
<Link
114119
href={`/[lang]/about#foundation`}
115120
as={`/${locale}/about#foundation`}
116121
>
117-
<a>{t('footer.foundation')}</a>
122+
<a className='invert'>{t('footer.foundation')}</a>
118123
</Link>
119124
</li>
120125
<li>
121126
<Link
122127
href={`/[lang]/about#core-values`}
123128
as={`/${locale}/about#core-values`}
124129
>
125-
<a>{t('footer.coreValues')}</a>
130+
<a className='invert'>{t('footer.coreValues')}</a>
126131
</Link>
127132
</li>
128133
</ul>
@@ -135,20 +140,20 @@ export default function Footer() {
135140
href={`/[lang]/codeOfConduct`}
136141
as={`/${locale}/codeOfConduct`}
137142
>
138-
<a>{t('footer.codeOfConduct')}</a>
143+
<a className='invert'>{t('footer.codeOfConduct')}</a>
139144
</Link>
140145
</li>
141146
<li>
142147
<Link
143148
href={`/[lang]/guides#coaching-guidelines`}
144149
as={`/${locale}/guides#coaching-guidelines`}
145150
>
146-
<a>{t('footer.coachingGuidelines')}</a>
151+
<a className='invert'>{t('footer.coachingGuidelines')}</a>
147152
</Link>
148153
</li>
149154
<li>
150155
<Link href={`/[lang]/imprint`} as={`/${locale}/imprint`}>
151-
<a>{t('footer.imprint')}</a>
156+
<a className='invert'>{t('footer.imprint')}</a>
152157
</Link>
153158
</li>
154159
</ul>
@@ -176,19 +181,14 @@ export default function Footer() {
176181
color: #fff;
177182
}
178183
179-
h4,
180-
a {
184+
h4 {
181185
color: #fff;
182186
}
183187
184188
a {
185189
font-weight: normal;
186190
}
187191
188-
a:hover {
189-
border-bottom: 2px solid #fff;
190-
}
191-
192192
.license {
193193
font-size: 14px;
194194
margin-top: 100px;

‎components/Header/Header.tsx

+10-13
Original file line numberDiff line numberDiff line change
@@ -40,20 +40,20 @@ export function Header({ setIsMenuOpen }) {
4040

4141
{isDesktop && (
4242
<nav role='navigation' aria-label='main navigation'>
43-
<a href='https://learn.opentechschool.org/'>
43+
<a href='https://learn.opentechschool.org/' className='invert'>
4444
{t('header.learn')}
4545
</a>
4646

4747
<Link href={`/[lang]/contribute`} as={`/${locale}/contribute`}>
48-
<a>{t('header.contribute')}</a>
48+
<a className='invert'>{t('header.contribute')}</a>
4949
</Link>
5050

5151
<Link href={`/[lang]/community`} as={`/${locale}/community`}>
52-
<a>{t('header.community')}</a>
52+
<a className='invert'>{t('header.community')}</a>
5353
</Link>
5454

5555
<Link href={`/[lang]/about`} as={`/${locale}/about`}>
56-
<a>{t('header.about')}</a>
56+
<a className='invert'>{t('header.about')}</a>
5757
</Link>
5858
</nav>
5959
)}
@@ -85,18 +85,20 @@ export function Header({ setIsMenuOpen }) {
8585
role='navigation'
8686
aria-label='main navigation'
8787
>
88-
<a href='https://learn.opentechschool.org/'>{t('header.learn')}</a>
88+
<a href='https://learn.opentechschool.org/' className='invert'>
89+
{t('header.learn')}
90+
</a>
8991

9092
<Link href={`/[lang]/contribute`} as={`/${locale}/contribute`}>
91-
<a>{t('header.contribute')}</a>
93+
<a className='invert'>{t('header.contribute')}</a>
9294
</Link>
9395

9496
<Link href={`/[lang]/community`} as={`/${locale}/community`}>
95-
<a>{t('header.community')}</a>
97+
<a className='invert'>{t('header.community')}</a>
9698
</Link>
9799

98100
<Link href={`/[lang]/about`} as={`/${locale}/about`}>
99-
<a>{t('header.about')}</a>
101+
<a className='invert'>{t('header.about')}</a>
100102
</Link>
101103
</nav>
102104

@@ -144,17 +146,12 @@ export function Header({ setIsMenuOpen }) {
144146
padding-bottom: 5px;
145147
text-transform: uppercase;
146148
letter-spacing: 0.01em;
147-
color: white;
148149
}
149150
150151
nav a:last-child {
151152
margin-right: 0;
152153
}
153154
154-
nav a:hover {
155-
border-bottom: 2px solid white;
156-
}
157-
158155
/* Mobile Menu */
159156
.mobileMenuWrapper {
160157
position: fixed;

‎components/Section/ChapterSection.tsx

+17-14
Original file line numberDiff line numberDiff line change
@@ -32,12 +32,14 @@ export default function ChapterSection() {
3232
if (!data.is_inactive)
3333
return (
3434
<Grid item key={i}>
35-
<Link
36-
href={`/[lang]/city/[slug]`}
37-
as={`/${locale}/city/${data.slug}`}
38-
>
39-
<a className='city'>{data.title}</a>
40-
</Link>
35+
<div className='chapter'>
36+
<Link
37+
href={`/[lang]/city/[slug]`}
38+
as={`/${locale}/city/${data.slug}`}
39+
>
40+
<a className='highlight'>{data.title}</a>
41+
</Link>
42+
</div>
4143
</Grid>
4244
)
4345
})}
@@ -49,19 +51,17 @@ export default function ChapterSection() {
4951
margin: 0 auto;
5052
}
5153
52-
.city {
53-
color: var(--pink);
54+
.highlight {
5455
text-transform: uppercase;
5556
font-family: var(--primaryFont);
5657
font-weight: 600;
5758
font-size: 20px;
58-
padding: 0 8px;
59-
margin-bottom: 20px;
6059
display: inline-block;
6160
}
6261
63-
.city:hover {
64-
color: var(--mainBlue);
62+
.chapter {
63+
padding: 0 8px;
64+
height: 50px;
6565
}
6666
6767
h4 {
@@ -85,9 +85,12 @@ export default function ChapterSection() {
8585
margin: 0;
8686
}
8787
88-
.city {
89-
font-size: 24px;
88+
.chapter {
9089
padding: 0 12px;
90+
}
91+
92+
.highlight {
93+
font-size: 24px;
9194
display: inline;
9295
}
9396
}

‎components/Section/ContactSection.tsx

+3-12
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ export default function ContactSection() {
4545
<p>{t('homepage.getInTouch.events.description')}</p>
4646
<p>
4747
<Link href={`/[lang]#events`} as={`/${locale}#events`}>
48-
<a className='primaryLink'>
48+
<a className='highlight'>
4949
{t('homepage.getInTouch.events.cta')}
5050
</a>
5151
</Link>
@@ -58,7 +58,7 @@ export default function ContactSection() {
5858
<p>{t('homepage.getInTouch.slack.description')}</p>
5959
<p>
6060
<a
61-
className='primaryLink'
61+
className='highlight'
6262
href='https://opentechschool-slack.herokuapp.com/'
6363
target='_blank'
6464
rel='noopener noreferrer'
@@ -73,10 +73,7 @@ export default function ContactSection() {
7373
</h4>
7474
<p>{t('homepage.getInTouch.email.description')}</p>
7575
<p>
76-
<a
77-
className='primaryLink'
78-
href='mailto:[email protected]'
79-
>
76+
<a className='highlight' href='mailto:[email protected]'>
8077
{t('homepage.getInTouch.email.cta')}
8178
</a>
8279
</p>
@@ -102,12 +99,6 @@ export default function ContactSection() {
10299
.content :global(li:first-child) .subHeading:first-child {
103100
padding-top: 0;
104101
}
105-
.primaryLink {
106-
color: var(--pink);
107-
}
108-
.primaryLink:hover {
109-
color: var(--mainBlue);
110-
}
111102
`}</style>
112103
</TextSection>
113104
)

‎components/Section/SocialMediaSection.tsx

+3
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ export default function SocialMediaSection({ bgColor = '' }) {
1919
href='https://www.facebook.com/OpenTechSchool'
2020
target='_blank'
2121
rel='noopener noreferrer'
22+
className='icon'
2223
>
2324
<FacebookIcon style={iconStyle} />
2425
</a>
@@ -28,6 +29,7 @@ export default function SocialMediaSection({ bgColor = '' }) {
2829
href='https://twitter.com/OpenTechSchool'
2930
target='_blank'
3031
rel='noopener noreferrer'
32+
className='icon'
3133
>
3234
<TwitterIcon style={iconStyle} />
3335
</a>
@@ -37,6 +39,7 @@ export default function SocialMediaSection({ bgColor = '' }) {
3739
href='https://github.com/OpenTechSchool'
3840
target='_blank'
3941
rel='noopener noreferrer'
42+
className='icon'
4043
>
4144
<GitHubIcon style={iconStyle} />
4245
</a>

‎components/Section/TextSection.tsx

+3-2
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,9 @@ export default function TextSection({
3232
margin-left: 20px;
3333
}
3434
35-
.iconCenter :global(span) {
35+
.icon-center :global(span) {
36+
display: block;
37+
margin: 0 auto;
3638
font-size: 50px;
3739
margin-top: 20px;
3840
}
@@ -83,7 +85,6 @@ export default function TextSection({
8385
8486
.pink :global(a) {
8587
color: white;
86-
text-decoration: underline;
8788
}
8889
8990
.grey {

‎components/Team/DiscourseTeam.tsx

-3
Original file line numberDiff line numberDiff line change
@@ -102,9 +102,6 @@ const Team = ({ discourseGroupName }) => {
102102
font-weight: bold;
103103
font-size: 20px;
104104
}
105-
a:hover {
106-
text-decoration: underline;
107-
}
108105
`}</style>
109106
</Grid>
110107
)

‎components/Team/MarkdownTeam.tsx

+1
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ const TeamSection = ({ members }) => {
4242
})}
4343
<style jsx>{`
4444
p.name {
45+
text-align: center;
4546
font-weight: bold;
4647
font-size: 20px;
4748
}

0 commit comments

Comments
 (0)