diff --git a/js/modules/loki_app_dot_net_api.js b/js/modules/loki_app_dot_net_api.js index 293d6a522..c9664abef 100644 --- a/js/modules/loki_app_dot_net_api.js +++ b/js/modules/loki_app_dot_net_api.js @@ -614,7 +614,9 @@ class LokiAppDotNetServerAPI { `serverRequest ${mode} error`, e.code, e.message, - `json: ${txtResponse}`, 'attempting connection to', url + `json: ${txtResponse}`, + 'attempting connection to', + url ); } else { log.info( diff --git a/preload.js b/preload.js index a26d1a7a0..da4eb218f 100644 --- a/preload.js +++ b/preload.js @@ -494,7 +494,6 @@ window.shortenPubkey = pubkey => `(...${pubkey.substring(pubkey.length - 6)})`; window.pubkeyPattern = /@[a-fA-F0-9]{64,66}\b/g; - // TODO: activate SealedSender once it is ready on all platforms window.lokiFeatureFlags = { multiDeviceUnpairing: true, diff --git a/stylesheets/_session.scss b/stylesheets/_session.scss index ff5cfd62a..891c2f24d 100644 --- a/stylesheets/_session.scss +++ b/stylesheets/_session.scss @@ -115,7 +115,6 @@ $main-view-header-height: 85px; $session-left-pane-width: 300px; $session-left-pane-sections-container-width: 80px; - div.spacer-sm { height: $session-margin-sm; } @@ -135,9 +134,8 @@ div.spacer-lg { color: rgba($color, 0.6); } - // Blur for modals -.loki-dialog ~ .index.inbox{ +.loki-dialog ~ .index.inbox { filter: blur(1px); transition: filter 0.1s; } @@ -232,7 +230,7 @@ $session_message-container-border-radius: 5px; pointer-events: none; } .overlay { - display: block !important; + display: flex !important; z-index: 1; } @@ -580,12 +578,15 @@ label { .message-selection-overlay { display: none; position: absolute; - right: $session-margin-sm; - left: $session-margin-md; + left: 0px; + right: 0px; + margin: 0px $session-margin-sm; + align-items: center; + justify-content: space-between; + height: 48px; .close-button { float: left; - margin: 17px 0px 0px 0px; } } .message-selection-overlay div[role='button'] { @@ -594,7 +595,6 @@ label { .message-selection-overlay .button-group { float: right; - margin-top: 13.5px; } .hidden { @@ -1293,7 +1293,15 @@ label { .module-message { font-family: 'SF Pro Text'; border-radius: 5px; + + &__text--incoming { + /* Add padding to large emojis in chat */ + img.emoji.jumbo { + margin: $session-margin-sm 0px; + } + } } + } .bottom-bar { @@ -1770,8 +1778,7 @@ input { } } - .invite-friends-container { height: $session-icon-size-lg; width: $session-icon-size-lg; -} \ No newline at end of file +} diff --git a/stylesheets/_session_group_panel.scss b/stylesheets/_session_group_panel.scss index 4393fed6f..f9d179803 100644 --- a/stylesheets/_session_group_panel.scss +++ b/stylesheets/_session_group_panel.scss @@ -19,7 +19,8 @@ margin: auto; } - .session-icon-button, .invite-friends-container { + .session-icon-button, + .invite-friends-container { margin: 0 $session-margin-md; } } diff --git a/stylesheets/_session_left_pane.scss b/stylesheets/_session_left_pane.scss index 8024524e2..a35a8c41d 100644 --- a/stylesheets/_session_left_pane.scss +++ b/stylesheets/_session_left_pane.scss @@ -550,11 +550,11 @@ $session-compose-margin: 20px; } &.active { - background-color: $session-shade-9; + background-color: $session-shade-7; } &:hover { - background-color: $session-shade-7; + background-color: $session-shade-5; } &__buttons { diff --git a/ts/components/conversation/InviteFriendsDialog.tsx b/ts/components/conversation/InviteFriendsDialog.tsx index a94fcaa4c..c601f62aa 100644 --- a/ts/components/conversation/InviteFriendsDialog.tsx +++ b/ts/components/conversation/InviteFriendsDialog.tsx @@ -2,7 +2,10 @@ import React from 'react'; import { SessionModal } from '../session/SessionModal'; import { SessionButton } from '../session/SessionButton'; -import { ContactType, SessionMemberListItem } from '../session/SessionMemberListItem'; +import { + ContactType, + SessionMemberListItem, +} from '../session/SessionMemberListItem'; interface Props { friendList: Array; @@ -53,7 +56,6 @@ export class InviteFriendsDialog extends React.Component { } public render() { - const titleText = `${window.i18n('addingFriends')} ${this.props.chatName}`; const cancelText = window.i18n('cancel'); const okText = window.i18n('ok'); @@ -68,9 +70,7 @@ export class InviteFriendsDialog extends React.Component { >
-
- {this.renderMemberList()} -
+
{this.renderMemberList()}
{hasFriends ? null : ( <>
@@ -154,13 +154,6 @@ export class InviteFriendsDialog extends React.Component { private closeDialog() { window.removeEventListener('keyup', this.onKeyUp); - - console.log(this.props.onClose); - console.log(this.props.onClose); - console.log(this.props.onClose); - console.log(this.props.onClose); - this.props.onClose(); } - } diff --git a/ts/components/session/LeftPaneSettingSection.tsx b/ts/components/session/LeftPaneSettingSection.tsx index e1cabaccc..b540e9afd 100644 --- a/ts/components/session/LeftPaneSettingSection.tsx +++ b/ts/components/session/LeftPaneSettingSection.tsx @@ -76,8 +76,6 @@ export class LeftPaneSettingSection extends React.Component { >
{item.title} -
- {item.description}
@@ -181,31 +179,26 @@ export class LeftPaneSettingSection extends React.Component { { id: SessionSettingCategory.Appearance, title: window.i18n('appearanceSettingsTitle'), - description: window.i18n('appearanceSettingsDescription'), hidden: false, }, { id: SessionSettingCategory.Privacy, title: window.i18n('privacySettingsTitle'), - description: window.i18n('privacySettingsDescription'), hidden: false, }, { id: SessionSettingCategory.Permissions, title: window.i18n('permissionSettingsTitle'), - description: window.i18n('permissionSettingsDescription'), hidden: true, }, { id: SessionSettingCategory.Notifications, title: window.i18n('notificationSettingsTitle'), - description: window.i18n('notificationSettingsDescription'), hidden: false, }, { id: SessionSettingCategory.Devices, title: window.i18n('devicesSettingsTitle'), - description: window.i18n('devicesSettingsDescription'), }, ]; } diff --git a/ts/components/session/SessionChannelSettings.tsx b/ts/components/session/SessionChannelSettings.tsx index 05dc37c54..54a62097b 100644 --- a/ts/components/session/SessionChannelSettings.tsx +++ b/ts/components/session/SessionChannelSettings.tsx @@ -54,16 +54,15 @@ export class SessionChannelSettings extends React.Component { setTimeout(() => { this.getMediaGalleryProps() - .then(({ documents, media, onItemClick }) => { - this.setState({ - documents, - media, - onItemClick, - }); - }) - .ignore(); + .then(({ documents, media, onItemClick }) => { + this.setState({ + documents, + media, + onItemClick, + }); + }) + .ignore(); }, mediaScanInterval); - } public async getMediaGalleryProps() { @@ -265,7 +264,7 @@ export class SessionChannelSettings extends React.Component { conversationType="group" size={80} /> - +
{shouldShowInviteFriends && ( { /> )}
- -
); }