diff --git a/net/web/src/context/useSettingsContext.hook.js b/net/web/src/context/useSettingsContext.hook.js index 3f885153..cd72215a 100644 --- a/net/web/src/context/useSettingsContext.hook.js +++ b/net/web/src/context/useSettingsContext.hook.js @@ -87,7 +87,7 @@ export function useSettingsContext() { if (language && language.startsWith('fr')) { updateState({ language: 'fr', strings: fr }); } - else if (language && language.startWith('en')) { + else if (language && language.startsWith('en')) { updateState({ language: 'en', strings: en }); } else { diff --git a/net/web/src/session/account/profile/Profile.jsx b/net/web/src/session/account/profile/Profile.jsx index d4ffa3fe..f4c603b7 100644 --- a/net/web/src/session/account/profile/Profile.jsx +++ b/net/web/src/session/account/profile/Profile.jsx @@ -81,14 +81,6 @@ export function Profile({ closeProfile }) { ); - const editDetailsFooter = ( - - - Cancel - Save - - ); - const onCropComplete = useCallback((area, crop) => { actions.setEditImageCrop(crop.width, crop.height, crop.x, crop.y) // eslint-disable-next-line @@ -173,8 +165,8 @@ export function Profile({ closeProfile }) { - + @@ -189,6 +181,11 @@ export function Profile({ closeProfile }) { actions.setEditDescription(e.target.value)} spellCheck="false" defaultValue={state.editDescription} autoSize={{ minRows: 2, maxRows: 6 }} /> + + + Cancel + Save + diff --git a/net/web/src/session/account/profile/Profile.styled.js b/net/web/src/session/account/profile/Profile.styled.js index be5feae9..f321ceb7 100644 --- a/net/web/src/session/account/profile/Profile.styled.js +++ b/net/web/src/session/account/profile/Profile.styled.js @@ -242,12 +242,42 @@ export const EditFooter = styled.div` export const ProfileDetailsWrapper = styled.div` display: flex; flex-direction: column; - align-items: center; justify-content: center; + gap: 16px; .info { width: 100%; - padding: 8px; + background-color: ${props => props.theme.inputArea}; + color: ${props => props.theme.mainText}; + border-radius: 8px; + + textarea { + padding-left: 8px; + background-color: ${props => props.theme.inputArea}; + border: 1px solid ${props => props.theme.sectionBorder}; + color: ${props => props.theme.mainText}; + } + + textarea::placeholder { + color: ${props => props.theme.placeholderText}; + } + + input { + padding-left: 8px; + background-color: ${props => props.theme.inputArea}; + border: 1px solid ${props => props.theme.sectionBorder}; + color: ${props => props.theme.mainText}; + } + + input::placeholder { + color: ${props => props.theme.placeholderText}; + } + } + + .controls { + display: flex; + justify-content: flex-end; + gap: 16px; } `; diff --git a/net/web/src/session/account/profile/accountAccess/AccountAccess.jsx b/net/web/src/session/account/profile/accountAccess/AccountAccess.jsx index 4fe74dc7..c7d5c754 100644 --- a/net/web/src/session/account/profile/accountAccess/AccountAccess.jsx +++ b/net/web/src/session/account/profile/accountAccess/AccountAccess.jsx @@ -52,14 +52,6 @@ export function AccountAccess() { } } - const editLoginFooter = ( - - - Cancel - Save - - ); - const editSealFooter = (