{{ with .CurrentSection.OutputFormats.Get "rss" -}} - RSS + RSS {{ end -}} {{ block "main" . }}{{ end }} diff --git a/layouts/partials/page-meta-links.html b/layouts/partials/page-meta-links.html index 3ec82d830f..e3561eb221 100644 --- a/layouts/partials/page-meta-links.html +++ b/layouts/partials/page-meta-links.html @@ -8,7 +8,7 @@
{{ if $gh_url -}} {{ warnf "Warning: use of `github_url` is deprecated. For details see https://www.docsy.dev/docs/adding-content/repository-links/#github_url-optional" -}} - {{ T "post_edit_this" }} + {{ T "post_edit_this" }} {{ else if $gh_repo -}} {{ $gh_repo_path := printf "%s/content/%s" $gh_branch $pathFormatted -}} {{ if and ($gh_subdir) (.Site.Language.Lang) -}} @@ -37,18 +37,18 @@ {{ $newPageQS := querify "value" $newPageStub.Content "filename" "change-me.md" | safeURL -}} {{ $newPageURL := printf "%s/new/%s?%s" $gh_repo $gh_repo_path $newPageQS -}} - {{ T "post_view_this" }} - {{ T "post_edit_this" }} - {{ T "post_create_child_page" }} - {{ T "post_create_issue" }} + {{ T "post_view_this" }} + {{ T "post_edit_this" }} + {{ T "post_create_child_page" }} + {{ T "post_create_issue" }} {{ with $gh_project_repo -}} {{ $project_issueURL := printf "%s/issues/new" . -}} - {{ T "post_create_project_issue" }} + {{ T "post_create_project_issue" }} {{ end -}} {{ end -}} {{ with .CurrentSection.AlternativeOutputFormats.Get "print" -}} - {{ T "print_entire_section" }} + {{ T "print_entire_section" }} {{ end }}
{{ end -}} diff --git a/layouts/partials/reading-time.html b/layouts/partials/reading-time.html index 7379959c9f..454f2f0a78 100644 --- a/layouts/partials/reading-time.html +++ b/layouts/partials/reading-time.html @@ -1 +1 @@ -

 {{ if gt .ReadingTime 1 }} {{ .ReadingTime }} {{ T "post_reading_time" }} {{ else }} {{ T "post_less_than_a_minute_read" }} {{ end }} 

+

 {{ if gt .ReadingTime 1 }} {{ .ReadingTime }} {{ T "post_reading_time" }} {{ else }} {{ T "post_less_than_a_minute_read" }} {{ end }} 

