Merge pull request fluxcd#1086 from fluxcd/revert-1080-update-font-aw…

…esome

Revert "update to new font awesome (follow docsy)"

Makefile

@@ -3,7 +3,7 @@
 BLOCK_STDOUT_CMD           := python -c "import os,sys,fcntl; \
                                            flags = fcntl.fcntl(sys.stdout, fcntl.F_GETFL); \
                                            fcntl.fcntl(sys.stdout, fcntl.F_SETFL, flags&~os.O_NONBLOCK);"
-DOCSY_COMMIT               ?= 6df4c0721d95b3f72dfe4457c36950ce5dfaa60d
+DOCSY_COMMIT               ?= 4e9b463da93a53419be9865a3ec1e9256591622f
 DOCSY_COMMIT_FOLDER        := docsy-$(DOCSY_COMMIT)
 DOCSY_TARGET               := themes/$(DOCSY_COMMIT_FOLDER)
 GALLERY_COMMIT             ?= bc703a10e52614c96ba3f6e367a7564a2e1eb85e
@@ -12,7 +12,7 @@ GALLERY_TARGET             := themes/$(GALLERY_COMMIT_FOLDER)
 BOOTSTRAP_SEMVER           ?= 4.6.1
 BOOTSTRAP_SEMVER_FOLDER    := bootstrap-$(BOOTSTRAP_SEMVER)
 BOOTSTRAP_TARGET           := themes/$(DOCSY_COMMIT_FOLDER)/assets/vendor/$(BOOTSTRAP_SEMVER_FOLDER)
-FONT_AWESOME_SEMVER        ?= 6.1.1
+FONT_AWESOME_SEMVER        ?= 5.15.4
 FONT_AWESOME_SEMVER_FOLDER := Font-Awesome-$(FONT_AWESOME_SEMVER)
 FONT_AWESOME_TARGET        := themes/$(DOCSY_COMMIT_FOLDER)/assets/vendor/$(FONT_AWESOME_SEMVER_FOLDER)
 

config.toml

@@ -51,7 +51,7 @@ github_branch        = "main"
 github_project_repo  = "https://github.com/fluxcd/flux2"
 slack                = "https://cloud-native.slack.com/messages/flux"
 support              = "/support"
-font_awesome_version = "6.1.1"
+font_awesome_version = "5.9.0"
 images               = ["img/flux-social.png"]
 
 # Enable Algolia DocSearch
@@ -112,45 +112,45 @@ enable = true
 [[params.links.user]]
 	name ="Twitter"
 	url = "https://twitter.com/fluxcd"
-	icon = "fa-brands fa-twitter"
+	icon = "fab fa-twitter"
 	desc = "Follow us on Twitter to get the latest news!"
 [[params.links.user]]
 	name ="LinkedIn"
 	url = "https://linkedin.com/groups/8985374"
-	icon = "fa-brands fa-linkedin"
+	icon = "fab fa-linkedin"
 	desc = "Join the Flux Community group on LinkedIn!"
 [[params.links.user]]
 	name = "RSS Feed"
 	url = "/blog/index.xml"
-	icon = "fa-solid fa-rss"
+	icon = "fa fa-rss"
 	desc = "Subscribe to the RSS feed of our blog!"
 [[params.links.user]]
 	name = "Support"
 	url = "/support"
-	icon = "fa-solid fa-comments"
+	icon = "fas fa-comments"
 	desc = "Subscribe to the RSS feed of our blog!"
 
 
 # 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 = "Flux project on GitHub"
 	url = "https://github.com/fluxcd"
-	icon = "fa-brands fa-github"
+	icon = "fab fa-github"
 	desc = "Development takes place here!"
 [[params.links.developer]]
 	name = "Slack"
 	url = "https://cloud-native.slack.com/messages/flux"
-	icon = "fa-brands fa-slack"
+	icon = "fab fa-slack"
 	desc = "Chat with other project developers"
 [[params.links.developer]]
 	name = "Developer mailing list"
 	url = "https://lists.cncf.io/g/cncf-flux-dev"
