diff --git a/website/site/config.yaml b/website/site/config.yaml index 63fa782b9767..69c141ec8d49 100755 --- a/website/site/config.yaml +++ b/website/site/config.yaml @@ -3,4 +3,18 @@ languageCode: "en-us" title: "Netlify CMS | Open-Source Content Management System" disable404: true pluralizeListTitles: false -metaDataFormat: "yaml" \ No newline at end of file +metaDataFormat: "yaml" +menu: + docs: + - name: start + title: Quick Start + weight: 100 + - name: guides + title: Guides + weight: 200 + - name: reference + title: Reference + weight: 300 + - name: contributing + title: Contributing + weight: 400 \ No newline at end of file diff --git a/website/site/content/docs/add-to-your-site.md b/website/site/content/docs/add-to-your-site.md index e6dc74c77538..6eb317f3dab3 100755 --- a/website/site/content/docs/add-to-your-site.md +++ b/website/site/content/docs/add-to-your-site.md @@ -1,7 +1,11 @@ --- title: Add to Your Site -position: 20 +weight: 20 +menu: + docs: + parent: start --- + # Add Netlify CMS to Your Site Netlify CMS is adaptable to a wide variety of projects. The only inflexible requirement is that your site content must be written in markdown, JSON, YAML, or TOML files, stored in a repo on [GitHub](https://github.com/). (If you're partial to another Git hosting service, check out the PRs in progress for [GitLab](https://github.com/netlify/netlify-cms/pull/517) and [Bitbucket](https://github.com/netlify/netlify-cms/pull/525) support.) diff --git a/website/site/content/docs/authentication-backends.md b/website/site/content/docs/authentication-backends.md index 6039a8ecdd6f..2d783dc6fb71 100644 --- a/website/site/content/docs/authentication-backends.md +++ b/website/site/content/docs/authentication-backends.md @@ -1,6 +1,9 @@ --- title: Authentication & Backends -position: 25 +weight: 25 +menu: + docs: + parent: start --- # Authentication & Backends diff --git a/website/site/content/docs/beta-features.md b/website/site/content/docs/beta-features.md index e0ed55b9bb2b..292d0025bbe4 100644 --- a/website/site/content/docs/beta-features.md +++ b/website/site/content/docs/beta-features.md @@ -1,6 +1,9 @@ --- title: Beta Features! -position: 200 +weight: 200 +menu: + docs: + parent: reference --- # Beta Features! We run new functionality in an open beta format from time to time. That means that this functionality is totally available for use, and we _think_ it might be ready for primetime, but it could break or change without notice. diff --git a/website/site/content/docs/collection-types.md b/website/site/content/docs/collection-types.md index a81a01aa77ba..f0b4af241a03 100644 --- a/website/site/content/docs/collection-types.md +++ b/website/site/content/docs/collection-types.md @@ -1,6 +1,9 @@ --- title: Collection Types -position: 27 +weight: 27 +menu: + docs: + parent: start --- # Collection Types diff --git a/website/site/content/docs/configuration-options.md b/website/site/content/docs/configuration-options.md index 2ec801519fec..1b8407b2f5dc 100644 --- a/website/site/content/docs/configuration-options.md +++ b/website/site/content/docs/configuration-options.md @@ -1,6 +1,9 @@ --- title: Configuration Options -position: 23 +weight: 23 +menu: + docs: + parent: reference --- # Configuration Options diff --git a/website/site/content/docs/contributor-guide.md b/website/site/content/docs/contributor-guide.md index 1889602827bb..e5dd6503569c 100644 --- a/website/site/content/docs/contributor-guide.md +++ b/website/site/content/docs/contributor-guide.md @@ -1,6 +1,9 @@ --- -title: Contributing -position: 100 +title: Contributor Guide +weight: 100 +menu: + docs: + parent: contributing --- # Welcome, contributors! diff --git a/website/site/content/docs/custom-widgets.md b/website/site/content/docs/custom-widgets.md index eda07c0ead8e..dbd726d62f07 100644 --- a/website/site/content/docs/custom-widgets.md +++ b/website/site/content/docs/custom-widgets.md @@ -1,6 +1,9 @@ --- -title: Custom Widgets -position: 35 +title: Creating Custom Widgets +weight: 35 +menu: + docs: + parent: guides --- # Custom Widgets diff --git a/website/site/content/docs/examples.md b/website/site/content/docs/examples.md index cbda5bc2263e..ef34eeb38c22 100644 --- a/website/site/content/docs/examples.md +++ b/website/site/content/docs/examples.md @@ -1,6 +1,9 @@ --- title: Examples -position: 110 +weight: 110 +menu: + docs: + parent: start --- # Examples diff --git a/website/site/content/docs/intro.md b/website/site/content/docs/intro.md index 6d2de6f630d7..447ccfec7696 100755 --- a/website/site/content/docs/intro.md +++ b/website/site/content/docs/intro.md @@ -1,6 +1,9 @@ --- title: Introduction -position: 0 +weight: 1 +menu: + docs: + parent: start --- # Introduction diff --git a/website/site/content/docs/start-with-a-template.md b/website/site/content/docs/start-with-a-template.md index ec7059ef1d72..322f10b1ab53 100644 --- a/website/site/content/docs/start-with-a-template.md +++ b/website/site/content/docs/start-with-a-template.md @@ -1,6 +1,9 @@ --- title: Start with a Template -position: 10 +weight: 10 +menu: + docs: + parent: start --- # Start with a Template diff --git a/website/site/content/docs/update-the-cms-version.md b/website/site/content/docs/update-the-cms-version.md index c2b0dd971878..4a83d891af40 100644 --- a/website/site/content/docs/update-the-cms-version.md +++ b/website/site/content/docs/update-the-cms-version.md @@ -1,6 +1,9 @@ --- title: Update the CMS Version -position: 60 +weight: 60 +menu: + docs: + parent: start --- # Update the CMS Version diff --git a/website/site/content/docs/widgets/index.md b/website/site/content/docs/widgets/index.md index 0f85f5cf7647..635c2c509936 100644 --- a/website/site/content/docs/widgets/index.md +++ b/website/site/content/docs/widgets/index.md @@ -1,6 +1,9 @@ --- title: Widgets -position: 30 +weight: 30 +menu: + docs: + parent: reference --- # Widgets diff --git a/website/site/layouts/_default/list.html b/website/site/layouts/_default/list.html deleted file mode 100644 index 33caf73635ea..000000000000 --- a/website/site/layouts/_default/list.html +++ /dev/null @@ -1,35 +0,0 @@ -{{ partial "header" . }} - -
-
- -
- {{ range sort .Data.Pages "Params.position" }} - {{ if eq .Params.position 0 }} -
-

