Skip to content

Commit c587289

Browse files
committed
Merge remote-tracking branch 'origin/main'
2 parents 82330bc + 064257f commit c587289

File tree

6 files changed

+7
-39
lines changed

6 files changed

+7
-39
lines changed

components/header/Header.jsx

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ import useWindowSize from '../../hooks/useWindowSize'
1010
import GitHubLogo from '../../public/icons/github-logo'
1111
import IconCalendar from '../../public/icons/calendar'
1212
import IconBooks from '../../public/icons/books'
13-
import IconBell from '../../public/icons/bell'
1413
import BoxGift from '../../public/icons/box-gift'
1514
import { BREAKPOINTS } from '../../common/constants'
1615

@@ -66,20 +65,6 @@ const Header = () => {
6665

6766
<nav className="header__navigation">
6867
<ul className="header__list">
69-
<li>
70-
<Link
71-
href={ROUTES.NEWS.getPath(year)}
72-
aria-label={getLiteral('navigation:news')}
73-
className={clsx('header__link', {
74-
['is-active']: pathname === ROUTES.NEWS.getPath(year),
75-
})}
76-
>
77-
<IconBell />
78-
<span className="header__link-text">
79-
{getLiteral('navigation:news')}
80-
</span>
81-
</Link>
82-
</li>
8368
<li>
8469
<Link
8570
href={ROUTES.PARTNER_PACK.getPath(year)}
@@ -96,6 +81,7 @@ const Header = () => {
9681
</li>
9782
<li>
9883
<Link
84+
9985
href={ROUTES.SCHEDULE.getPath(year)}
10086
aria-label={getLiteral('navigation:schedule')}
10187
className={clsx('header__link', {

components/header/header.scss

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -118,8 +118,7 @@
118118
color: $white;
119119

120120
.icon-calendar,
121-
.icon-books,
122-
.icon-bell {
121+
.icon-books {
123122
path {
124123
fill: $white;
125124
}
@@ -131,8 +130,7 @@
131130
color: $purple;
132131

133132
.icon-calendar,
134-
.icon-books,
135-
.icon-bell {
133+
.icon-books {
136134
path {
137135
fill: $purple;
138136
}
@@ -141,8 +139,7 @@
141139
}
142140

143141
.icon-calendar,
144-
.icon-books,
145-
.icon-bell {
142+
.icon-books {
146143
path {
147144
fill: $white;
148145
transition: fill $simple-fade;

content/commons.json

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33

44
"anchor-nav:hero": "Maintainer Month",
55
"anchor-nav:about": "About",
6-
"anchor-nav:news": "News",
76
"anchor-nav:get-involved": "Get involved",
87
"anchor-nav:events": "Schedule",
98
"anchor-nav:connection": "Connection",
@@ -59,15 +58,10 @@
5958
"not-found:subtitle": "Page not found",
6059
"not-found:button": "Go home",
6160

62-
"navigation:news": "News",
6361
"navigation:schedule": "Schedule",
6462
"navigation:library": "Library",
6563
"navigation:partner-pack": "Partner Pack",
6664

67-
"news:title": "News",
68-
"news:description": "This is a long established fact that a reader will be distracted by the readable content of a page when looking at its layout.",
69-
70-
7165
"page:title": "Maintainer Month",
7266
"page:title-mobile": "MM",
7367
"page:date": "May 2025",
@@ -80,4 +74,4 @@
8074

8175
"timezone:utc": "UTC",
8276
"timezone:pt": "PT"
83-
}
77+
}

pages/index.js

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ import GetInvolved from '../components/home/get-involved/GetInvolved'
1313
import Events from '../components/home/events/Events'
1414
import AnchorNavigation from '../components/home/anchor-navigation/AnchorNavigation'
1515
import { useBackground } from '../contexts/BackgroundContext'
16-
import News from '../components/home/news/News'
1716

1817
export default function Home({ hero, about, news, getInvolved, events, connection, maintainerOptions, partnerOptions, newsList }) {
1918
const containerRef = useRef(null)
@@ -51,7 +50,7 @@ export default function Home({ hero, about, news, getInvolved, events, connectio
5150
/>
5251
<meta
5352
name="twitter:image"
54-
content="https://maintainermonth.github.com/images/og/generic.png?year=2023"
53+
content="https://maintainermonth.github.com/images/og/generic.png"
5554
/>
5655
</Head>
5756

@@ -66,10 +65,6 @@ export default function Home({ hero, about, news, getInvolved, events, connectio
6665
buttonLink={ROUTES.SCHEDULE.path}
6766
/>
6867
<About title={about.title} content={about.content} theme1={about.theme1} theme2={about.theme2}/>
69-
<News
70-
news={newsList.slice(-1)[0]}
71-
title={news.title}
72-
/>
7368
<GetInvolved
7469
title={getInvolved.title}
7570
content={getInvolved.content}
@@ -95,8 +90,6 @@ export default function Home({ hero, about, news, getInvolved, events, connectio
9590
export async function getStaticProps() {
9691
const hero = getDataFromMD('content/home/1-hero.md')
9792
const about = getDataFromMD('content/home/2-about.md')
98-
const news = getDataFromMD('content/home/3-news.md')
99-
const newsList = getDataFromMD('content/news/index.md').news
10093
const getInvolved = parseGetInvolvedData(
10194
getDataFromMD('content/home/4-get-involved.md'),
10295
)
@@ -118,9 +111,7 @@ export async function getStaticProps() {
118111
},
119112
connection,
120113
maintainerOptions,
121-
partnerOptions,
122-
news,
123-
newsList
114+
partnerOptions
124115
},
125116
}
126117
}

public/images/og/generic-2024.png

1.53 MB
Loading

public/images/og/generic.png

363 KB
Loading

0 commit comments

Comments
 (0)