Merge branch 'vaash/2609' into staging

equinor · Dec 6, 2024 · e33cdc8 · e33cdc8
2 parents 22e6fb5 + 4fb878d
commit e33cdc8
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 9 deletions.
diff --git a/sanityv3/schemas/textSnippets.ts b/sanityv3/schemas/textSnippets.ts
@@ -327,6 +327,11 @@ const snippets: textSnippet = {
     defaultValue: 'Submit Form',
     group: groups.pensionForm,
   },
+  footer_to_top_button: {
+    title: 'To top button',
+    defaultValue: 'To top',
+    group: groups.others,
+  },
   career_fair_form_organisation: {
     title: 'Organisation',
     defaultValue: 'School / Organisation',

diff --git a/web/pageComponents/shared/Footer.tsx b/web/pageComponents/shared/Footer.tsx
@@ -2,6 +2,8 @@ import { forwardRef } from 'react'
 import { Facebook, Instagram, Linkedin, Twitter, Youtube } from '../../icons'
 import type { FooterLinkData, SomeType, FooterColumns } from '../../types/index'
 import { default as NextLink } from 'next/link'
+import { useIntl } from 'react-intl'
+import { LinkButton } from '@core/Button'
 
 function getSomeSvg(someType: SomeType) {
   const iconMap = {
@@ -12,9 +14,8 @@ function getSomeSvg(someType: SomeType) {
     youtube: <Youtube width={24} />,
   }
 
-  if (!(someType in iconMap)) console.warn('Unable to get social icon for footer: Unknown SoMe type passed')
-
-  return iconMap[someType] || null
+  if (!(someType in iconMap)) console.warn('Unable to get social icon for footer: Unknown SoMe type passed') 
+    return iconMap[someType] || null
 }
 
 function getLink(linkData: FooterLinkData) {
@@ -27,6 +28,7 @@ type FooterProps = {
 }
 
 const Footer = forwardRef<HTMLDivElement, FooterProps>(function Footer({ footerData, ...rest }, ref) {
+  const intl = useIntl()
   return (
     <footer className="min-h-12 clear-both text-white-100 bg-slate-blue-95 py-4 px-0" ref={ref} {...rest}>
       <div className="flex flex-row flex-wrap my-0 mx-auto justify-between px-layout-sm pb-2 max-w-screen-2xl max-md:flex-col">
@@ -60,6 +62,14 @@ const Footer = forwardRef<HTMLDivElement, FooterProps>(function Footer({ footerD
             </div>
           </section>
         ))}
+        <section 
+      className="flex flex-col max-md:py-4 max-md:w-4/5">
+  <LinkButton
+    onClick={() => window.scrollTo({ top: 0, behavior: 'smooth' })}
+    className={`group text-sm px-0 py-2 text-white-100 underline underline-offset-8 hover:underline hover:text-moss-green-90`}  >
+    {intl.formatMessage({ id: 'footer_to_top_button', defaultMessage: 'To top' })}
+  </LinkButton>
+</section>
       </div>
       <div className="flex md:justify-center justify-start pl-4 pt-12 pb-3">
         <span className="text-2xs text-white-100">Copyright {new Date().getFullYear()} Equinor ASA</span>

diff --git a/web/tailwind.config.cjs b/web/tailwind.config.cjs
@@ -366,6 +366,9 @@ module.exports = {
       flex: {
         fr: '1 1 1',
       },
+      aria: {
+        current: 'current="page"',
+      },
       typography: (theme) => ({
         DEFAULT: {
           css: [
@@ -498,12 +501,6 @@ module.exports = {
       },
     },
   },
-  variants: {
-    extend: {
-      borderColor: ['aria-current'],
-      backgroundColor: ['aria-current'],
-    },
-  },
   plugins: [
     require('@tailwindcss/typography'),
     plugin(function ({ addVariant, matchVariant, addUtilities, theme }) {