diff --git a/client/src/components/Flash/flash.css b/client/src/components/Flash/flash.css index b5db768e3ef..6bb0f492d68 100644 --- a/client/src/components/Flash/flash.css +++ b/client/src/components/Flash/flash.css @@ -5,8 +5,8 @@ margin-bottom: 0px; padding-top: 3px; padding-bottom: 3px; + position: fixed; width: 100%; - position: relative; z-index: 150; } diff --git a/client/src/components/Flash/index.tsx b/client/src/components/Flash/index.tsx index e753212cf45..6accd829365 100644 --- a/client/src/components/Flash/index.tsx +++ b/client/src/components/Flash/index.tsx @@ -1,5 +1,5 @@ import { Alert } from '@freecodecamp/react-bootstrap'; -import React from 'react'; +import React, { useState, useEffect } from 'react'; import { useTranslation } from 'react-i18next'; import { TransitionGroup, CSSTransition } from 'react-transition-group'; import { FlashState } from '../../redux/types'; @@ -15,24 +15,45 @@ type FlashProps = { function Flash({ flashMessage, removeFlashMessage }: FlashProps): JSX.Element { const { type, message, id, variables } = flashMessage; const { t } = useTranslation(); + const [flashMessageHeight, setFlashMessageHeight] = useState(0); + + useEffect(() => { + const flashMessageElem: HTMLElement | null = + document.querySelector('.flash-message'); + setFlashMessageHeight(flashMessageElem?.offsetHeight || 0); + document.documentElement.style.setProperty( + '--flash-message-height', + `${flashMessageHeight}px` + ); + }, [flashMessageHeight]); function handleClose() { + document.documentElement.style.setProperty('--flash-message-height', '0px'); removeFlashMessage(); } return ( - - - - {t(message, variables)} - - - + <> + + + + {t(message, variables)} + + + + {flashMessage && ( +
+ )} + ); } diff --git a/client/src/components/layouts/global.css b/client/src/components/layouts/global.css index aa638bfb0b1..4029c81b4bf 100644 --- a/client/src/components/layouts/global.css +++ b/client/src/components/layouts/global.css @@ -644,10 +644,6 @@ blockquote .small { border-color: #31708f; } -.alert-dismissable .close { - top: 0; -} - .annual-donation-alert { background: linear-gradient( -10deg,