From 2dda046908d866f9428dd457fe6f594f3fb9802d Mon Sep 17 00:00:00 2001 From: Joshua Chen Date: Sat, 4 Dec 2021 23:59:00 +0800 Subject: [PATCH 1/3] fix(core): fix error boundary import disrupting CSS order --- packages/docusaurus/src/client/App.tsx | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/packages/docusaurus/src/client/App.tsx b/packages/docusaurus/src/client/App.tsx index 4082be154efc..fad91c52dace 100644 --- a/packages/docusaurus/src/client/App.tsx +++ b/packages/docusaurus/src/client/App.tsx @@ -14,11 +14,13 @@ 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 Root from '@theme/Root'; +import Error from '@theme/Error'; + function App(): JSX.Element { return ( From cf0088e47f5e32f8e078935c354057e9933f0c39 Mon Sep 17 00:00:00 2001 From: Joshua Chen Date: Sun, 5 Dec 2021 09:06:07 +0800 Subject: [PATCH 2/3] Oops --- packages/docusaurus/src/client/App.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/docusaurus/src/client/App.tsx b/packages/docusaurus/src/client/App.tsx index fad91c52dace..48a78adfe47a 100644 --- a/packages/docusaurus/src/client/App.tsx +++ b/packages/docusaurus/src/client/App.tsx @@ -11,14 +11,14 @@ 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 './client-lifecycles-dispatcher'; // TODO, quick fix for CSS insertion order -import Root from '@theme/Root'; +import ErrorBoundary from '@docusaurus/ErrorBoundary'; import Error from '@theme/Error'; function App(): JSX.Element { From 889ad7f67b95c9edd5c2d965b049a3bce917abd6 Mon Sep 17 00:00:00 2001 From: Joshua Chen Date: Wed, 8 Dec 2021 08:56:12 +0800 Subject: [PATCH 3/3] Remove important --- .../src/theme/AnnouncementBar/styles.module.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/docusaurus-theme-classic/src/theme/AnnouncementBar/styles.module.css b/packages/docusaurus-theme-classic/src/theme/AnnouncementBar/styles.module.css index a357446eb75d..74969ee6515c 100644 --- a/packages/docusaurus-theme-classic/src/theme/AnnouncementBar/styles.module.css +++ b/packages/docusaurus-theme-classic/src/theme/AnnouncementBar/styles.module.css @@ -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 {