- {{ partial "edit-link" . }} -

- {{ .Content }} -
- {{ end }} - {{ end }} -
-
-
- -{{ partial "footer" . }} diff --git a/website/site/layouts/_default/single.html b/website/site/layouts/_default/single.html index 9d7fc970c78a..b774c783b40a 100644 --- a/website/site/layouts/_default/single.html +++ b/website/site/layouts/_default/single.html @@ -1,37 +1,46 @@ {{ partial "header" . }} {{ $activePage := .Params.position }} -
-
- -
- {{ partial "edit-link" . }} - {{ .Content }} - {{- if eq .Title "Widgets" -}} - {{- partial "widgets" . -}} - {{- end -}} -
-
+
+
+ +
+ {{ partial "edit-link" . }} + {{ .Content }} + {{- if eq .Title "Widgets" -}} + {{- partial "widgets" . -}} + {{- end -}} +
+
{{ partial "footer" . }} diff --git a/website/site/layouts/partials/header.html b/website/site/layouts/partials/header.html index 0226b5683708..00e71b7e8d8a 100755 --- a/website/site/layouts/partials/header.html +++ b/website/site/layouts/partials/header.html @@ -37,7 +37,7 @@ {{ end }}
- Docs + Docs Contributing Community Star diff --git a/website/site/static/_redirects b/website/site/static/_redirects index 681381cfb0bd..aeddc690ad16 100644 --- a/website/site/static/_redirects +++ b/website/site/static/_redirects @@ -1,6 +1,7 @@ -/docs/custom-authentication /docs/authentication-backends 301 -/docs/extending /docs/custom-widgets 301 -/docs/validation /docs/custom-widgets/#advanced-field-validation 301 -/docs/editorial-workflow /docs/configuration/#publish-mode 301 -/docs/test-drive /docs/start-with-a-template 301 -/docs/quick-start /docs/add-to-your-site 301 +/docs /docs/intro 301 +/docs/custom-authentication /docs/authentication-backends 301 +/docs/extending /docs/custom-widgets 301 +/docs/validation /docs/custom-widgets/#advanced-field-validation 301 +/docs/editorial-workflow /docs/configuration/#publish-mode 301 +/docs/test-drive /docs/start-with-a-template 301 +/docs/quick-start /docs/add-to-your-site 301 diff --git a/website/src/css/imports/docs.css b/website/src/css/imports/docs.css index 13292c740680..fc36b845df68 100644 --- a/website/src/css/imports/docs.css +++ b/website/src/css/imports/docs.css @@ -27,6 +27,8 @@ @media screen and (min-width: $tablet) { display: block; + height: 100%; + overflow-y: auto; } &.mobile { @@ -70,8 +72,10 @@ .subnav-link { display: block; font-weight: $regular; + font-size: $tiny; color: $grey; - line-height: 32px; + line-height: 1.3; + margin: 10px 0; text-decoration: none; text-transform: capitalize; transition: color .2s ease; @@ -87,6 +91,20 @@ } } + .docs-nav-section { + margin-bottom: 30px; + } + + .docs-nav-section-list { + margin: 0; + } + + .docs-nav-section-title { + font-size: 20px; + font-weight: bold; + margin-bottom: 10px; + } + .nav-subsections { margin: $tiny 0; padding: 0 0 0 $tiny;