diff --git a/daprdocs/assets/scss/_sidebar-toc.scss b/daprdocs/assets/scss/_sidebar-toc.scss
deleted file mode 100644
index 0e34a4ad8..000000000
--- a/daprdocs/assets/scss/_sidebar-toc.scss
+++ /dev/null
@@ -1,58 +0,0 @@
-//
-// Right side toc
-//
-.td-toc {
- border-left: 1px solid $border-color;
-
- @supports (position: sticky) {
- position: sticky;
- top: 4rem;
- height: calc(100vh - 10rem);
- overflow-y: auto;
- }
-
- order: 2;
- padding-top: 2.75rem;
- padding-bottom: 1.5rem;
- vertical-align: top;
-
- a {
- display: block;
- font-weight: $font-weight-medium;
- padding-bottom: .25rem;
- }
-
- li {
- list-style: none;
- display: block;
- font-size: 1.1rem;
- }
-
- li li {
- margin-left: 1.5rem;
- font-size: 1.1rem;
- }
-
- .td-page-meta {
- a {
- font-weight: $font-weight-medium;
- }
- }
-
- #TableOfContents {
- // Hugo's ToC is a mouthful, this can be used to style the top level h2 entries.
- > ul > li > ul > li > a {}
-
- a {
- color: rgb(68, 68, 68);
- &:hover {
- color: $blue;
- text-decoration: none;
- }
- }
- }
-
- ul {
- padding-left: 0;
- }
-}
\ No newline at end of file
diff --git a/daprdocs/content/en/contributing/roadmap.md b/daprdocs/content/en/contributing/roadmap.md
new file mode 100644
index 000000000..d7e8dd06c
--- /dev/null
+++ b/daprdocs/content/en/contributing/roadmap.md
@@ -0,0 +1,48 @@
+---
+type: docs
+title: "Dapr Roadmap"
+linkTitle: "Roadmap"
+description: "The Dapr Roadmap is a tool to help with visibility into investments across the Dapr project"
+weight: 1100
+no_list: true
+---
+
+
+Dapr encourages the community to help with prioritization. A GitHub project board is available to view and provide feedback on proposed issues and track them across development.
+
+[
](https://aka.ms/dapr/roadmap)
+
+{{< button text="View the backlog" link="https://aka.ms/dapr/roadmap" color="primary" >}}
+
+
+Please vote by adding a 👍 on the GitHub issues for the feature capabilities you would most like to see Dapr support. This will help the Dapr maintainers understand which features will provide the most value.
+
+Contributions from the community is also welcomed. If there are features on the roadmap that you are interested in contributing to, please comment on the GitHub issue and include your solution proposal.
+
+{{% alert title="Note" color="primary" %}}
+The Dapr roadmap includes issues only from the v1.2 release and onwards. Issues closed and released prior to v1.2 are not included.
+{{% /alert %}}
+
+## Stages
+
+The Dapr Roadmap progresses through the following stages:
+
+{{< cardpane >}}
+{{< card title="**[📄 Backlog](https://github.com/orgs/dapr/projects/52#column-14691591)**" >}}
+ Issues (features) that need 👍 votes from the community to prioritize. Updated by Dapr maintainers.
+{{< /card >}}
+{{< card title="**[⏳ Planned (Committed)](https://github.com/orgs/dapr/projects/52#column-14561691)**" >}}
+ Issues with a proposal and/or targeted release milestone. This is where design proposals are discussed and designed.
+{{< /card >}}
+{{< card title="**[👩💻 In Progress (Development)](https://github.com/orgs/dapr/projects/52#column-14561696)**" >}}
+ Implementation specifics have been agreed upon and the feature is under active development.
+{{< /card >}}
+{{< /cardpane >}}
+{{< cardpane >}}
+{{< card title="**[☑ Done](https://github.com/orgs/dapr/projects/52#column-14561700)**" >}}
+ The feature capability has been completed and is scheduled for an upcoming release.
+{{< /card >}}
+{{< card title="**[✅ Released](https://github.com/orgs/dapr/projects/52#column-14659973)**" >}}
+ The feature is released and available for use.
+{{< /card >}}
+{{< /cardpane >}}
diff --git a/daprdocs/content/en/roadmap/_index.md b/daprdocs/content/en/roadmap/_index.md
deleted file mode 100644
index e69de29bb..000000000
diff --git a/daprdocs/layouts/partials/toc.html b/daprdocs/layouts/partials/toc.html
index f155f8b13..a7fe9f611 100644
--- a/daprdocs/layouts/partials/toc.html
+++ b/daprdocs/layouts/partials/toc.html
@@ -1,8 +1,8 @@
-{{ partial "page-meta-links.html" . }}
{{ if not .Params.notoc }}
{{ with .TableOfContents }}
{{ if ge (len .) 200 }}
-{{ . }}
+
+{{ . }}
{{ end }}
{{ end }}
{{ end }}
\ No newline at end of file
diff --git a/daprdocs/package-lock.json b/daprdocs/package-lock.json
index f16d45936..490b5637a 100644
--- a/daprdocs/package-lock.json
+++ b/daprdocs/package-lock.json
@@ -145,6 +145,7 @@
"version": "10.2.6",
"resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.2.6.tgz",
"integrity": "sha512-8lChSmdU6dCNMCQopIf4Pe5kipkAGj/fvTMslCsih0uHpOrXOPUEVOmYMMqmw3cekQkSD7EhIeuYl5y0BLdKqg==",
+ "dev": true,
"dependencies": {
"browserslist": "^4.16.6",
"caniuse-lite": "^1.0.30001230",
@@ -192,6 +193,7 @@
"version": "4.16.6",
"resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.16.6.tgz",
"integrity": "sha512-Wspk/PqO+4W9qp5iUTJsa1B/QrYn1keNCcEP5OvP7WBwT4KaDly0uONYmC6Xa3Z5IqnUgS0KcgLYu1l74x0ZXQ==",
+ "dev": true,
"dependencies": {
"caniuse-lite": "^1.0.30001219",
"colorette": "^1.2.2",
@@ -223,6 +225,7 @@
"version": "1.0.30001230",
"resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001230.tgz",
"integrity": "sha512-5yBd5nWCBS+jWKTcHOzXwo5xzcj4ePE/yjtkZyUV1BTUmrBaA9MRGC+e7mxnqXSA90CmCA8L3eKLaSUkt099IQ==",
+ "dev": true,
"funding": {
"type": "opencollective",
"url": "https://opencollective.com/browserslist"
@@ -334,7 +337,8 @@
"node_modules/electron-to-chromium": {
"version": "1.3.739",
"resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.739.tgz",
- "integrity": "sha512-+LPJVRsN7hGZ9EIUUiWCpO7l4E3qBYHNadazlucBfsXBbccDFNKUBAgzE68FnkWGJPwD/AfKhSzL+G+Iqb8A4A=="
+ "integrity": "sha512-+LPJVRsN7hGZ9EIUUiWCpO7l4E3qBYHNadazlucBfsXBbccDFNKUBAgzE68FnkWGJPwD/AfKhSzL+G+Iqb8A4A==",
+ "dev": true
},
"node_modules/emoji-regex": {
"version": "8.0.0",
@@ -355,6 +359,7 @@
"version": "3.1.1",
"resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz",
"integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==",
+ "dev": true,
"engines": {
"node": ">=6"
}
@@ -410,6 +415,7 @@
"version": "4.1.1",
"resolved": "https://registry.npmjs.org/fraction.js/-/fraction.js-4.1.1.tgz",
"integrity": "sha512-MHOhvvxHTfRFpF1geTK9czMIZ6xclsEor2wkIGYYq+PxcQqT7vStJqjhe6S1TenZrMZzo+wlqOufBDVepUEgPg==",
+ "dev": true,
"engines": {
"node": "*"
},
@@ -717,7 +723,8 @@
"node_modules/node-releases": {
"version": "1.1.72",
"resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.72.tgz",
- "integrity": "sha512-LLUo+PpH3dU6XizX3iVoubUNheF/owjXCZZ5yACDxNnPtgFuludV1ZL3ayK1kVep42Rmm0+R9/Y60NQbZ2bifw=="
+ "integrity": "sha512-LLUo+PpH3dU6XizX3iVoubUNheF/owjXCZZ5yACDxNnPtgFuludV1ZL3ayK1kVep42Rmm0+R9/Y60NQbZ2bifw==",
+ "dev": true
},
"node_modules/normalize-path": {
"version": "3.0.0",
@@ -732,6 +739,7 @@
"version": "0.1.2",
"resolved": "https://registry.npmjs.org/normalize-range/-/normalize-range-0.1.2.tgz",
"integrity": "sha1-LRDAa9/TEuqXd2laTShDlFa3WUI=",
+ "dev": true,
"engines": {
"node": ">=0.10.0"
}
@@ -948,7 +956,8 @@
"node_modules/postcss-value-parser": {
"version": "4.1.0",
"resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.1.0.tgz",
- "integrity": "sha512-97DXOFbQJhk71ne5/Mt6cOu6yxsSfM0QGQyl0L25Gca4yGWEGJaig7l7gbCX623VqTBNGLRLaVUCnNkcedlRSQ=="
+ "integrity": "sha512-97DXOFbQJhk71ne5/Mt6cOu6yxsSfM0QGQyl0L25Gca4yGWEGJaig7l7gbCX623VqTBNGLRLaVUCnNkcedlRSQ==",
+ "dev": true
},
"node_modules/pretty-hrtime": {
"version": "1.0.3",
@@ -1292,6 +1301,7 @@
"version": "10.2.6",
"resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.2.6.tgz",
"integrity": "sha512-8lChSmdU6dCNMCQopIf4Pe5kipkAGj/fvTMslCsih0uHpOrXOPUEVOmYMMqmw3cekQkSD7EhIeuYl5y0BLdKqg==",
+ "dev": true,
"requires": {
"browserslist": "^4.16.6",
"caniuse-lite": "^1.0.30001230",
@@ -1320,6 +1330,7 @@
"version": "4.16.6",
"resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.16.6.tgz",
"integrity": "sha512-Wspk/PqO+4W9qp5iUTJsa1B/QrYn1keNCcEP5OvP7WBwT4KaDly0uONYmC6Xa3Z5IqnUgS0KcgLYu1l74x0ZXQ==",
+ "dev": true,
"requires": {
"caniuse-lite": "^1.0.30001219",
"colorette": "^1.2.2",
@@ -1337,7 +1348,8 @@
"caniuse-lite": {
"version": "1.0.30001230",
"resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001230.tgz",
- "integrity": "sha512-5yBd5nWCBS+jWKTcHOzXwo5xzcj4ePE/yjtkZyUV1BTUmrBaA9MRGC+e7mxnqXSA90CmCA8L3eKLaSUkt099IQ=="
+ "integrity": "sha512-5yBd5nWCBS+jWKTcHOzXwo5xzcj4ePE/yjtkZyUV1BTUmrBaA9MRGC+e7mxnqXSA90CmCA8L3eKLaSUkt099IQ==",
+ "dev": true
},
"chalk": {
"version": "2.4.2",
@@ -1428,7 +1440,8 @@
"electron-to-chromium": {
"version": "1.3.739",
"resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.739.tgz",
- "integrity": "sha512-+LPJVRsN7hGZ9EIUUiWCpO7l4E3qBYHNadazlucBfsXBbccDFNKUBAgzE68FnkWGJPwD/AfKhSzL+G+Iqb8A4A=="
+ "integrity": "sha512-+LPJVRsN7hGZ9EIUUiWCpO7l4E3qBYHNadazlucBfsXBbccDFNKUBAgzE68FnkWGJPwD/AfKhSzL+G+Iqb8A4A==",
+ "dev": true
},
"emoji-regex": {
"version": "8.0.0",
@@ -1448,7 +1461,8 @@
"escalade": {
"version": "3.1.1",
"resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz",
- "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw=="
+ "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==",
+ "dev": true
},
"escape-string-regexp": {
"version": "1.0.5",
@@ -1491,7 +1505,8 @@
"fraction.js": {
"version": "4.1.1",
"resolved": "https://registry.npmjs.org/fraction.js/-/fraction.js-4.1.1.tgz",
- "integrity": "sha512-MHOhvvxHTfRFpF1geTK9czMIZ6xclsEor2wkIGYYq+PxcQqT7vStJqjhe6S1TenZrMZzo+wlqOufBDVepUEgPg=="
+ "integrity": "sha512-MHOhvvxHTfRFpF1geTK9czMIZ6xclsEor2wkIGYYq+PxcQqT7vStJqjhe6S1TenZrMZzo+wlqOufBDVepUEgPg==",
+ "dev": true
},
"fs-extra": {
"version": "9.0.1",
@@ -1725,7 +1740,8 @@
"node-releases": {
"version": "1.1.72",
"resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.72.tgz",
- "integrity": "sha512-LLUo+PpH3dU6XizX3iVoubUNheF/owjXCZZ5yACDxNnPtgFuludV1ZL3ayK1kVep42Rmm0+R9/Y60NQbZ2bifw=="
+ "integrity": "sha512-LLUo+PpH3dU6XizX3iVoubUNheF/owjXCZZ5yACDxNnPtgFuludV1ZL3ayK1kVep42Rmm0+R9/Y60NQbZ2bifw==",
+ "dev": true
},
"normalize-path": {
"version": "3.0.0",
@@ -1736,7 +1752,8 @@
"normalize-range": {
"version": "0.1.2",
"resolved": "https://registry.npmjs.org/normalize-range/-/normalize-range-0.1.2.tgz",
- "integrity": "sha1-LRDAa9/TEuqXd2laTShDlFa3WUI="
+ "integrity": "sha1-LRDAa9/TEuqXd2laTShDlFa3WUI=",
+ "dev": true
},
"parent-module": {
"version": "1.0.1",
@@ -1886,7 +1903,8 @@
"postcss-value-parser": {
"version": "4.1.0",
"resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.1.0.tgz",
- "integrity": "sha512-97DXOFbQJhk71ne5/Mt6cOu6yxsSfM0QGQyl0L25Gca4yGWEGJaig7l7gbCX623VqTBNGLRLaVUCnNkcedlRSQ=="
+ "integrity": "sha512-97DXOFbQJhk71ne5/Mt6cOu6yxsSfM0QGQyl0L25Gca4yGWEGJaig7l7gbCX623VqTBNGLRLaVUCnNkcedlRSQ==",
+ "dev": true
},
"pretty-hrtime": {
"version": "1.0.3",
diff --git a/daprdocs/static/images/roadmap.png b/daprdocs/static/images/roadmap.png
new file mode 100644
index 000000000..e8085b913
Binary files /dev/null and b/daprdocs/static/images/roadmap.png differ
diff --git a/daprdocs/themes/docsy b/daprdocs/themes/docsy
index 4808e0ac5..c36be07b2 160000
--- a/daprdocs/themes/docsy
+++ b/daprdocs/themes/docsy
@@ -1 +1 @@
-Subproject commit 4808e0ac5bb2df27021401fd33b2ef2756f751c2
+Subproject commit c36be07b2dcb9aa5aa01bad6ed0f8e111dd0452c