Skip to content

fix(core): fix error boundary import disrupting CSS order #6052

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

Merged
slorber merged 3 commits into from
Dec 8, 2021
Merged

fix(core): fix error boundary import disrupting CSS order #6052

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2dda046
fix(core): fix error boundary import disrupting CSS order
Josh-Cena Dec 4, 2021
cf0088e
Oops
Josh-Cena Dec 5, 2021
889ad7f
Remove important
Josh-Cena Dec 8, 2021
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 packages/docusaurus-theme-classic/src/theme/AnnouncementBar/styles.module.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@ html[data-announcement-bar-initially-dismissed='true'] .announcementBar {
.announcementBarClose {
flex: 0 0 30px;
align-self: stretch;
padding: 0 !important;
line-height: 0 !important;
padding: 0;
line-height: 0;
}

.announcementBarContent {
Expand Down
6 changes: 4 additions & 2 deletions packages/docusaurus/src/client/App.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,16 @@ import routes from '@generated/routes';
import renderRoutes from './exports/renderRoutes';
import {BrowserContextProvider} from './exports/browserContext';
import {DocusaurusContextProvider} from './exports/docusaurusContext';
import ErrorBoundary from '@docusaurus/ErrorBoundary';
import PendingNavigation from './PendingNavigation';
import BaseUrlIssueBanner from './baseUrlIssueBanner/BaseUrlIssueBanner';
import Root from '@theme/Root';
import Error from '@theme/Error';

import './client-lifecycles-dispatcher';

// TODO, quick fix for CSS insertion order
import ErrorBoundary from '@docusaurus/ErrorBoundary';
import Error from '@theme/Error';

function App(): JSX.Element {
return (
<ErrorBoundary fallback={Error}>
Expand Down