Fix menus and feeds

assets/scss/custom.scss

@@ -124,4 +124,12 @@
     color: white;
     text-decoration: underline;
   }
-}
+}
+// Main menu font sizes (top-level items and dropdown items)
+#navbar-content .nav-link > span {
+  font-size: 1.2rem;
+}
+
+#navbar-content .dropdown-item > span {
+  font-size: 1rem;
+}

config/_default/menus.yaml

@@ -2,214 +2,242 @@
 #   To link a homepage widget, specify the URL as a hash `#` followed by the filename of the
 #     desired widget in your `content/home/` folder.
 #   The weight parameter defines the order that the links will appear in.
+#   Top-level items have an `identifier`; dropdown items reference it as their `parent`.
+#   Font sizes are set in assets/scss/custom.scss, not here.
 
 main:
-  - name: '<span style="font-size: 1.2rem;">About</span>'
+  - identifier: about
+    name: About
     weight: 10
-  - parent: '<span style="font-size: 1.2rem;">About</span>'
-    name: '<span style="font-size: 1rem;">About ReSA</span>'
+  - parent: about
+    name: About ReSA
     url: about
     weight: 10
-  - parent: '<span style="font-size: 1.2rem;">About</span>'
-    name: '<span style="font-size: 1rem;">Governance</span>'
+  - parent: about
+    name: Governance
     url: about/governance
     weight: 20
-  - parent: '<span style="font-size: 1.2rem;">About</span>'
-    name: '<span style="font-size: 1rem;">Our Team</span>'
+  - parent: about
+    name: Our Team
     url: about/our-team
     weight: 30
-  - parent: '<span style="font-size: 1.2rem;">About</span>'
-    name: '<span style="font-size: 1rem;">Organisational Membership</span>'
+  - parent: about
+    name: Organisational Membership
     url: about/membership
     weight: 40
-  - parent: '<span style="font-size: 1.2rem;">About</span>'
-    name: '<span style="font-size: 1rem;">Stakeholders</span>'
+  - parent: about
+    name: Stakeholders
     url: about/stakeholders
     weight: 50
-  - parent: '<span style="font-size: 1.2rem;">About</span>'
-    name: '<span style="font-size: 1rem;">Donate</span>'
+  - parent: about
+    name: Donate
     url: about/donate
     weight: 60
-  - parent: '<span style="font-size: 1.2rem;">About</span>'
-    name: '<span style="font-size: 1rem;">Contact Us</span>'
+  - parent: about
+    name: Contact Us
     url: about/contact
     weight: 70
-  - parent: '<span style="font-size: 1.2rem;">About</span>'
-    name: '<span style="font-size: 1rem;">Code of Conduct</span>'
+  - parent: about
+    name: Code of Conduct
     url: about/code-of-conduct
     weight: 80  
 
 
-  - name: '<span style="font-size: 1.2rem;">Task Forces </span>'
+  - identifier: taskforces
+    name: Task Forces
     weight: 20
-  - parent: '<span style="font-size: 1.2rem;">Task Forces </span>'
-    name: '<span style="font-size: 1rem;">About Task Forces</span>'
+  - parent: taskforces
+    name: About Task Forces
     url: taskforces
     weight: 10
-  - parent: '<span style="font-size: 1.2rem;">Task Forces </span>'
-    name: '<span style="font-size: 1rem;">Task Force Support</span>'
+  - parent: taskforces
+    name: Task Force Support
     url: taskforces/tf-support
     weight: 20
 
-  - name: '<span style="font-size: 1.2rem;">Forums</span>'
+  - identifier: forums
+    name: Forums
     weight: 30
     url: forums
-  - parent: '<span style="font-size: 1.2rem;">Forums</span>'
-    name: '<span style="font-size: 1rem;">Research Software Community Leadership Forum</span>'
+  - parent: forums
+    name: About Forums
+    url: forums
+    weight: 10
+  - parent: forums
+    name: Research Software Community Leadership Forum
     url: forums/community-leadership-forum
     weight: 31    
