Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixing a bunch of smaller issues and links #105

Merged
merged 8 commits into from
Apr 6, 2020
Merged

Fixing a bunch of smaller issues and links #105

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
35f7cfb
Fix undefined venue
Twissi Apr 5, 2020
001eca0
Rename links
Twissi Apr 5, 2020
ed20280
Clean up
Twissi Apr 5, 2020
a6a332b
Add anchor
Twissi Apr 5, 2020
a010b1c
Update link styles, fixes #79
Twissi Apr 5, 2020
97773c0
Fix team sections styles
Twissi Apr 5, 2020
b4d4850
Fix icon for events section
Twissi Apr 5, 2020
d3b125b
Remove copy for event section for now
Twissi Apr 5, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions components/Events.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ function Event({ event }) {
<div className='info'>
<div className='eventName'>{name}</div>
<div className='venue'>
{venue && `${venue.name} - ${venue.city}`}
{venue && `${venue.name} ${venue.city ? ' - ' + venue.city : ''}`}
</div>
</div>
</div>
Expand Down Expand Up @@ -79,7 +79,7 @@ Event.propTypes = {
local_time: PropTypes.string.isRequired,
venue: PropTypes.shape({
name: PropTypes.string.isRequired,
city: PropTypes.string.isRequired,
city: PropTypes.string,
}),
}).isRequired,
}
Expand Down
32 changes: 16 additions & 16 deletions components/Footer/Footer.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,23 +18,23 @@ export default function Footer() {
href={`/[lang]#find-events`}
as={`/${locale}#find-events`}
>
<a>{t('footer.joinMeetup')}</a>
<a className='invert'>{t('footer.joinMeetup')}</a>
</Link>
</li>
<li>
<Link
href={`/[lang]/guides#organize-meetup`}
as={`/${locale}/guides#organize-meetup`}
>
<a>{t('footer.organizeEvent')}</a>
<a className='invert'>{t('footer.organizeEvent')}</a>
</Link>
</li>
<li>
<Link
href={`/[lang]/guides#start-chapter`}
as={`/${locale}/guides#start-chapter`}
>
<a>{t('footer.startChapter')}</a>
<a className='invert'>{t('footer.startChapter')}</a>
</Link>
</li>
<li>
Expand All @@ -43,7 +43,7 @@ export default function Footer() {
as={`/${locale}/contribute#supporter`}
scroll={false}
>
<a>{t('footer.becomeSupporter')}</a>
<a className='invert'>{t('footer.becomeSupporter')}</a>
</Link>
</li>
</ul>
Expand All @@ -56,6 +56,7 @@ export default function Footer() {
href='https://twitter.com/opentechschool'
target='_blank'
rel='noopener noreferrer'
className='invert'
>
Twitter
</a>
Expand All @@ -65,6 +66,7 @@ export default function Footer() {
href='https://www.facebook.com/OpenTechSchool'
target='_blank'
rel='noopener noreferrer'
className='invert'
>
Facebook
</a>
Expand All @@ -74,6 +76,7 @@ export default function Footer() {
href='https://www.meetup.com/find/?allMeetups=true&keywords=opentechschool&radius=Infinity&sort=default'
target='_blank'
rel='noopener noreferrer'
className='invert'
>
Meetup
</a>
Expand All @@ -83,6 +86,7 @@ export default function Footer() {
href='https://github.com/OpenTechSchool/'
target='_blank'
rel='noopener noreferrer'
className='invert'
>
GitHub
</a>
Expand All @@ -92,6 +96,7 @@ export default function Footer() {
href='https://discourse.opentechschool.org/'
target='_blank'
rel='noopener noreferrer'
className='invert'
>
Discourse
</a>
Expand All @@ -106,23 +111,23 @@ export default function Footer() {
href={`/[lang]/about#history`}
as={`/${locale}/about#history`}
>
<a>{t('footer.history')}</a>
<a className='invert'>{t('footer.history')}</a>
</Link>
</li>
<li>
<Link
href={`/[lang]/about#foundation`}
as={`/${locale}/about#foundation`}
>
<a>{t('footer.foundation')}</a>
<a className='invert'>{t('footer.foundation')}</a>
</Link>
</li>
<li>
<Link
href={`/[lang]/about#core-values`}
as={`/${locale}/about#core-values`}
>
<a>{t('footer.coreValues')}</a>
<a className='invert'>{t('footer.coreValues')}</a>
</Link>
</li>
</ul>
Expand All @@ -135,20 +140,20 @@ export default function Footer() {
href={`/[lang]/codeOfConduct`}
as={`/${locale}/codeOfConduct`}
>
<a>{t('footer.codeOfConduct')}</a>
<a className='invert'>{t('footer.codeOfConduct')}</a>
</Link>
</li>
<li>
<Link
href={`/[lang]/guides#coaching-guidelines`}
as={`/${locale}/guides#coaching-guidelines`}
>
<a>{t('footer.coachingGuidelines')}</a>
<a className='invert'>{t('footer.coachingGuidelines')}</a>
</Link>
</li>
<li>
<Link href={`/[lang]/imprint`} as={`/${locale}/imprint`}>
<a>{t('footer.imprint')}</a>
<a className='invert'>{t('footer.imprint')}</a>
</Link>
</li>
</ul>
Expand Down Expand Up @@ -176,19 +181,14 @@ export default function Footer() {
color: #fff;
}

h4,
a {
h4 {
color: #fff;
}

a {
font-weight: normal;
}

a:hover {
border-bottom: 2px solid #fff;
}

.license {
font-size: 14px;
margin-top: 100px;
Expand Down
23 changes: 10 additions & 13 deletions components/Header/Header.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,20 +40,20 @@ export function Header({ setIsMenuOpen }) {

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

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

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

<Link href={`/[lang]/about`} as={`/${locale}/about`}>
<a>{t('header.about')}</a>
<a className='invert'>{t('header.about')}</a>
</Link>
</nav>
)}
Expand Down Expand Up @@ -85,18 +85,20 @@ export function Header({ setIsMenuOpen }) {
role='navigation'
aria-label='main navigation'
>
<a href='https://learn.opentechschool.org/'>{t('header.learn')}</a>
<a href='https://learn.opentechschool.org/' className='invert'>
{t('header.learn')}
</a>

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

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

<Link href={`/[lang]/about`} as={`/${locale}/about`}>
<a>{t('header.about')}</a>
<a className='invert'>{t('header.about')}</a>
</Link>
</nav>

Expand Down Expand Up @@ -144,17 +146,12 @@ export function Header({ setIsMenuOpen }) {
padding-bottom: 5px;
text-transform: uppercase;
letter-spacing: 0.01em;
color: white;
}

nav a:last-child {
margin-right: 0;
}

nav a:hover {
border-bottom: 2px solid white;
}

/* Mobile Menu */
.mobileMenuWrapper {
position: fixed;
Expand Down
31 changes: 17 additions & 14 deletions components/Section/ChapterSection.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,12 +32,14 @@ export default function ChapterSection() {
if (!data.is_inactive)
return (
<Grid item key={i}>
<Link
href={`/[lang]/city/[slug]`}
as={`/${locale}/city/${data.slug}`}
>
<a className='city'>{data.title}</a>
</Link>
<div className='chapter'>
<Link
href={`/[lang]/city/[slug]`}
as={`/${locale}/city/${data.slug}`}
>
<a className='highlight'>{data.title}</a>
</Link>
</div>
</Grid>
)
})}
Expand All @@ -49,19 +51,17 @@ export default function ChapterSection() {
margin: 0 auto;
}

.city {
color: var(--pink);
.highlight {
text-transform: uppercase;
font-family: var(--primaryFont);
font-weight: 600;
font-size: 20px;
padding: 0 8px;
margin-bottom: 20px;
display: inline-block;
}

.city:hover {
color: var(--mainBlue);
.chapter {
padding: 0 8px;
height: 50px;
}

h4 {
Expand All @@ -85,9 +85,12 @@ export default function ChapterSection() {
margin: 0;
}

.city {
font-size: 24px;
.chapter {
padding: 0 12px;
}

.highlight {
font-size: 24px;
display: inline;
}
}
Expand Down
15 changes: 3 additions & 12 deletions components/Section/ContactSection.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ export default function ContactSection() {
<p>{t('homepage.getInTouch.events.description')}</p>
<p>
<Link href={`/[lang]#events`} as={`/${locale}#events`}>
<a className='primaryLink'>
<a className='highlight'>
{t('homepage.getInTouch.events.cta')}
</a>
</Link>
Expand All @@ -58,7 +58,7 @@ export default function ContactSection() {
<p>{t('homepage.getInTouch.slack.description')}</p>
<p>
<a
className='primaryLink'
className='highlight'
href='https://opentechschool-slack.herokuapp.com/'
target='_blank'
rel='noopener noreferrer'
Expand All @@ -73,10 +73,7 @@ export default function ContactSection() {
</h4>
<p>{t('homepage.getInTouch.email.description')}</p>
<p>
<a
className='primaryLink'
href='mailto:info@opentechschool.org'
>
<a className='highlight' href='mailto:info@opentechschool.org'>
{t('homepage.getInTouch.email.cta')}
</a>
</p>
Expand All @@ -102,12 +99,6 @@ export default function ContactSection() {
.content :global(li:first-child) .subHeading:first-child {
padding-top: 0;
}
.primaryLink {
color: var(--pink);
}
.primaryLink:hover {
color: var(--mainBlue);
}
`}</style>
</TextSection>
)
Expand Down
3 changes: 3 additions & 0 deletions components/Section/SocialMediaSection.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ export default function SocialMediaSection({ bgColor = '' }) {
href='https://www.facebook.com/OpenTechSchool'
target='_blank'
rel='noopener noreferrer'
className='icon'
>
<FacebookIcon style={iconStyle} />
</a>
Expand All @@ -28,6 +29,7 @@ export default function SocialMediaSection({ bgColor = '' }) {
href='https://twitter.com/OpenTechSchool'
target='_blank'
rel='noopener noreferrer'
className='icon'
>
<TwitterIcon style={iconStyle} />
</a>
Expand All @@ -37,6 +39,7 @@ export default function SocialMediaSection({ bgColor = '' }) {
href='https://github.com/OpenTechSchool'
target='_blank'
rel='noopener noreferrer'
className='icon'
>
<GitHubIcon style={iconStyle} />
</a>
Expand Down
5 changes: 3 additions & 2 deletions components/Section/TextSection.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,9 @@ export default function TextSection({
margin-left: 20px;
}

.iconCenter :global(span) {
.icon-center :global(span) {
display: block;
margin: 0 auto;
font-size: 50px;
margin-top: 20px;
}
Expand Down Expand Up @@ -83,7 +85,6 @@ export default function TextSection({

.pink :global(a) {
color: white;
text-decoration: underline;
}

.grey {
Expand Down
3 changes: 0 additions & 3 deletions components/Team/DiscourseTeam.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,9 +102,6 @@ const Team = ({ discourseGroupName }) => {
font-weight: bold;
font-size: 20px;
}
a:hover {
text-decoration: underline;
}
`}</style>
</Grid>
)
Expand Down
1 change: 1 addition & 0 deletions components/Team/MarkdownTeam.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ const TeamSection = ({ members }) => {
})}
<style jsx>{`
p.name {
text-align: center;
font-weight: bold;
font-size: 20px;
}
Expand Down
Loading