diff --git a/packages/web-shared/components/Modal/Modal.js b/packages/web-shared/components/Modal/Modal.js index 6c259994..7950927c 100644 --- a/packages/web-shared/components/Modal/Modal.js +++ b/packages/web-shared/components/Modal/Modal.js @@ -21,8 +21,12 @@ import Wordmark from '../Wordmark'; function ChurchLogo(props) { const { currentChurch } = useCurrentChurch(); - return ; - return null; + + const { origin } = window.location; + + return ( + + ); } const Modal = (props = {}) => { @@ -78,20 +82,20 @@ const Modal = (props = {}) => { /> - - - - + width={{ _: '100%', sm: '10%' }} + mb={{ _: 'xs', sm: '0' }} + ml={{ _: '0', sm: 'xs' }} + display="flex" + justifyContent="flex-end" + alignItems="center" + position="absolute" + top="xs" + right="xs" + > + + + + + + + ); + } - return ( - - ); + return ; } Wordmark.propTypes = { diff --git a/packages/web-shared/components/Wordmark/Wordmark.styles.js b/packages/web-shared/components/Wordmark/Wordmark.styles.js index 0270a289..6e9d9e51 100644 --- a/packages/web-shared/components/Wordmark/Wordmark.styles.js +++ b/packages/web-shared/components/Wordmark/Wordmark.styles.js @@ -1,5 +1,5 @@ import { withTheme } from 'styled-components'; -import styled, { css } from 'styled-components';; +import styled, { css } from 'styled-components'; const DEFAULT_ICON_SIZE = '80px'; @@ -8,17 +8,24 @@ const imageStyles = ({ size }) => { return css` max-height: ${newSize}; - max-width: 80%; `; }; const Image = withTheme(styled.img` resizemode: 'contain'; + max-width: 80%; + ${imageStyles}; +`); + +const WrappedImage = withTheme(styled.img` + resizemode: 'contain'; + max-width: 100%; ${imageStyles}; `); const Styled = { Image, + WrappedImage, }; export default Styled;