-  - parent: '<span style="font-size: 1.2rem;">Forums</span>'
-    name: '<span style="font-size: 1rem;">Research Software Funders Forum</span>'
+  - parent: forums
+    name: Research Software Funders Forum
     url: forums/funders-forum
     weight: 32
-  - parent: '<span style="font-size: 1.2rem;">Forums</span>'
-    name: '<span style="font-size: 1rem;">Research Software Infrastructure Forum</span>'
+  - parent: forums
+    name: Research Software Infrastructure Forum
     url: forums/rsi-forum
     weight: 33
-  - parent: '<span style="font-size: 1.2rem;">Forums</span>'
-    name: '<span style="font-size: 1rem;">Research Software Policy Forum</span>'
+  - parent: forums
+    name: Research Software Policy Forum
     url: forums/rsp-forum
     weight: 34  
-  - parent: '<span style="font-size: 1.2rem;">Forums</span>'
-    name: '<span style="font-size: 1rem;">Metascience and Research Software Forum</span>'
+  - parent: forums
+    name: Metascience and Research Software Forum
     url: forums/mars-forum
     weight: 35
-  - parent: '<span style="font-size: 1.2rem;">Forums</span>'
-    name: '<span style="font-size: 1rem;">Publishing Research Software Forum</span>'
+  - parent: forums
+    name: Publishing Research Software Forum
     url: forums/pubsoft-forum
     weight: 36
-  - parent: '<span style="font-size: 1.2rem;">Forums</span>'
-    name: '<span style="font-size: 1rem;">Skills and Training for Research Software Forum</span>'
+  - parent: forums
+    name: Skills and Training for Research Software Forum
     url: forums/stars-forum
     weight: 37
-  - parent: '<span style="font-size: 1.2rem;">Forums</span>'
-    name: '<span style="font-size: 1rem;">ADORE.software Secretariat</span>'
+  - parent: forums
+    name: ADORE.software Secretariat
     url: https://adore.software
     weight: 38
-  - parent: '<span style="font-size: 1.2rem;">Forums</span>'
-    name: '<span style="font-size: 1rem;">International Council of RSE Associations</span>'
+  - parent: forums
+    name: International Council of RSE Associations
     url: https://researchsoftware.org/council.html
     weight: 39
-  - parent: '<span style="font-size: 1.2rem;">Forums</span>'
-    name: '<span style="font-size: 1rem;">Support a Forum</span>'
+  - parent: forums
+    name: Support a Forum
     url: forums/forum-support
     weight: 40
 
-  - name: '<span style="font-size: 1.2rem;">Resources</span>'
+  - identifier: resources
+    name: Resources
     weight: 40
     url: resource
-  - parent: '<span style="font-size: 1.2rem;">Resources</span>'
-    name: '<span style="font-size: 1rem;">ReSA Resources</span>'
+  - parent: resources
+    name: ReSA Resources
     url: resource/resa-resources
     weight: 10
-  - parent: '<span style="font-size: 1.2rem;">Resources</span>'
-    name: '<span style="font-size: 1rem;">Guidelines</span>'
+  - parent: resources
+    name: Guidelines
     url: resource/guidelines
     weight: 20
-  - parent: '<span style="font-size: 1.2rem;">Resources</span>'
-    name: '<span style="font-size: 1rem;">Research Software & AI</span>'
+  - parent: resources
+    name: 'Research Software & AI'
     url: resource/ai
     weight: 30
-  - parent: '<span style="font-size: 1.2rem;">Resources</span>'
-    name: '<span style="font-size: 1rem;">Funding Opportunities</span>'
+  - parent: resources
+    name: Funding Opportunities
     url: resource/funding-opportunities
     weight: 40
