Merge branch 'main' into 4.0-tweaks

wwnorton · Sep 4, 2020 · 10710d3 · 10710d3
2 parents aca96d3 + 70b522e
commit 10710d3
Show file tree

Hide file tree

Showing 4 changed files with 356 additions and 16 deletions.
diff --git a/.github/workflows/pages.yml b/.github/workflows/pages.yml
@@ -1,12 +1,11 @@
 name: Github Pages
 
 on:
-  pull_request:
-    branches:
-      - main
   push:
     branches:
-      - main
+    - main
+    paths:
+    - 'guides-website/**'
 
 jobs:
   deploy:

diff --git a/guides-website/docusaurus.config.js b/guides-website/docusaurus.config.js
@@ -107,13 +107,13 @@ module.exports = {
 					showLastUpdateTime: true,
           // Please change this to your repo.
           editUrl:
-            'https://github.com/wwnorton/style/edit/docs-docusaurus/guides-website/',
+            'https://github.com/wwnorton/style/edit/main/guides-website/',
         },
         blog: {
           showReadingTime: true,
           // Please change this to your repo.
           editUrl:
-            'https://github.com/wwnorton/style/edit/docs-docusaurus/guides-website/blog/',
+            'https://github.com/wwnorton/style/edit/main/guides-website/',
         },
         theme: {
           customCss: require.resolve('./src/scss/main.scss'),

diff --git a/guides-website/sidebars.js b/guides-website/sidebars.js
@@ -1,15 +1,9 @@
 module.exports = {
   docs: [
 		'introduction',
-		{
-			type: 'category',
-			label: 'Guides',
-			items: [
-				'javascript',
-				'react',
-				'typescript',
-				'css-sass',
-			]
-		}
+		'javascript',
+		'react',
+		'typescript',
+		'css-sass',
 	]
 };