Various changes suggested by redesign overview

pull/740/head
Vincent 6 years ago
parent 3dd18a0c9c
commit a0a5a61b29

@ -2176,6 +2176,9 @@
"yourSessionID": { "yourSessionID": {
"message": "Your Session ID" "message": "Your Session ID"
}, },
"setStatus": {
"message": "Set a status..."
},
"setAccountPasswordTitle": { "setAccountPasswordTitle": {
"message": "Set Account Password", "message": "Set Account Password",
"description": "Prompt for user to set account password in settings view" "description": "Prompt for user to set account password in settings view"
@ -2658,20 +2661,20 @@
"message": "Channels" "message": "Channels"
}, },
"addChannel": { "addChannel": {
"message": "Add channel" "message": "Join Open Group"
}, },
"enterChannelURL": { "enterChannelURL": {
"message": "Enter Channel URL" "message": "Enter Open Group URL"
}, },
"channelUrlPlaceholder": { "channelUrlPlaceholder": {
"message": "https://yourchannel.lokinet.org" "message": "https://myopengroup.lokinet.org"
}, },
"addChannelDescription": { "addChannelDescription": {
"message": "message":
"Enter the URL of the public channel you'd like to join in the format above." "Enter an open group URL."
}, },
"joinChannel": { "joinChannel": {
"message": "Join Channel" "message": "Join Open Group"
}, },
"next": { "next": {
"message": "Next" "message": "Next"

@ -257,6 +257,9 @@
const messageSelected = this.selectedMessages.size > 0; const messageSelected = this.selectedMessages.size > 0;
if (messageSelected) { if (messageSelected) {
// Hide ellipses icon
$('.title-wrapper .session-icon.ellipses').css({opacity:0});
$('.messages li, .messages > div').addClass('shadowed'); $('.messages li, .messages > div').addClass('shadowed');
$('.message-selection-overlay').addClass('overlay'); $('.message-selection-overlay').addClass('overlay');
$('.module-conversation-header').addClass('overlayed'); $('.module-conversation-header').addClass('overlayed');
@ -268,6 +271,9 @@
$(`#${messageId}`).removeClass('shadowed'); $(`#${messageId}`).removeClass('shadowed');
} }
} else { } else {
// Hide ellipses icon
$('.title-wrapper .session-icon.ellipses').css({opacity:1});
$('.messages li, .messages > div').removeClass('shadowed'); $('.messages li, .messages > div').removeClass('shadowed');
$('.message-selection-overlay').removeClass('overlay'); $('.message-selection-overlay').removeClass('overlay');
$('.module-conversation-header').removeClass('overlayed'); $('.module-conversation-header').removeClass('overlayed');

@ -524,8 +524,7 @@ label {
.close-button { .close-button {
float: left; float: left;
margin-top: 17px; margin: 17px 0px 0px 0px;
margin-left: 7px;
} }
} }
.message-selection-overlay div[role='button'] { .message-selection-overlay div[role='button'] {
@ -1385,7 +1384,7 @@ button.module-scroll-down {
/* Memberlist */ /* Memberlist */
.member-list-container .member { .member-list-container .member {
&-item { &-item {
font-family: "SF Pro Text"; font-family: 'SF Pro Text';
padding: $session-margin-sm $session-margin-md; padding: $session-margin-sm $session-margin-md;
background-color: $session-shade-5; background-color: $session-shade-5;

@ -243,6 +243,7 @@ export class ConversationHeader extends React.Component<Props> {
iconType={SessionIconType.Search} iconType={SessionIconType.Search}
iconSize={SessionIconSize.Large} iconSize={SessionIconSize.Large}
iconPadded={true} iconPadded={true}
onClick={this.highlightMessageSearch}
/> />
</div> </div>
); );
@ -377,6 +378,12 @@ export class ConversationHeader extends React.Component<Props> {
} }
} }
public highlightMessageSearch(){
// This is a temporary fix. In future we want to search
// messages in the current conversation
$('.session-search-input input').focus();
}
private renderMemberCount() { private renderMemberCount() {
const memberCount = this.props.members.length; const memberCount = this.props.members.length;
@ -482,4 +489,5 @@ export class ConversationHeader extends React.Component<Props> {
</React.Fragment> </React.Fragment>
); );
} }
} }

Loading…
Cancel
Save