From ec69460b4fa56814aeedbf9f9f09c0d89b2f36db Mon Sep 17 00:00:00 2001 From: Tushar Sharma Date: Wed, 5 Jun 2019 10:23:53 +0530 Subject: [PATCH] fix(v2): removes hardcoded sidebar width (#1535) * fix(v2): removes hardcoded sidebar width * fix(v2): remove grid layout and keep fixed width of sidebar --- .../src/theme/DocItem/index.js | 2 +- .../src/theme/DocItem/styles.module.css | 10 ++++++++ .../src/theme/DocPage/index.js | 8 ++++--- .../src/theme/DocPage/styles.css | 23 +++++++++++++++++++ 4 files changed, 39 insertions(+), 4 deletions(-) create mode 100644 packages/docusaurus-plugin-content-docs/src/theme/DocPage/styles.css diff --git a/packages/docusaurus-plugin-content-docs/src/theme/DocItem/index.js b/packages/docusaurus-plugin-content-docs/src/theme/DocItem/index.js index 9632207ee5..42a22890f0 100644 --- a/packages/docusaurus-plugin-content-docs/src/theme/DocItem/index.js +++ b/packages/docusaurus-plugin-content-docs/src/theme/DocItem/index.js @@ -36,7 +36,7 @@ function DocItem(props) { {metadata && metadata.title && {metadata.title}} -
+
diff --git a/packages/docusaurus-plugin-content-docs/src/theme/DocItem/styles.module.css b/packages/docusaurus-plugin-content-docs/src/theme/DocItem/styles.module.css index 8471d19777..5c5fc0b027 100644 --- a/packages/docusaurus-plugin-content-docs/src/theme/DocItem/styles.module.css +++ b/packages/docusaurus-plugin-content-docs/src/theme/DocItem/styles.module.css @@ -9,6 +9,16 @@ min-height: calc(100vh - 50px); } +.container { + padding-top: 2rem !important; +} + +@media (min-width: 996px) { + .container { + padding-left: 2rem; + } +} + @media only screen and (min-width: 996px) { .tableOfContents { max-height: calc(100vh - (var(--ifm-navbar-height) + 2rem)); diff --git a/packages/docusaurus-plugin-content-docs/src/theme/DocPage/index.js b/packages/docusaurus-plugin-content-docs/src/theme/DocPage/index.js index a026bb28df..73bf438a06 100644 --- a/packages/docusaurus-plugin-content-docs/src/theme/DocPage/index.js +++ b/packages/docusaurus-plugin-content-docs/src/theme/DocPage/index.js @@ -12,6 +12,8 @@ import Layout from '@theme/Layout'; // eslint-disable-line import DocSidebar from '@theme/DocSidebar'; +import './styles.css'; + function DocPage(props) { const {route, docsMetadata, location} = props; const {permalinkToId} = docsMetadata; @@ -24,11 +26,11 @@ function DocPage(props) { return (
-
-
+
+
-
+
{renderRoutes(route.routes, {docsMetadata})}
diff --git a/packages/docusaurus-plugin-content-docs/src/theme/DocPage/styles.css b/packages/docusaurus-plugin-content-docs/src/theme/DocPage/styles.css new file mode 100644 index 0000000000..f44d83b29e --- /dev/null +++ b/packages/docusaurus-plugin-content-docs/src/theme/DocPage/styles.css @@ -0,0 +1,23 @@ +/** + * Copyright (c) 2017-present, Facebook, Inc. + * + * This source code is licensed under the MIT license found in the + * LICENSE file in the root directory of this source tree. + */ + + /** + * width 19rem is calculated according to (sidebarWidth - sidebarPadding) + * i.e 20rem - ( 0.5rem + 0.5rem ) + * Todo - 0.5rem and 20rem should be a css variable + */ + + @media (min-width: 996px) { + .sidebar__container { + width: 19rem; + float: left; + min-height: calc(100vh - var(--ifm-navbar-height)); + } + .content__container { + margin: 0 0 0 19rem; + } +}