diff --git a/assets/scss/custom.scss b/assets/scss/custom.scss index 3062b460..38e39316 100644 --- a/assets/scss/custom.scss +++ b/assets/scss/custom.scss @@ -124,4 +124,12 @@ color: white; text-decoration: underline; } -} \ No newline at end of file +} +// 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; +} diff --git a/config/_default/menus.yaml b/config/_default/menus.yaml index 797d6f47..0792b2b2 100644 --- a/config/_default/menus.yaml +++ b/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: 'About' + - identifier: about + name: About weight: 10 - - parent: 'About' - name: 'About ReSA' + - parent: about + name: About ReSA url: about weight: 10 - - parent: 'About' - name: 'Governance' + - parent: about + name: Governance url: about/governance weight: 20 - - parent: 'About' - name: 'Our Team' + - parent: about + name: Our Team url: about/our-team weight: 30 - - parent: 'About' - name: 'Organisational Membership' + - parent: about + name: Organisational Membership url: about/membership weight: 40 - - parent: 'About' - name: 'Stakeholders' + - parent: about + name: Stakeholders url: about/stakeholders weight: 50 - - parent: 'About' - name: 'Donate' + - parent: about + name: Donate url: about/donate weight: 60 - - parent: 'About' - name: 'Contact Us' + - parent: about + name: Contact Us url: about/contact weight: 70 - - parent: 'About' - name: 'Code of Conduct' + - parent: about + name: Code of Conduct url: about/code-of-conduct weight: 80 - - name: 'Task Forces ' + - identifier: taskforces + name: Task Forces weight: 20 - - parent: 'Task Forces ' - name: 'About Task Forces' + - parent: taskforces + name: About Task Forces url: taskforces weight: 10 - - parent: 'Task Forces ' - name: 'Task Force Support' + - parent: taskforces + name: Task Force Support url: taskforces/tf-support weight: 20 - - name: 'Forums' + - identifier: forums + name: Forums weight: 30 url: forums - - parent: 'Forums' - name: 'Research Software Community Leadership Forum' + - 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: 'Forums' - name: 'Research Software Funders Forum' + - parent: forums + name: Research Software Funders Forum url: forums/funders-forum weight: 32 - - parent: 'Forums' - name: 'Research Software Infrastructure Forum' + - parent: forums + name: Research Software Infrastructure Forum url: forums/rsi-forum weight: 33 - - parent: 'Forums' - name: 'Research Software Policy Forum' + - parent: forums + name: Research Software Policy Forum url: forums/rsp-forum weight: 34 - - parent: 'Forums' - name: 'Metascience and Research Software Forum' + - parent: forums + name: Metascience and Research Software Forum url: forums/mars-forum weight: 35 - - parent: 'Forums' - name: 'Publishing Research Software Forum' + - parent: forums + name: Publishing Research Software Forum url: forums/pubsoft-forum weight: 36 - - parent: 'Forums' - name: 'Skills and Training for Research Software Forum' + - parent: forums + name: Skills and Training for Research Software Forum url: forums/stars-forum weight: 37 - - parent: 'Forums' - name: 'ADORE.software Secretariat' + - parent: forums + name: ADORE.software Secretariat url: https://adore.software weight: 38 - - parent: 'Forums' - name: 'International Council of RSE Associations' + - parent: forums + name: International Council of RSE Associations url: https://researchsoftware.org/council.html weight: 39 - - parent: 'Forums' - name: 'Support a Forum' + - parent: forums + name: Support a Forum url: forums/forum-support weight: 40 - - name: 'Resources' + - identifier: resources + name: Resources weight: 40 url: resource - - parent: 'Resources' - name: 'ReSA Resources' + - parent: resources + name: ReSA Resources url: resource/resa-resources weight: 10 - - parent: 'Resources' - name: 'Guidelines' + - parent: resources + name: Guidelines url: resource/guidelines weight: 20 - - parent: 'Resources' - name: 'Research Software & AI' + - parent: resources + name: 'Research Software & AI' url: resource/ai weight: 30 - - parent: 'Resources' - name: 'Funding Opportunities' + - parent: resources + name: Funding Opportunities url: resource/funding-opportunities weight: 40 - - parent: 'Resources' - name: 'Software Policies' + - parent: resources + name: Software Policies url: resource/software-policies weight: 50 - - parent: 'Resources' - name: 'ADORE.software Declaration' + - parent: resources + name: ADORE.software Declaration url: https://adore.software weight: 60 - - parent: 'Resources' - name: 'Research Software Engineers (RSEs)' + - parent: resources + name: Research Software Engineers (RSEs) url: resource/research-software-engineers weight: 70 - - parent: 'Resources' - name: 'Collaborate with ReSA' + - parent: resources + name: Collaborate with ReSA url: resource/collaborate weight: 80 - - name: 'News' + - identifier: news + name: News url: news weight: 50 - - name: 'Events' + - identifier: events + name: Events weight: 60 - - parent: 'Events' - name: 'Current Events' + - parent: events + name: Current Events url: events weight: 60 - - parent: 'Events' - name: 'Past Events' + - parent: events + name: Past Events url: past-events weight: 61 - - parent: 'Events' - name: 'ReSA Community Calls' + - parent: events + name: ReSA Community Calls url: events/community-calls weight: 62 - - parent: 'Events' - name: 'RSEng & GenAI workshop' + - parent: events + name: 'RSEng & GenAI workshop' url: events/rse-ai-workshop weight: 63 - - name: 'Blog' + - identifier: blog + name: Blog url: blog weight: 70 - - name: 'IRSC' + - identifier: irsc + name: IRSC url: irsc weight: 71 - - parent: 'IRSC' - name: 'Home' + - parent: irsc + name: Home url: irsc weight: 72 - - parent: 'IRSC' - name: 'About IRSC' + - parent: irsc + name: About IRSC url: irsc/about weight: 73 - - parent: 'IRSC' - name: 'Register' + - parent: irsc + name: Register url: https://www.eventbrite.com/e/international-research-software-conference-irsc-tickets-1984767208148?aff=oddtdtcreator weight: 74 - - parent: 'IRSC' - name: 'Program' + - parent: irsc + name: Program url: irsc/program weight: 75 - - parent: 'IRSC' - name: 'Venue & Travel' + - parent: irsc + name: 'Venue & Travel' url: irsc/venue-travel weight: 76 - - parent: 'IRSC' - name: 'Call for Proposals' + - parent: irsc + name: Call for Proposals url: irsc/proposals weight: 77 - - parent: 'IRSC' - name: 'Program Committee' + - parent: irsc + name: Program Committee url: irsc/program-committee weight: 78 - - parent: 'IRSC' - name: 'Sponsorship' + - parent: irsc + name: Sponsorship url: irsc/sponsorship weight: 79 - - name: "" + - identifier: github + name: '' + pre: "" url: https://github.com/researchsoft/website weight: 80 - - name: "" + - identifier: envelope + name: '' + pre: "" url: mailto:info@researchsoft.org weight: 90 - - name: "" + - identifier: slack + name: '' + pre: "" url: https://join.slack.com/t/researchsoft/shared_invite/zt-2jrfi0182-_E_yD0_X8oKoB03zCz2lZA weight: 100 - - name: "" + - identifier: linkedin + name: '' + pre: "" url: https://www.linkedin.com/company/research-software-alliance/ weight: 110 - - name: "" + - identifier: mastodon + name: '' + pre: "" url: https://fosstodon.org/@researchsoft weight: 120 - - name: "" + - identifier: bluesky + name: '' + pre: "" url: https://bsky.app/profile/researchsoftware.bsky.social weight: 130 - - name: "" + - identifier: rss + name: '' + pre: "" url: /index.xml weight: 140 diff --git a/layouts/_default/atom.xml b/layouts/_default/atom.xml index 2879b648..ba682994 100644 --- a/layouts/_default/atom.xml +++ b/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 := . }} diff --git a/layouts/_default/rss.xml b/layouts/_default/rss.xml index b4a67eec..8c80d573 100644 --- a/layouts/_default/rss.xml +++ b/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 := . }}