diff --git a/layouts/shortcodes/blocks/link-down.html b/layouts/shortcodes/blocks/link-down.html index 9dd8c4c2f9..03e3003a3e 100644 --- a/layouts/shortcodes/blocks/link-down.html +++ b/layouts/shortcodes/blocks/link-down.html @@ -1,7 +1,7 @@ {{ with .Parent }} {{ $id := $.Get "id" | default (printf "td-block-%d" ( add .Ordinal 1 )) }} {{ $color := $.Get "color" | default "blue" }} - + {{ else }} {{ errorf "The link-down shortcode is supposed to be nested inside a shortcode"}} {{ end }} \ No newline at end of file diff --git a/package.json b/package.json index f37c23e6fd..303b4e9009 100644 --- a/package.json +++ b/package.json @@ -17,7 +17,7 @@ "proseWrap": "always" }, "dependencies": { - "@fortawesome/fontawesome-free": "^5.15.4", + "@fortawesome/fontawesome-free": "^6.1.1", "bootstrap": "^4.6.1" }, "devDependencies": { diff --git a/userguide/config.toml b/userguide/config.toml index c4421bc919..ed8d083581 100644 --- a/userguide/config.toml +++ b/userguide/config.toml @@ -40,7 +40,7 @@ anchor = "smart" name = "Example Site" weight = 40 url = "https://example.docsy.dev" - post = '' + post = '' [services] [services.googleAnalytics] @@ -150,38 +150,38 @@ enable = false [[params.links.user]] name ="GitHub Discussions" url = "https://github.com/google/docsy/discussions" - icon = "fab fa-github" + icon = "fa-brands fa-github" desc = "Discussion and help from your fellow users" [[params.links.user]] name = "User mailing list" url = "https://groups.google.com/forum/#!forum/docsy-users" - icon = "fa fa-envelope" + icon = "fa-solid fa-envelope" desc = "Sign up for Docsy announcements" [[params.links.user]] name ="Twitter" url = "https://twitter.com/docsydocs" - icon = "fab fa-twitter" + icon = "fa-brands fa-twitter" desc = "Follow us on Twitter to get the latest news!" [[params.links.user]] name = "Stack Overflow" url = "https://stackoverflow.com/questions/tagged/docsy" - icon = "fab fa-stack-overflow" + icon = "fa-brands fa-stack-overflow" desc = "Practical questions and curated answers" # Developer relevant links. These will show up on right side of footer and in the community page if you have one. [[params.links.developer]] name = "GitHub" url = "https://github.com/google/docsy" - icon = "fab fa-github" + icon = "fa-brands fa-github" desc = "Development takes place here!" # [[params.links.developer]] # name = "Slack" # url = "https://example.org/slack" - # icon = "fab fa-slack" + # icon = "fa-brands fa-slack" # desc = "Chat with other project developers" # [[params.links.developer]] # name = "Developer mailing list" # url = "https://example.org/mail" - # icon = "fa fa-envelope" + # icon = "fa-solid fa-envelope" # desc = "Discuss development issues around the project" [params.mermaid] diff --git a/userguide/content/en/_index.html b/userguide/content/en/_index.html index 0a711c5654..58bf3c87c8 100644 --- a/userguide/content/en/_index.html +++ b/userguide/content/en/_index.html @@ -5,10 +5,10 @@ {{< blocks/cover title="Welcome to Docsy!" image_anchor="top" height="full" color="orange" >}}
}}"> - Learn More + Learn More - Download + Download

A Hugo theme for creating great technical documentation sites

