diff --git a/daprdocs/assets/js/search.js b/daprdocs/assets/js/search.js new file mode 100644 index 000000000..844c89006 --- /dev/null +++ b/daprdocs/assets/js/search.js @@ -0,0 +1 @@ +// Intentionally blank \ No newline at end of file diff --git a/daprdocs/assets/scss/_code.scss b/daprdocs/assets/scss/_code.scss index e986bca01..1c20542c6 100644 --- a/daprdocs/assets/scss/_code.scss +++ b/daprdocs/assets/scss/_code.scss @@ -1,14 +1,53 @@ // Code formatting. +.copy-code-button { + color: #272822; + background-color: #FFF; + border-color: #0D2192; + border: 2px solid; + border-radius: 3px 3px 0px 0px; + + /* right-align */ + display: block; + margin-left: auto; + margin-right: 0; + + margin-bottom: -2px; + padding: 3px 8px; + font-size: 0.8em; +} + +.copy-code-button:hover { + cursor: pointer; + background-color: #F2F2F2; +} + +.copy-code-button:focus { + /* Avoid an ugly focus outline on click in Chrome, + but darken the button for accessibility. + See https://stackoverflow.com/a/25298082/1481479 */ + background-color: #E6E6E6; + outline: 0; +} + +.copy-code-button:active { + background-color: #D9D9D9; +} + +.highlight pre { + /* Avoid pushing up the copy buttons. */ + margin: 0; +} + .td-content { // Highlighted code. .highlight { @extend .card; - margin: 2rem 0; - padding: 0; + margin: 0rem 0; + padding: 0rem; - max-width: 80%; + max-width: 100%; pre { margin: 0; @@ -37,7 +76,8 @@ word-wrap: normal; background-color: $gray-100; padding: $spacer; - + + max-width: 100%; > code { background-color: inherit !important; diff --git a/daprdocs/config.toml b/daprdocs/config.toml index 03637c952..dddd7e05b 100644 --- a/daprdocs/config.toml +++ b/daprdocs/config.toml @@ -52,25 +52,25 @@ id = "UA-149338238-3" # Top Nav Bar [[menu.main]] - name = "Home" + name = "Homepage" weight = 40 url = "https://dapr.io" [[menu.main]] - name = "About" + name = "GitHub" weight = 50 - url = "https://dapr.io/#about" -[[menu.main]] - name = "Download" - weight = 60 - url = "https://dapr.io/#download" + url = "https://github.com/dapr" [[menu.main]] name = "Blog" - weight = 70 + weight = 60 url = "https://blog.dapr.io/posts" +[[menu.main]] + name = "Discord" + weight = 70 + url = "https://aka.ms/dapr-discord" [[menu.main]] name = "Community" weight = 80 - url = "https://dapr.io/#community" + url = "https://github.com/dapr/community/blob/master/README.md" [params] copyright = "Dapr" diff --git a/daprdocs/content/en/concepts/overview.md b/daprdocs/content/en/concepts/overview.md index 5f0f5f8aa..a05ccb626 100644 --- a/daprdocs/content/en/concepts/overview.md +++ b/daprdocs/content/en/concepts/overview.md @@ -87,6 +87,8 @@ Dapr can be used from any developer framework. Here are some that have been int Dapr integrates easily with Python [Flask](https://pypi.org/project/Flask/) and node [Express](http://expressjs.com/). See examples in the [Dapr quickstarts](https://github.com/dapr/quickstarts). +In the Dapr [PHP-SDK](https://github.com/dapr/php-sdk) you can serve with Apache, Nginx, or Caddyserver. + #### Actors Dapr SDKs support for [virtual actors]({{< ref actors >}}) which are stateful objects that make concurrency simple, have method and state encapsulation, and are designed for scalable, distributed applications. diff --git a/daprdocs/content/en/developing-applications/building-blocks/observability/_index.md b/daprdocs/content/en/developing-applications/building-blocks/observability/_index.md index eb6891d61..3ac52e0fd 100644 --- a/daprdocs/content/en/developing-applications/building-blocks/observability/_index.md +++ b/daprdocs/content/en/developing-applications/building-blocks/observability/_index.md @@ -6,4 +6,4 @@ weight: 60 description: See and measure the message calls across components and networked services --- -This section includes guides for developers in the context of observability. See other sections for a [general overview of the observability concept]({{< ref observability >}}) in Dapr and for [operations guidance on monitoring]({{< ref monitoring >}}). +This section includes guides for developers in the context of observability. See other sections for a [general overview of the observability concept]({{< ref observability-concept >}}) in Dapr and for [operations guidance on monitoring]({{< ref monitoring >}}). diff --git a/daprdocs/content/en/developing-applications/ides/intellij.md b/daprdocs/content/en/developing-applications/ides/intellij.md index 2239a816a..e7facc35f 100644 --- a/daprdocs/content/en/developing-applications/ides/intellij.md +++ b/daprdocs/content/en/developing-applications/ides/intellij.md @@ -23,9 +23,44 @@ Let's get started! ## Add Dapr as an 'External Tool' -First, quit IntelliJ. +First, quit IntelliJ before modifying the configurations file directly. -Create or edit the file in `$HOME/.IdeaIC2019.3/config/tools/External\ Tools.xml` (change IntelliJ version in path if needed) to add a new `` entry: +### IntelliJ configuration file location +For versions [2020.1](https://www.jetbrains.com/help/idea/2020.1/tuning-the-ide.html#config-directory) and above the configuration files for tools should be located in: + +{{< tabs Windows Linux MacOS >}} + +{{% codetab %}} + +```powershell +%USERPROFILE%\AppData\Roaming\JetBrains\IntelliJIdea2020.1\tools\ +``` +{{% /codetab %}} + + +{{% codetab %}} + ```shell + $HOME/.config/JetBrains/IntelliJIdea2020.1/tools/ + ``` +{{% /codetab %}} + + +{{% codetab %}} +```shell +~/Library/Application Support/JetBrains/IntelliJIdea2020.1/tools/ +``` +{{% /codetab %}} + + +{{< /tabs >}} + +> The configuration file location is different for version 2019.3 or prior. See [here](https://www.jetbrains.com/help/idea/2019.3/tuning-the-ide.html#config-directory) for more details. + +Change the version of IntelliJ in the path if needed. + +Create or edit the file in `/tools/External\ Tools.xml` (change IntelliJ version in path if needed). The `` is OS dependennt as seen above. + +Add a new `` entry: ```xml @@ -33,10 +68,10 @@ Create or edit the file in `$HOME/.IdeaIC2019.3/config/tools/External\ Tools.xml - - @@ -53,7 +88,7 @@ Optionally, you may also create a new entry for a sidecar tool that can be reuse - +