session-id-editable

pull/1242/head
Vincent 5 years ago
parent fd746a475a
commit 506b55bfe2

@ -2409,7 +2409,7 @@
"message": "Enter your <strong>Session ID</strong> below to link this device to your <strong>Session ID</strong>." "message": "Enter your <strong>Session ID</strong> below to link this device to your <strong>Session ID</strong>."
}, },
"enterSessionIDHere": { "enterSessionIDHere": {
"message": "Enter your Session ID here" "message": "Enter your Session ID"
}, },
"continueYourSession": { "continueYourSession": {
"message": "Continue Your Session" "message": "Continue Your Session"

@ -1350,6 +1350,16 @@ label {
overflow: hidden; overflow: hidden;
user-select: all; user-select: all;
overflow-y: auto; overflow-y: auto;
padding: 0px 5px 20px 5px;
&.session-id-editable-textarea:placeholder-shown {
padding: 20px 5px 0px 5px;
}
&.group-id-editable-textarea {
margin-top: 15px;
white-space: nowrap;
}
} }
input { input {
@ -1594,6 +1604,10 @@ input {
} }
} }
.create-group-name-input { .create-group-name-input {
display: flex;
justify-content: center;
width: 100%;
.session-id-editable { .session-id-editable {
height: 60px !important; height: 60px !important;

@ -238,9 +238,11 @@ $session-compose-margin: 20px;
box-shadow: 0 0 100px 0 rgba(0, 0, 0, 0.5); box-shadow: 0 0 100px 0 rgba(0, 0, 0, 0.5);
display: flex; display: flex;
flex-direction: column; flex-direction: column;
flex-grow: 1;
align-items: center; align-items: center;
overflow-y: auto; overflow-y: auto;
overflow-x: hidden; overflow-x: hidden;
.session-icon .exit { .session-icon .exit {
padding: 13px; padding: 13px;
} }
@ -307,6 +309,8 @@ $session-compose-margin: 20px;
} }
.session-id-editable { .session-id-editable {
width: 90%;
textarea::-webkit-inner-spin-button { textarea::-webkit-inner-spin-button {
margin: 0px 20px; margin: 0px 20px;
width: -webkit-fill-available; width: -webkit-fill-available;

@ -196,6 +196,7 @@ export class SessionClosableOverlay extends React.Component<Props, State> {
editable={!noContactsForClosedGroup} editable={!noContactsForClosedGroup}
placeholder={placeholder} placeholder={placeholder}
value={groupName} value={groupName}
isGroup={true}
maxLength={window.CONSTANTS.MAX_GROUPNAME_LENGTH} maxLength={window.CONSTANTS.MAX_GROUPNAME_LENGTH}
onChange={this.onGroupNameChanged} onChange={this.onGroupNameChanged}
onPressEnter={() => onButtonClick(groupName, selectedMembers)} onPressEnter={() => onButtonClick(groupName, selectedMembers)}

@ -9,6 +9,7 @@ interface Props {
onChange?: any; onChange?: any;
onPressEnter?: any; onPressEnter?: any;
maxLength?: number; maxLength?: number;
isGroup?: boolean;
} }
export class SessionIdEditable extends React.PureComponent<Props> { export class SessionIdEditable extends React.PureComponent<Props> {
@ -28,7 +29,7 @@ export class SessionIdEditable extends React.PureComponent<Props> {
} }
public render() { public render() {
const { placeholder, editable, text, value, maxLength } = this.props; const { placeholder, editable, text, value, maxLength, isGroup } = this.props;
return ( return (
<div <div
@ -38,7 +39,8 @@ export class SessionIdEditable extends React.PureComponent<Props> {
)} )}
> >
<textarea <textarea
className="session-id-editable-textarea" className={classNames(
isGroup ? 'group-id-editable-textarea' : 'session-id-editable-textarea')}
ref={this.inputRef} ref={this.inputRef}
placeholder={placeholder} placeholder={placeholder}
disabled={!editable} disabled={!editable}

Loading…
Cancel
Save