Enable reworked donation banner

owid · Nov 27, 2024 · 192797c · 192797c
1 parent 5324762
commit 192797c
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 17 deletions.
diff --git a/site/DataCatalog/DataCatalogPage.tsx b/site/DataCatalog/DataCatalogPage.tsx
@@ -35,7 +35,7 @@ export const DataCatalogPage = (props: {
                 ></script>
             </Head>
             <body className="DataCatalogPage">
-                <SiteHeader baseUrl={baseUrl} hideDonationFlag />
+                <SiteHeader baseUrl={baseUrl} />
                 <main
                     id="data-catalog-page-root"
                     className="grid grid-cols-12-full-width"
@@ -45,7 +45,6 @@ export const DataCatalogPage = (props: {
                 <SiteFooter
                     context={SiteFooterContext.dataCatalogPage}
                     baseUrl={baseUrl}
-                    hideDonationFlag
                 />
             </body>
         </html>

diff --git a/site/DonatePage.tsx b/site/DonatePage.tsx
@@ -89,7 +89,11 @@ export const DonatePage = (props: {
                 ) : null}
             </main>
 
-            <SiteFooter hideDonate={true} baseUrl={props.baseUrl} />
+            <SiteFooter
+                hideDonate={true}
+                baseUrl={props.baseUrl}
+                hideDonationFlag
+            />
 
             <script
                 type="module"

diff --git a/site/SiteNavigation.scss b/site/SiteNavigation.scss
@@ -196,16 +196,19 @@
     }
 }
 .site-navigation__giving {
-    @include sm-only {
-        display: none;
-    }
-    position: absolute;
-    padding: 5px 10px;
-    margin-left: -10px;
-    color: $white;
     @include body-3-medium;
+    display: block;
+    width: 100%;
+    text-align: center;
+    padding: 2px 0 5px;
+    color: $white;
     background-color: $vermillion;
+
     &:hover {
-        background-color: $accent-vermillion;
+        text-decoration: underline;
+    }
+
+    @include sm-only {
+        display: none;
     }
 }
diff --git a/site/SiteNavigation.tsx b/site/SiteNavigation.tsx
@@ -34,7 +34,7 @@ export enum Menu {
 
 // Note: tranforming the flag from an env string to a boolean in
 // clientSettings.ts is convoluted due to the two-pass SSR/Vite build process.
-const HAS_DONATION_FLAG = false
+const HAS_DONATION_FLAG = true
 
 export const SiteNavigation = ({
     baseUrl,
@@ -219,13 +219,13 @@ export const SiteNavigation = ({
                             </a>
                         </div>
                     </div>
-                    {HAS_DONATION_FLAG && !hideDonationFlag && (
-                        <a href="/donate" className="site-navigation__giving">
-                            Giving season
-                        </a>
-                    )}
                 </div>
             </div>
+            {HAS_DONATION_FLAG && !hideDonationFlag && (
+                <a href="/donate" className="site-navigation__giving">
+                    It’s Giving Season. Help us do more with a donation.
+                </a>
+            )}
         </>
     )
 }