fix: aply latests UI tweaks and copy for menu-redesign

pull/2515/head
Audric Ackermann 3 years ago
parent 98977e7828
commit ffc7ed0b32

@ -33,6 +33,7 @@
"joinOpenGroupAfterInvitationConfirmationDesc": "Are you sure you want to join the $roomName$ community?", "joinOpenGroupAfterInvitationConfirmationDesc": "Are you sure you want to join the $roomName$ community?",
"couldntFindServerMatching": "Couldn't find the corresponding opengroup server", "couldntFindServerMatching": "Couldn't find the corresponding opengroup server",
"enterSessionIDOrONSName": "Enter Session ID or ONS name", "enterSessionIDOrONSName": "Enter Session ID or ONS name",
"startNewConversationBy...": "Start a new conversation by entering someone's Session ID or share your Session ID with them.",
"loading": "Loading...", "loading": "Loading...",
"done": "Done", "done": "Done",
"youLeftTheGroup": "You have left the group.", "youLeftTheGroup": "You have left the group.",
@ -364,7 +365,7 @@
"createClosedGroupNamePrompt": "Group Name", "createClosedGroupNamePrompt": "Group Name",
"createClosedGroupPlaceholder": "Enter a group name", "createClosedGroupPlaceholder": "Enter a group name",
"openGroupURL": "Community URL", "openGroupURL": "Community URL",
"enterAnOpenGroupURL": "Enter a community URL", "enterAnOpenGroupURL": "Enter Community URL",
"next": "Next", "next": "Next",
"invalidGroupNameTooShort": "Please enter a group name", "invalidGroupNameTooShort": "Please enter a group name",
"invalidGroupNameTooLong": "Please enter a shorter group name", "invalidGroupNameTooLong": "Please enter a shorter group name",

@ -832,7 +832,11 @@ label {
padding: 0px 5px 20px 5px; padding: 0px 5px 20px 5px;
&.session-id-editable-textarea:placeholder-shown { &.session-id-editable-textarea:placeholder-shown {
padding: 10px 5px 0px 5px; height: 38px;
padding-top: 10px;
padding-bottom: 10px;
padding-left: 5px;
padding-right: 5px;
font-family: var(--font-default); font-family: var(--font-default);
} }

@ -19,6 +19,16 @@ import { YourSessionIDPill, YourSessionIDSelectable } from '../../basic/YourSess
import { Flex } from '../../basic/Flex'; import { Flex } from '../../basic/Flex';
import { SessionIconButton } from '../../icon'; import { SessionIconButton } from '../../icon';
import { SpacerMD } from '../../basic/Text'; import { SpacerMD } from '../../basic/Text';
import styled from 'styled-components';
const SessionIDDescription = styled.div`
color: var(--color-text-subtle);
font-family: 'Roboto';
font-style: normal;
font-weight: 400;
font-size: 12px;
text-align: center;
`;
function copyOurSessionID() { function copyOurSessionID() {
const ourSessionId = UserUtils.getOurPubKeyStrFromCache(); const ourSessionId = UserUtils.getOurPubKeyStrFromCache();
@ -42,8 +52,8 @@ export const OverlayMessage = () => {
const title = window.i18n('newMessage'); const title = window.i18n('newMessage');
const buttonText = window.i18n('next'); const buttonText = window.i18n('next');
const subtitle = window.i18n('enterSessionIDOrONSName'); const subtitle = window.i18n('enterSessionID');
const placeholder = window.i18n('enterSessionIDOfRecipient'); const placeholder = window.i18n('enterSessionIDOrONSName');
const disableNextButton = !pubkeyOrOns || loading; const disableNextButton = !pubkeyOrOns || loading;
@ -112,6 +122,8 @@ export const OverlayMessage = () => {
<SessionSpinner loading={loading} /> <SessionSpinner loading={loading} />
<SessionIDDescription>{window.i18n('startNewConversationBy...')}</SessionIDDescription>
<Flex container={true} width="100%"> <Flex container={true} width="100%">
<SpacerMD /> <SpacerMD />
<YourSessionIDPill /> <YourSessionIDPill />

@ -178,6 +178,7 @@ export type LocalizerKeys =
| 'timerOption_30_seconds_abbreviated' | 'timerOption_30_seconds_abbreviated'
| 'createConversationNewContact' | 'createConversationNewContact'
| 'removeResidueMembers' | 'removeResidueMembers'
| 'timerOption_1_hour_abbreviated'
| 'areYouSureDeleteEntireAccount' | 'areYouSureDeleteEntireAccount'
| 'noGivenPassword' | 'noGivenPassword'
| 'closedGroupInviteOkText' | 'closedGroupInviteOkText'
@ -412,7 +413,7 @@ export type LocalizerKeys =
| 'timerOption_30_seconds' | 'timerOption_30_seconds'
| 'createAccount' | 'createAccount'
| 'timerOption_1_minute_abbreviated' | 'timerOption_1_minute_abbreviated'
| 'timerOption_1_hour_abbreviated' | 'startNewConversationBy...'
| 'timerOption_12_hours' | 'timerOption_12_hours'
| 'unblockToSend' | 'unblockToSend'
| 'timerOption_1_minute' | 'timerOption_1_minute'

Loading…
Cancel
Save