{{< blocks/link-down color="info" >}} @@ -32,12 +32,12 @@ {{% /blocks/feature %}} -{{% blocks/feature icon="fab fa-github" title="Contributions welcome!" url="https://github.com/google/docsy" %}} +{{% blocks/feature icon="fa-brands fa-github" title="Contributions welcome!" url="https://github.com/google/docsy" %}} We do a [Pull Request](https://github.com/google/docsy/pulls) contributions workflow on **GitHub**. New users are always welcome! {{% /blocks/feature %}} -{{% blocks/feature icon="fab fa-twitter" title="Follow us on Twitter!" url="https://twitter.com/docsydocs" %}} +{{% blocks/feature icon="fa-brands fa-twitter" title="Follow us on Twitter!" url="https://twitter.com/docsydocs" %}} Find out about new features and how our users are using Docsy. {{% /blocks/feature %}} diff --git a/userguide/content/en/docs/adding-content/content.md b/userguide/content/en/docs/adding-content/content.md index 3324a7e8fd..0a07002aa0 100644 --- a/userguide/content/en/docs/adding-content/content.md +++ b/userguide/content/en/docs/adding-content/content.md @@ -561,13 +561,13 @@ params: { "name": "Twitter", "url": "https://example.org/twitter", - "icon": "fab fa-twitter", + "icon": "fa-brands fa-twitter", "desc": "Follow us on Twitter to get the latest news!" }, { "name": "Stack Overflow", "url": "https://example.org/stack", - "icon": "fab fa-stack-overflow", + "icon": "fa-brands fa-stack-overflow", "desc": "Practical questions and curated answers" } ], @@ -575,13 +575,13 @@ params: { "name": "GitHub", "url": "https://github.com/google/docsy", - "icon": "fab fa-github", + "icon": "fa-brands fa-github", "desc": "Development takes place here!" }, { "name": "Slack", "url": "https://example.org/slack", - "icon": "fab fa-slack", + "icon": "fa-brands fa-slack", "desc": "Chat with other project developers" }, { diff --git a/userguide/content/en/docs/adding-content/navigation.md b/userguide/content/en/docs/adding-content/navigation.md index 74f8d34d0e..7ff60b1f64 100644 --- a/userguide/content/en/docs/adding-content/navigation.md +++ b/userguide/content/en/docs/adding-content/navigation.md @@ -21,7 +21,7 @@ linkTitle = "Documentation" [menu.main] weight = 20 -pre = "" +pre = "" +++ {{< /tab >}} {{< tab header="yaml" lang="yaml" >}} @@ -31,7 +31,7 @@ linkTitle: "Documentation" menu: main: weight: 20 - pre: + pre: --- {{< /tab >}} {{< tab header="json" lang="json" >}} @@ -41,7 +41,7 @@ menu: "menu": { "main": { "weight": 20, - "pre": "" + "pre": "" } } } @@ -93,7 +93,7 @@ As described in the [Hugo docs](https://gohugo.io/content-management/menus/#add- name = "GitHub" weight = 50 url = "https://github.com/google/docsy/" - pre = "" + pre = "" post = "New!" {{< /tab >}} {{< tab header="config.yaml" lang="yaml" >}} @@ -102,7 +102,7 @@ menu: - name: GitHub weight: 50 url: 'https://github.com/google/docsy/' - pre: + pre: post: New! {{< /tab >}} {{< tab header="config.json" lang="json" >}} @@ -113,7 +113,7 @@ menu: "name": "GitHub", "weight": 50, "url": "https://github.com/google/docsy/", - "pre": "", + "pre": "", "post": "New!" } ] @@ -227,7 +227,7 @@ On large sites (default: > 2000 pages) the section menu is not generated for eac ### Add icons to the section menu -You can add icons to the section menu in the sidebar by setting the `icon` parameter in the page front matter (e.g. `icon: fas fa-tools`). +You can add icons to the section menu in the sidebar by setting the `icon` parameter in the page front matter (e.g. `icon: fa-solid fa-screwdriver-wrench`). You can find a complete list of icons to use in the [FontAwesome documentation](https://fontawesome.com/icons?d=gallery&p=2). Docsy includes the free FontAwesome icons by default. diff --git a/userguide/content/en/docs/adding-content/shortcodes/index.md b/userguide/content/en/docs/adding-content/shortcodes/index.md index 6799365b0d..418c9b6003 100644 --- a/userguide/content/en/docs/adding-content/shortcodes/index.md +++ b/userguide/content/en/docs/adding-content/shortcodes/index.md @@ -33,10 +33,10 @@ The **blocks/cover** shortcode creates a landing page type of block that fills t {{}}
}}"> - Learn More + Learn More - Download + Download

This program is now available in AppStore!

@@ -100,10 +100,10 @@ The example below shows a section wrapping 3 feature sections. The new **TechOS** operating system is an open source project. It is a new project, but with grand ambitions. Please follow this space for updates! {{%/* /blocks/feature */%}} -{{%/* blocks/feature icon="fab fa-github" title="Contributions welcome!" url="https://github.com/gohugoio/hugo" */%}} +{{%/* blocks/feature icon="fa-brands fa-github" title="Contributions welcome!" url="https://github.com/gohugoio/hugo" */%}} We do a [Pull Request](https://github.com/gohugoio/hugo/pulls) contributions workflow on **GitHub**. New users are always welcome! {{%/* /blocks/feature */%}} -{{%/* blocks/feature icon="fab fa-twitter" title="Follow us on Twitter!" url="https://twitter.com/GoHugoIO" */%}} +{{%/* blocks/feature icon="fa-brands fa-twitter" title="Follow us on Twitter!" url="https://twitter.com/GoHugoIO" */%}} For announcement of latest features etc. {{%/* /blocks/feature */%}} {{}} @@ -119,7 +119,7 @@ For announcement of latest features etc. ```go-html-template -{{%/* blocks/feature icon="fab fa-github" title="Contributions welcome!" url="https://github.com/gohugoio/hugo" */%}} +{{%/* blocks/feature icon="fa-brands fa-github" title="Contributions welcome!" url="https://github.com/gohugoio/hugo" */%}} We do a [Pull Request](https://github.com/gohugoio/hugo/pulls) contributions workflow on **GitHub**. New users are always welcome! {{%/* /blocks/feature */%}}