-  - parent: '<span style="font-size: 1.2rem;">Resources</span>'
-    name: '<span style="font-size: 1rem;">Software Policies</span>'
+  - parent: resources
+    name: Software Policies
     url: resource/software-policies
     weight: 50
-  - parent: '<span style="font-size: 1.2rem;">Resources</span>'
-    name: '<span style="font-size: 1rem;">ADORE.software Declaration</span>'
+  - parent: resources
+    name: ADORE.software Declaration
     url: https://adore.software
     weight: 60
-  - parent: '<span style="font-size: 1.2rem;">Resources</span>'
-    name: '<span style="font-size: 1rem;">Research Software Engineers (RSEs)</span>'
+  - parent: resources
+    name: Research Software Engineers (RSEs)
     url: resource/research-software-engineers
     weight: 70
-  - parent: '<span style="font-size: 1.2rem;">Resources</span>'
-    name: '<span style="font-size: 1rem;">Collaborate with ReSA</span>'
+  - parent: resources
+    name: Collaborate with ReSA
     url: resource/collaborate
     weight: 80
 
-  - name: '<span style="font-size: 1.2rem;">News</span>'
+  - identifier: news
+    name: News
     url: news
     weight: 50
-  - name: '<span style="font-size: 1.2rem;">Events</span>'
+  - identifier: events
+    name: Events
     weight: 60
-  - parent: '<span style="font-size: 1.2rem;">Events</span>'
-    name: '<span style="font-size: 1rem;">Current Events</span>'
+  - parent: events
+    name: Current Events
     url: events
     weight: 60
-  - parent: '<span style="font-size: 1.2rem;">Events</span>'
-    name: '<span style="font-size: 1rem;">Past Events</span>'
+  - parent: events
+    name: Past Events
     url: past-events
     weight: 61
-  - parent: '<span style="font-size: 1.2rem;">Events</span>'
-    name: '<span style="font-size: 1rem;">ReSA Community Calls</span>'
+  - parent: events
+    name: ReSA Community Calls
     url: events/community-calls
     weight: 62
-  - parent: '<span style="font-size: 1.2rem;">Events</span>'
-    name: '<span style="font-size: 1rem;">RSEng & GenAI workshop</span>'
+  - parent: events
+    name: 'RSEng & GenAI workshop'
     url: events/rse-ai-workshop 
     weight: 63
-  - name: '<span style="font-size: 1.2rem;">Blog</span>'
+  - identifier: blog
+    name: Blog
     url: blog
     weight: 70
 
-  - name: '<span style="font-size: 1.2rem;">IRSC</span>'
+  - identifier: irsc
+    name: IRSC
     url: irsc
     weight: 71
-  - parent: '<span style="font-size: 1.2rem;">IRSC</span>'
-    name: '<span style="font-size: 1rem;">Home</span>'
+  - parent: irsc
+    name: Home
     url: irsc
     weight: 72
-  - parent: '<span style="font-size: 1.2rem;">IRSC</span>'
-    name: '<span style="font-size: 1rem;">About IRSC</span>'
+  - parent: irsc
+    name: About IRSC
     url: irsc/about
     weight: 73
-  - parent: '<span style="font-size: 1.2rem;">IRSC</span>'
-    name: '<span style="font-size: 1rem;">Register</span>'
+  - parent: irsc
+    name: Register
     url: https://www.eventbrite.com/e/international-research-software-conference-irsc-tickets-1984767208148?aff=oddtdtcreator
     weight: 74
-  - parent: '<span style="font-size: 1.2rem;">IRSC</span>'
-    name: '<span style="font-size: 1rem;">Program</span>'
+  - parent: irsc
+    name: Program
     url: irsc/program
     weight: 75
-  - parent: '<span style="font-size: 1.2rem;">IRSC</span>'
-    name: '<span style="font-size: 1rem;">Venue & Travel</span>'
+  - parent: irsc
+    name: 'Venue & Travel'
     url: irsc/venue-travel
     weight: 76
