chore: Resolve conflicts

linhe0x0 · Feb 15, 2020 · 6b61a2b · 6b61a2b
2 parents ac434d5 + c7106b4
commit 6b61a2b
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git a/Page.vue b/Page.vue
@@ -266,10 +266,15 @@ export default {
 
   &__heading
     width: 50%
-    padding: 4rem 3rem 0
+    padding: 0
     overflow: auto
     background-color: #fafafa
 
+    h1,
+    h2,
+    h3
+      padding: 4rem 3rem 0
+
   &__body
     display: flex
     overflow-x: hidden

diff --git a/components/Sidebar/index.vue b/components/Sidebar/index.vue
@@ -20,7 +20,7 @@
           ]"
         >
           <div class="category__label">
-            <NavLink :to="sidebarGroupItem.to">{{
+            <NavLink class="sidebar-link" :to="sidebarGroupItem.to">{{
               title(sidebarGroupItem.title || sidebarGroupOrder[index])
             }}</NavLink>
           </div>
@@ -42,7 +42,7 @@
           ]"
         >
           <div class="category__label">
-            <NavLink :to="`${sidebarGroupItem.to}#${header.slug}`">{{
+            <NavLink class="sidebar-link" :to="`${sidebarGroupItem.to}#${header.slug}`">{{
               title(header.title)
             }}</NavLink>
           </div>
@@ -65,7 +65,7 @@
           ]"
         >
           <div class="category__label">
-            <NavLink :to="child.to">{{ title(child.title) }}</NavLink>
+            <NavLink class="sidebar-link" :to="child.to">{{ title(child.title) }}</NavLink>
           </div>
           <div
             v-if="child.headers && child.headers.length"
@@ -79,7 +79,7 @@
             ]"
           >
             <div class="category__header-item">
-              <NavLink :to="`${child.to}#${header.slug}`">{{
+              <NavLink class="sidebar-link" :to="`${child.to}#${header.slug}`">{{
                 title(header.title)
               }}</NavLink>
             </div>