diff --git a/frontend/website-redesign/src/Theme.re b/frontend/website-redesign/src/Theme.re index 843c2e6e8f0..f170ff568d7 100644 --- a/frontend/website-redesign/src/Theme.re +++ b/frontend/website-redesign/src/Theme.re @@ -6,6 +6,7 @@ module Colors = { let gray = `hex("d9d9d9"); let white = Css.white; let black = Css.black; + let digitalBlack = `hex("2d2d2d"); }; module Typeface = { diff --git a/frontend/website-redesign/src/components/CookieWarning.re b/frontend/website-redesign/src/components/CookieWarning.re index 029d8956573..0a4745533e4 100644 --- a/frontend/website-redesign/src/components/CookieWarning.re +++ b/frontend/website-redesign/src/components/CookieWarning.re @@ -7,6 +7,7 @@ module CookieConsent = { ~containerClasses: string=?, ~buttonClasses: string=?, ~contentClasses: string=?, + ~buttonText: React.element=?, ~children: React.element ) => React.element = @@ -19,39 +20,112 @@ module Styles = { let container = style([ position(`fixed), - padding2(~v=`rem(1.), ~h=`rem(2.)), - alignItems(`center), - justifyContent(`spaceBetween), + padding2(~v=`rem(1.5), ~h=`rem(1.)), + alignItems(`flexStart), + justifyContent(`flexStart), display(`flex), + flexDirection(`column), width(`percent(100.)), - background(Theme.Colors.gray), + background(Theme.Colors.digitalBlack), + boxSizing(`borderBox), + boxShadow(~x=`px(0), ~y=`px(1), `hex("e5e5e5e5")), + media( + Theme.MediaQuery.notMobile, + [ + flexDirection(`row), + justifyContent(`spaceBetween), + padding2(~v=`rem(3.), ~h=`rem(2.)), + ], + ), ]); - let content = merge([Theme.Type.paragraph, style([color(white)])]); + let content = + merge([ + Theme.Type.pageSubhead, + style([ + color(white), + margin2(~v=`rem(1.5), ~h=`rem(0.)), + media( + Theme.MediaQuery.tablet, + [margin2(~v=`rem(1.), ~h=`rem(5.))], + ), + ]), + ]); let button = merge([ - Theme.Type.paragraph, + Button.Styles.button( + Theme.Colors.mint, + true, + `rem(3.25), + `rem(7.75), + 1.5, + 1., + ), style([ - opacity(1.), - color(Theme.Colors.gray), - background(white), - borderRadius(px(3)), - padding2(~v=`rem(0.75), ~h=`rem(1.5)), - border(`zero, `none, `transparent), - textTransform(`capitalize), - hover([opacity(0.7)]), + color(Theme.Colors.black), + marginRight(`auto), + media(Theme.MediaQuery.tablet, [marginRight(`rem(2.))]), + media(Theme.MediaQuery.desktop, [marginRight(`rem(4.))]), ]), ]); + + let text = + style([ + display(`block), + marginRight(`rem(2.)), + media( + Theme.MediaQuery.tablet, + [display(`flex), flexDirection(`column)], + ), + ]); + + let buttonText = + style([ + display(`flex), + justifyContent(`spaceAround), + alignItems(`center), + ]); + + let buttonIcon = + style([display(`flex), alignItems(`center), marginLeft(`rem(0.5))]); + + let privacyText = style([color(Theme.Colors.orange), cursor(`pointer)]); }; [@react.component] -let make = () => +let make = () => { + let buttonText = +
+ {React.string("Accept")} + + + +
; + - {React.string("This website uses cookies to enhance the user experience.")} +
+ + {React.string( + "We use cookies to improve your experience on our site.", + )} + + + {React.string(" Read our")} + //TODO: Link to privacy policy + + + {React.string(" privacy policy ")} + + + {React.string("for more information.")} + +
; +}; diff --git a/frontend/website-redesign/src/pages/Demo.re b/frontend/website-redesign/src/pages/Demo.re index ced7becd9b7..912da8529e9 100644 --- a/frontend/website-redesign/src/pages/Demo.re +++ b/frontend/website-redesign/src/pages/Demo.re @@ -39,7 +39,7 @@ let make = () => { {React.string("Button Label")} -