From 16e4c2696adc44417563279d6793f609fea11881 Mon Sep 17 00:00:00 2001
From: Ze Yu <angzeyu@gmail.com>
Date: Thu, 6 May 2021 12:56:18 +0800
Subject: [PATCH] Fix page & site nav component paddings

---
 docs/css/main.css                                             | 3 +--
 .../test/functional/test_site/expected/stylesheets/styles.css | 3 +--
 packages/cli/test/functional/test_site/stylesheets/styles.css | 3 +--
 .../test_site_convert/expected/stylesheets/main.css           | 3 +--
 .../test_site_convert/non_markbind_site/stylesheets/main.css  | 3 +--
 .../test_default/expected/stylesheets/main.css                | 3 +--
 packages/core-web/src/styles/page-nav.css                     | 4 ++++
 packages/core/template/default/stylesheets/main.css           | 3 +--
 packages/vue-components/src/SiteNav.vue                       | 4 ----
 9 files changed, 11 insertions(+), 18 deletions(-)

diff --git a/docs/css/main.css b/docs/css/main.css
index 009ea2a93e..550fbb2c5b 100644
--- a/docs/css/main.css
+++ b/docs/css/main.css
@@ -81,12 +81,11 @@ mark {
 }
 
 .site-nav-top {
-    margin-top: 0.8rem;
+    margin: 0.8rem 0;
     padding: 0 12px 12px 12px;
 }
 
 .nav-component {
-    padding: 0.8rem 12px 0 12px;
     overflow-y: auto;
 }
 
diff --git a/packages/cli/test/functional/test_site/expected/stylesheets/styles.css b/packages/cli/test/functional/test_site/expected/stylesheets/styles.css
index 009ea2a93e..550fbb2c5b 100644
--- a/packages/cli/test/functional/test_site/expected/stylesheets/styles.css
+++ b/packages/cli/test/functional/test_site/expected/stylesheets/styles.css
@@ -81,12 +81,11 @@ mark {
 }
 
 .site-nav-top {
-    margin-top: 0.8rem;
+    margin: 0.8rem 0;
     padding: 0 12px 12px 12px;
 }
 
 .nav-component {
-    padding: 0.8rem 12px 0 12px;
     overflow-y: auto;
 }
 
diff --git a/packages/cli/test/functional/test_site/stylesheets/styles.css b/packages/cli/test/functional/test_site/stylesheets/styles.css
index 009ea2a93e..550fbb2c5b 100644
--- a/packages/cli/test/functional/test_site/stylesheets/styles.css
+++ b/packages/cli/test/functional/test_site/stylesheets/styles.css
@@ -81,12 +81,11 @@ mark {
 }
 
 .site-nav-top {
-    margin-top: 0.8rem;
+    margin: 0.8rem 0;
     padding: 0 12px 12px 12px;
 }
 
 .nav-component {
-    padding: 0.8rem 12px 0 12px;
     overflow-y: auto;
 }
 
diff --git a/packages/cli/test/functional/test_site_convert/expected/stylesheets/main.css b/packages/cli/test/functional/test_site_convert/expected/stylesheets/main.css
index 009ea2a93e..550fbb2c5b 100644
--- a/packages/cli/test/functional/test_site_convert/expected/stylesheets/main.css
+++ b/packages/cli/test/functional/test_site_convert/expected/stylesheets/main.css
@@ -81,12 +81,11 @@ mark {
 }
 
 .site-nav-top {
-    margin-top: 0.8rem;
+    margin: 0.8rem 0;
     padding: 0 12px 12px 12px;
 }
 
 .nav-component {
-    padding: 0.8rem 12px 0 12px;
     overflow-y: auto;
 }
 
diff --git a/packages/cli/test/functional/test_site_convert/non_markbind_site/stylesheets/main.css b/packages/cli/test/functional/test_site_convert/non_markbind_site/stylesheets/main.css
index 009ea2a93e..550fbb2c5b 100644
--- a/packages/cli/test/functional/test_site_convert/non_markbind_site/stylesheets/main.css
+++ b/packages/cli/test/functional/test_site_convert/non_markbind_site/stylesheets/main.css
@@ -81,12 +81,11 @@ mark {
 }
 
 .site-nav-top {
-    margin-top: 0.8rem;
+    margin: 0.8rem 0;
     padding: 0 12px 12px 12px;
 }
 
 .nav-component {
-    padding: 0.8rem 12px 0 12px;
     overflow-y: auto;
 }
 
diff --git a/packages/cli/test/functional/test_site_templates/test_default/expected/stylesheets/main.css b/packages/cli/test/functional/test_site_templates/test_default/expected/stylesheets/main.css
index 009ea2a93e..550fbb2c5b 100644
--- a/packages/cli/test/functional/test_site_templates/test_default/expected/stylesheets/main.css
+++ b/packages/cli/test/functional/test_site_templates/test_default/expected/stylesheets/main.css
@@ -81,12 +81,11 @@ mark {
 }
 
 .site-nav-top {
-    margin-top: 0.8rem;
+    margin: 0.8rem 0;
     padding: 0 12px 12px 12px;
 }
 
 .nav-component {
-    padding: 0.8rem 12px 0 12px;
     overflow-y: auto;
 }
 
diff --git a/packages/core-web/src/styles/page-nav.css b/packages/core-web/src/styles/page-nav.css
index c7f578125d..cce57ae8da 100644
--- a/packages/core-web/src/styles/page-nav.css
+++ b/packages/core-web/src/styles/page-nav.css
@@ -1,5 +1,9 @@
 /* Page navigation */
 
+#mb-page-nav {
+    padding: 0.8rem 12px 0 12px;
+}
+
 #mb-page-nav a:link,
 #mb-page-nav a:visited {
     color: #9b9b9b;
diff --git a/packages/core/template/default/stylesheets/main.css b/packages/core/template/default/stylesheets/main.css
index 009ea2a93e..550fbb2c5b 100644
--- a/packages/core/template/default/stylesheets/main.css
+++ b/packages/core/template/default/stylesheets/main.css
@@ -81,12 +81,11 @@ mark {
 }
 
 .site-nav-top {
-    margin-top: 0.8rem;
+    margin: 0.8rem 0;
     padding: 0 12px 12px 12px;
 }
 
 .nav-component {
-    padding: 0.8rem 12px 0 12px;
     overflow-y: auto;
 }
 
diff --git a/packages/vue-components/src/SiteNav.vue b/packages/vue-components/src/SiteNav.vue
index dfe3ecef91..fe4b485095 100644
--- a/packages/vue-components/src/SiteNav.vue
+++ b/packages/vue-components/src/SiteNav.vue
@@ -46,10 +46,6 @@ export default {
         padding-left: 0;
     }
 
-    .site-nav-list-root {
-        margin: 0 -12px;
-    }
-
     .site-nav-default-list-item {
         display: flex;
         padding: 0.5rem 0 0 2.8rem;