Yuki Takei преди 2 години
родител
ревизия
919b3e1ff1

+ 0 - 7
apps/app/src/components/Common/PageViewLayout.module.scss

@@ -12,13 +12,6 @@ $page-view-layout-margin-top: 32px;
   min-height: calc(100vh - #{$subnavigation-height + $page-view-layout-margin-top + $page-content-footer-min-heigh});
 }
 
-// md/lg layout padding
-.page-view-layout :global {
-  @include bs.media-breakpoint-between(md, xl) {
-    padding-left: var.$grw-sidebar-nav-width;
-  }
-}
-
 // fluid layout
 .fluid-layout :global {
   .grw-container-convertible {

+ 1 - 1
apps/app/src/components/Common/PageViewLayout.tsx

@@ -23,7 +23,7 @@ export const PageViewLayout = (props: Props): JSX.Element => {
 
   return (
     <>
-      <div className={`main ${pageViewLayoutClass} ${fluidLayoutClass} flex-expand-vert`}>
+      <div className={`main ${pageViewLayoutClass} ${fluidLayoutClass} flex-expand-vert ps-sidebar`}>
         <div className="container-lg wide-gutter-x-lg grw-container-convertible flex-expand-vert">
           { headerContents != null && headerContents }
           { sideContents != null

+ 1 - 1
apps/app/src/pages/me/[[...path]].page.tsx

@@ -124,7 +124,7 @@ const MePage: NextPageWithLayout<Props> = (props: Props) => {
         <title>{title}</title>
       </Head>
       <div className="dynamic-layout-root">
-        <div className="main">
+        <div className="main ps-sidebar">
           <div className="container-lg wide-gutter-x-lg">
             <h1 className="title fs-3 mt-5">{ targetPage.title }</h1>
             {targetPage.component}

+ 1 - 1
apps/app/src/pages/tags.page.tsx

@@ -87,7 +87,7 @@ const TagPage: NextPageWithLayout<CommonProps> = (props: Props) => {
       <div className="dynamic-layout-root">
         <GroundGlassBar className="sticky-top py-4"></GroundGlassBar>
 
-        <div className="main" data-testid="tags-page">
+        <div className="main ps-sidebar" data-testid="tags-page">
           <div className="container-lg wide-gutter-x-lg">
 
             <h2 className="sticky-top py-1">

+ 1 - 1
apps/app/src/pages/trash.page.tsx

@@ -73,7 +73,7 @@ const TrashPage: NextPageWithLayout<CommonProps> = (props: Props) => {
       <div className="dynamic-layout-root">
         <GroundGlassBar className="sticky-top py-4"></GroundGlassBar>
 
-        <div className="main">
+        <div className="main ps-sidebar">
           <div className="container-lg wide-gutter-x-lg">
             <PagePathNavSticky pagePath="/trash" />
             <TrashPageList />

+ 7 - 0
apps/app/src/styles/_layout.scss

@@ -48,6 +48,13 @@
   }
 }
 
+// md/lg layout padding
+.ps-sidebar {
+  @include bs.media-breakpoint-between(md, xl) {
+    padding-left: var.$grw-sidebar-nav-width;
+  }
+}
+
 .wide-gutter-x-lg {
   @include bs.media-breakpoint-up(lg) {
     &,