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

Jump to bottom

feat: Opt-out Error page from dark scheme color #36951

Merged
merged 8 commits into from
May 22, 2022
Merged

feat: Opt-out Error page from dark scheme color #36951

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
b5b25ac
feat: Opt-out Error page from dark scheme color
icyJoseph May 16, 2022
800d642
Merge branch 'canary' into feat/opt-out-error-dark-mode
icyJoseph May 16, 2022
c8d9083
Merge branch 'canary' into feat/opt-out-error-dark-mode
icyJoseph May 17, 2022
7c27b7e
Merge branch 'canary' into feat/opt-out-error-dark-mode
icyJoseph May 17, 2022
1bf5030
Merge branch 'canary' into feat/opt-out-error-dark-mode
icyJoseph May 17, 2022
039fe22
fix: Narrow `withDarkMode` to the media-query
icyJoseph May 17, 2022
e975e69
Merge branch 'canary' into feat/opt-out-error-dark-mode
icyJoseph May 19, 2022
8b684ee
Merge branch 'canary' into feat/opt-out-error-dark-mode
ijjk May 22, 2022
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
11 changes: 9 additions & 2 deletions packages/next/pages/_error.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ const statusCodes: { [code: number]: string } = {
export type ErrorProps = {
statusCode: number
title?: string
withDarkMode?: boolean
}

function _getInitialProps({
Expand All @@ -33,7 +34,7 @@ export default class Error<P = {}> extends React.Component<P & ErrorProps> {
static origGetInitialProps = _getInitialProps

render() {
const { statusCode } = this.props
const { statusCode, withDarkMode = true } = this.props
const title =
this.props.title ||
statusCodes[statusCode] ||
Expand All @@ -56,14 +57,20 @@ export default class Error<P = {}> extends React.Component<P & ErrorProps> {
.next-error-h1 {
border-right: 1px solid rgba(0, 0, 0, .3);
icyJoseph marked this conversation as resolved.
Show resolved Hide resolved
}
@media (prefers-color-scheme: dark) {

${
withDarkMode
? `@media (prefers-color-scheme: dark) {
body { color: #fff; background: #000; }
.next-error-h1 {
border-right: 1px solid rgba(255, 255, 255, .3);
}
}`
: ''
}`,
}}
/>

{statusCode ? (
<h1 className="next-error-h1" style={styles.h1}>
{statusCode}
Expand Down