Merge pull request #23369: [Website] fix navbar footer overlap

aromanenko-dev · web-flow · commit 9c2fb3e6c8f1 · 2022-10-04T11:21:31.000+02:00
diff --git a/website/www/site/assets/scss/_global.sass b/website/www/site/assets/scss/_global.sass
@@ -76,7 +76,7 @@ body
   margin-right: auto
 
 .body__section-nav
-  margin-left: 256px
+  margin-left: 6px
   width: calc(100% - 492px)
 
   > [id]:before
@@ -97,6 +97,7 @@ body
   position: relative
   background-color: #fff
   margin-top: 64px
+  display: flex
 
   @media (min-width: $tablet)
     margin-top: 0
diff --git a/website/www/site/assets/scss/_lists.scss b/website/www/site/assets/scss/_lists.scss
@@ -315,3 +315,7 @@
      height: 44px;
    }
  }
+
+ .arrow-list--no-mt {
+   margin-top: 0;
+ }
diff --git a/website/www/site/assets/scss/_playground.sass b/website/www/site/assets/scss/_playground.sass
@@ -27,6 +27,9 @@
 
 .playground-section
   padding: 15px 30px 15px
+  max-width: 1200px
+  margin-left: auto
+  margin-right: auto
   h1
     text-align: center
     margin-top: 0
diff --git a/website/www/site/assets/scss/_section-nav.scss b/website/www/site/assets/scss/_section-nav.scss
@@ -16,7 +16,6 @@
  */
 .section-nav {
 	max-width: 250px;
-	position: absolute;
 	width: 100%;
 	overflow-y: auto;
 	background-color: #fbfbfb;
diff --git a/website/www/site/layouts/contribute/arrow_template.html b/website/www/site/layouts/contribute/arrow_template.html
@@ -31,7 +31,7 @@
       {{ .TableOfContents }}
     </nav>
 
-    <div class="body__contained body__section-nav arrow-list">
+    <div class="body__contained body__section-nav arrow-list arrow-list--no-mt">
       {{ .Content }}
       {{ partial "feedback.html" . }}
     </div>
diff --git a/website/www/site/layouts/documentation/baseof.html b/website/www/site/layouts/documentation/baseof.html
@@ -31,7 +31,7 @@
       {{ .TableOfContents }}
     </nav>
 
-    <div class="body__contained body__section-nav arrow-list">
+    <div class="body__contained body__section-nav arrow-list arrow-list--no-mt">
       {{ .Content }}
       {{ partial "feedback.html" . }}
     </div>
diff --git a/website/www/site/layouts/languages/baseof.html b/website/www/site/layouts/languages/baseof.html
@@ -38,4 +38,3 @@
  {{ partial "footer.html" . }}
  </body>
  </html>
- 
diff --git a/website/www/site/layouts/runners/arrow_template.html b/website/www/site/layouts/runners/arrow_template.html
@@ -31,7 +31,7 @@
       {{ .TableOfContents }}
     </nav>
 
-    <div class="body__contained body__section-nav arrow-list">
+    <div class="body__contained body__section-nav arrow-list arrow-list--no-mt">
       {{ .Content }}
       {{ partial "feedback.html" . }}
     </div>

Original file line number	Diff line number	Diff line change
`@@ -315,3 +315,7 @@`
`315`	`315`	`height: 44px;`
`316`	`316`	`}`
`317`	`317`	`}`
	`318`	`+`
	`319`	`+ .arrow-list--no-mt {`
	`320`	`+ margin-top: 0;`
	`321`	`+ }`
-Original file line number
+Diff line change
  {{ partial "footer.html" . }}
  </body>
  </html>
+-