-	icon = "fa-solid fa-envelope"
+	icon = "fa fa-envelope"
 	desc = "Discuss development issues around the project"
 [[params.links.developer]]
 	name="Flux YouTube channel"
 	url = "https://www.youtube.com/channel/UCoZxt-YMhGHb20ZkvcCc5KA"
-	icon = "fa-brands fa-youtube"
+	icon = "fab fa-youtube"
 	desc = "Recordings of past Flux dev meetings"
 
 [[menus.main]]
@@ -225,7 +225,7 @@ weight = 90
 [[menus.main]]
 url = "https://github.com/fluxcd/flux2"
 name = "Github"
-pre = "<i class='fa-brands fa-github'></i> "
+pre = "<i class='fab fa-github'></i> "
 weight = 100
 
 

layouts/blog/baseof.html

@@ -21,7 +21,7 @@
           <main class="col-12 col-md-9 col-xl-8 pl-md-5 pr-md-4" role="main">
             {{ with .CurrentSection.OutputFormats.Get "rss" -}}
             <a class="btn btn-lg -bg-orange td-rss-button d-none d-lg-block" href="{{ .Permalink | safeURL }}" target="_blank">
-              RSS <i class="fa-solid fa-rss"></i>
+              RSS <i class="fa fa-rss ml-2 "></i>
             </a>
             {{ end -}}
             {{ block "deprecated" . }}

layouts/partials/page-meta-links.html

@@ -9,7 +9,7 @@
 <div class="td-page-meta ml-2 pb-1 pt-2 mb-0">
 {{ 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" -}}
-  <a href="{{ $gh_url }}" target="_blank"><i class="fa-solid fa-pen-to-square fa-fw"></i> {{ T "post_edit_this" }}</a>
+  <a href="{{ $gh_url }}" target="_blank"><i class="fa fa-edit fa-fw"></i> {{ T "post_edit_this" }}</a>
 {{ else if $gh_repo -}}
   {{ $gh_repo_path := printf "%s/content/%s" $gh_branch $pathFormatted -}}
   {{ if and ($gh_subdir) (.Site.Language.Lang) -}}
@@ -39,11 +39,11 @@
   {{ $newPageURL := printf "%s/new/%s?%s"  $gh_repo $gh_repo_path $newPageQS -}}
 
   {{ if eq $importedDoc "false" }}
-  <a href="{{ $viewURL }}" class="td-page-meta--view" target="_blank" rel="noopener"><i class="fa-solid fa-file-lines fa-fw"></i> {{ T "post_view_this" }}</a>
-  <a href="{{ $editURL }}" class="td-page-meta--edit" target="_blank" rel="noopener"><i class="fa-solid fa-pen-to-square fa-fw"></i> {{ T "post_edit_this" }}</a>
-  <a href="{{ $newPageURL }}" class="td-page-meta--child" target="_blank" rel="noopener"><i class="fa-solid fa-pen-to-square fa-fw"></i> {{ T "post_create_child_page" }}</a>
+  <a href="{{ $viewURL }}" class="td-page-meta--view" target="_blank" rel="noopener"><i class="fa fa-file-alt fa-fw"></i> {{ T "post_view_this" }}</a>
+  <a href="{{ $editURL }}" class="td-page-meta--edit" target="_blank" rel="noopener"><i class="fa fa-edit fa-fw"></i> {{ T "post_edit_this" }}</a>
+  <a href="{{ $newPageURL }}" class="td-page-meta--child" target="_blank" rel="noopener"><i class="fa fa-edit fa-fw"></i> {{ T "post_create_child_page" }}</a>
   {{ end }}
-  <a href="{{ $issuesURL }}" class="td-page-meta--issue" target="_blank" rel="noopener"><i class="fa-solid fa-list-check fa-fw"></i> {{ T "post_create_issue" }}</a>
+  <a href="{{ $issuesURL }}" class="td-page-meta--issue" target="_blank" rel="noopener"><i class="fas fa-tasks fa-fw"></i> {{ T "post_create_issue" }}</a>
   {{ with $gh_project_repo -}}
     {{ $project_issueURL := printf "%s/issues/new" . -}}
     <a href="{{ $project_issueURL }}" class="td-page-meta--project-issue" target="_blank" rel="noopener"><i class="fas fa-tasks fa-fw"></i> {{ T "post_create_project_issue" }}</a>