-  - parent: '<span style="font-size: 1.2rem;">IRSC</span>'
-    name: '<span style="font-size: 1rem;">Call for Proposals</span>'
+  - parent: irsc
+    name: Call for Proposals
     url: irsc/proposals
     weight: 77
-  - parent: '<span style="font-size: 1.2rem;">IRSC</span>'
-    name: '<span style="font-size: 1rem;">Program Committee</span>'
+  - parent: irsc
+    name: Program Committee
     url: irsc/program-committee
     weight: 78
-  - parent: '<span style="font-size: 1.2rem;">IRSC</span>'
-    name: '<span style="font-size: 1rem;">Sponsorship</span>'
+  - parent: irsc
+    name: Sponsorship
     url: irsc/sponsorship
     weight: 79
 
-  - name: "<i class='fab fa-github fa-2x'></i>"
+  - identifier: github
+    name: ''
+    pre: "<i class='fab fa-github fa-2x'></i>"
     url: https://github.com/researchsoft/website
     weight: 80
-  - name: "<i class='fas fa-envelope fa-2x'></i>"
+  - identifier: envelope
+    name: ''
+    pre: "<i class='fas fa-envelope fa-2x'></i>"
     url: mailto:info@researchsoft.org
     weight: 90
-  - name: "<i class='fab fa-slack fa-2x'></i>"
+  - identifier: slack
+    name: ''
+    pre: "<i class='fab fa-slack fa-2x'></i>"
     url: https://join.slack.com/t/researchsoft/shared_invite/zt-2jrfi0182-_E_yD0_X8oKoB03zCz2lZA
     weight: 100
-  - name: "<i class='fab fa-linkedin fa-2x'></i>"
+  - identifier: linkedin
+    name: ''
+    pre: "<i class='fab fa-linkedin fa-2x'></i>"
     url: https://www.linkedin.com/company/research-software-alliance/
     weight: 110
-  - name: "<i class='fab fa-mastodon fa-2x'></i>"
+  - identifier: mastodon
+    name: ''
+    pre: "<i class='fab fa-mastodon fa-2x'></i>"
     url: https://fosstodon.org/@researchsoft
     weight: 120
-  - name: "<i class='fas fa-globe fa-2x'></i>"
+  - identifier: bluesky
+    name: ''
+    pre: "<i class='fas fa-globe fa-2x'></i>"
     url: https://bsky.app/profile/researchsoftware.bsky.social
     weight: 130
-  - name: "<i class='fas fa-rss fa-2x'></i>"
+  - identifier: rss
+    name: ''
+    pre: "<i class='fas fa-rss fa-2x'></i>"
     url: /index.xml
     weight: 140

layouts/_default/atom.xml

@@ -1,4 +1,4 @@
-{{- /* Deprecate site.Author.name in favor of site.Params.author.name */}}
+{{- /* site.Author was removed in newer Hugo; use site.Params.author.name */}}
 {{- $authorName := "" }}
 {{- with site.Params.author }}
   {{- if reflect.IsMap . }}
@@ -8,11 +8,6 @@
   {{- else }}
     {{- $authorName  = . }}
   {{- end }}
-{{- else }}
-  {{- with site.Author.name }}
-    {{- $authorName = . }}
-    {{- warnf "The author key in site configuration is deprecated. Use params.author.name instead." }}
-  {{- end }}
 {{- end }}
 
 {{- $pctx := . }}

layouts/_default/rss.xml

@@ -8,11 +8,6 @@
   {{- else }}
     {{- $authorName  = . }}
   {{- end }}
-{{- else }}
-  {{- with site.Author.name }}
-    {{- $authorName = . }}
-    {{- warnf "The author key in site configuration is deprecated. Use params.author.name instead." }}
-  {{- end }}
 {{- end }}
 
 {{- $pctx := . }}