Fix nav styles and remove module-level announcements

JakeSCahill · JakeSCahill · commit 83d65df13c82 · 2025-07-28T11:21:54.000+01:00
diff --git a/src/css/nav.css b/src/css/nav.css
@@ -52,7 +52,12 @@
   cursor: pointer;
 }
 
-@media screen and (min-width: 769px) and (max-width: 1023px) {
+@media screen and (max-width: 1023px) {
+  .nav-container {
+    width: var(--nav-width);
+    top: calc(var(--navbar-height) + var(--announcement-bar-height));
+  }
+
   .nav-panel-explore {
     top: 20px !important;
   }
@@ -110,11 +115,6 @@
   .nav {
     box-shadow: 0.5px 0 3px var(--nav-border-color);
   }
-
-  .nav-container {
-    width: var(--nav-width);
-    top: calc(var(--navbar-height) + var(--announcement-bar-height));
-  }
 }
 
 @media screen and (min-width: 1024px) {
diff --git a/src/helpers/get-module-announcement.js b/src/helpers/get-module-announcement.js
diff --git a/src/partials/announcement-bar.hbs b/src/partials/announcement-bar.hbs
@@ -1,23 +1,22 @@
-{{#if (and (ne page.component.name 'api') (or page.attributes.announcement page.componentVersion.asciidoc.attributes.announcement (get-module-announcement) site.keys.announcement))}}
+{{#if (and (ne page.component.name 'api') (or page.attributes.announcement page.componentVersion.asciidoc.attributes.announcement site.keys.announcement))}}
 <div class="announcement-bar" role="banner" id="announcement"
-     data-announcement-key="{{#if page.attributes.announcement}}page-{{page.component.name}}-{{page.relativeSrcPath}}{{else if page.componentVersion.asciidoc.attributes.announcement}}component-{{page.component.name}}-{{page.version}}{{else if (get-module-announcement)}}module-{{page.component.name}}-{{page.module}}-{{page.version}}{{else if site.keys.announcement}}site-global{{/if}}">
+     data-announcement-key="{{#if page.attributes.announcement}}page-{{page.component.name}}-{{page.relativeSrcPath}}{{else if page.componentVersion.asciidoc.attributes.announcement}}component-{{page.component.name}}-{{page.version}}{{else if site.keys.announcement}}site-global{{/if}}">
   <div class="announcement-content">
     {{#if page.attributes.announcement}}
       {{page.attributes.announcement-text}}
-      <a href="{{{relativize (resolve-resource page.attributes.announcement-link)}}}">{{page.attributes.announcement-link-text}}</a>
+      {{#if page.attributes.announcement-link}}
+        <a href="{{{relativize (resolve-resource page.attributes.announcement-link)}}}">{{page.attributes.announcement-link-text}}</a>
+      {{/if}}
     {{else if page.componentVersion.asciidoc.attributes.announcement}}
       {{page.componentVersion.asciidoc.attributes.announcement-text}}
-      <a href="{{{relativize (resolve-resource page.componentVersion.asciidoc.attributes.announcement-link)}}}">{{page.componentVersion.asciidoc.attributes.announcement-link-text}}</a>
-    {{else}}
-      {{#with (get-module-announcement) as |moduleAnnouncement|}}
-        {{#if moduleAnnouncement}}
-          {{moduleAnnouncement.text}}
-          <a href="{{{relativize (resolve-resource moduleAnnouncement.link)}}}">{{moduleAnnouncement.linkText}}</a>
-        {{else if site.keys.announcement}}
-          {{site.keys.announcementText}}
-          <a href="{{{relativize (resolve-resource site.keys.announcementLink)}}}">{{site.keys.announcementLinkText}}</a>
-        {{/if}}
-      {{/with}}
+      {{#if page.componentVersion.asciidoc.attributes.announcement-link}}
+        <a href="{{{relativize (resolve-resource page.componentVersion.asciidoc.attributes.announcement-link)}}}">{{page.componentVersion.asciidoc.attributes.announcement-link-text}}</a>
+      {{/if}}
+    {{else if site.keys.announcement}}
+      {{site.keys.announcementText}}
+      {{#if site.keys.announcementLink}}
+        <a href="{{{relativize (resolve-resource site.keys.announcementLink)}}}">{{site.keys.announcementLinkText}}</a>
+      {{/if}}
     {{/if}}
   </div>
   <button id="close-announcement" type="button" aria-label="close" class="close">

Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,12 @@`
`52`	`52`	`cursor: pointer;`
`53`	`53`	`}`
`54`	`54`
`55`		`-@media screen and (min-width: 769px) and (max-width: 1023px) {`
	`55`	`+@media screen and (max-width: 1023px) {`
	`56`	`+ .nav-container {`
	`57`	`+ width: var(--nav-width);`
	`58`	`+ top: calc(var(--navbar-height) + var(--announcement-bar-height));`
	`59`	`+ }`
	`60`	`+`
`56`	`61`	`.nav-panel-explore {`
`57`	`62`	`top: 20px !important;`
`58`	`63`	`}`
`@@ -110,11 +115,6 @@`
`110`	`115`	`.nav {`
`111`	`116`	`box-shadow: 0.5px 0 3px var(--nav-border-color);`
`112`	`117`	`}`
`113`		`-`
`114`		`- .nav-container {`
`115`		`- width: var(--nav-width);`
`116`		`- top: calc(var(--navbar-height) + var(--announcement-bar-height));`
`117`		`- }`
`118`	`118`	`}`
`119`	`119`
`120`	`120`	`@media screen and (min-width: 1024px) {`