pull/775/head
Vincent 5 years ago
parent aeb04a3a44
commit bd034df8db

@ -1162,8 +1162,7 @@
}, },
"messages": { "messages": {
"message": "Messages", "message": "Messages",
"description": "description": "Message search result"
"Message search result"
}, },
"deleteMessages": { "deleteMessages": {
"message": "Delete Messages", "message": "Delete Messages",

@ -918,7 +918,7 @@
}, },
}); });
} }
}; };
window.generateID = () => window.generateID = () =>
Math.random() Math.random()

@ -88,7 +88,6 @@ button.emoji {
background: transparent; background: transparent;
margin: 0px 10px 0px 15px; margin: 0px 10px 0px 15px;
&:before { &:before {
content: ''; content: '';
display: inline-block; display: inline-block;

@ -532,13 +532,13 @@ label {
.conversation-header { .conversation-header {
.module-avatar img { .module-avatar img {
box-shadow: 0px 0px 5px 0px rgba(255,255,255,0.20); box-shadow: 0px 0px 5px 0px rgba(255, 255, 255, 0.2);
} }
.search-icon { .search-icon {
margin-right: 10px; margin-right: 10px;
} }
.session-icon-button { .session-icon-button {
@include standard-icon-button(); @include standard-icon-button();
} }
@ -1595,7 +1595,11 @@ input {
align-items: flex-start; align-items: flex-start;
position: relative; position: relative;
padding: $session-margin-lg 2 * $session-margin-lg; padding: $session-margin-lg 2 * $session-margin-lg;
background: linear-gradient(180deg, rgba(29,28,28,1) 0%, rgba(18,18,18,1) 100%); background: linear-gradient(
180deg,
rgba(29, 28, 28, 1) 0%,
rgba(18, 18, 18, 1) 100%
);
&__exit { &__exit {
position: absolute; position: absolute;
@ -1614,11 +1618,10 @@ input {
height: 400px; height: 400px;
text-align: center; text-align: center;
font-family: "SF Pro Text"; font-family: 'SF Pro Text';
} }
&__title h1{ &__title h1 {
color: $session-color-white; color: $session-color-white;
font-size: $session-font-h1; font-size: $session-font-h1;
font-weight: bold; font-weight: bold;
@ -1631,7 +1634,7 @@ input {
} }
&__info { &__info {
font-family: "Wasa"; font-family: 'Wasa';
margin-bottom: 2 * $session-margin-lg; margin-bottom: 2 * $session-margin-lg;
&--title { &--title {
@ -1641,7 +1644,7 @@ input {
} }
&--subtitle { &--subtitle {
font-family: "SF Pro Text"; font-family: 'SF Pro Text';
font-weight: 300; font-weight: 300;
line-height: $session-font-md; line-height: $session-font-md;
opacity: 0.8; opacity: 0.8;
@ -1655,4 +1658,4 @@ input {
margin-bottom: $session-margin-md; margin-bottom: $session-margin-md;
} }
} }
} }

@ -18,8 +18,12 @@ import { SearchOptions } from '../../types/Search';
import { validateNumber } from '../../types/PhoneNumber'; import { validateNumber } from '../../types/PhoneNumber';
import { LeftPane, RowRendererParamsType } from '../LeftPane'; import { LeftPane, RowRendererParamsType } from '../LeftPane';
import { SessionClosableOverlay } from './SessionClosableOverlay'; import { SessionClosableOverlay } from './SessionClosableOverlay';
import { SessionIconButton, SessionIconType, SessionIconSize } from './icon'; import { SessionIconButton, SessionIconSize, SessionIconType } from './icon';
import { SessionButton, SessionButtonType, SessionButtonColor } from './SessionButton'; import {
SessionButton,
SessionButtonColor,
SessionButtonType,
} from './SessionButton';
export interface Props { export interface Props {
searchTerm: string; searchTerm: string;
@ -172,7 +176,7 @@ export class LeftPaneMessageSection extends React.Component<Props, any> {
); );
} }
public render(): JSX.Element {5 public render(): JSX.Element {
return ( return (
<div className="session-left-pane-section-content"> <div className="session-left-pane-section-content">
{this.renderHeader()} {this.renderHeader()}
@ -184,27 +188,25 @@ export class LeftPaneMessageSection extends React.Component<Props, any> {
} }
public renderConversations() { public renderConversations() {
return ( return (
<div className="module-conversations-list-content"> <div className="module-conversations-list-content">
{this.state.shouldRenderMessageOnboarding {this.state.shouldRenderMessageOnboarding ? (
? (<>{this.renderMessageOnboarding()}</>) <>{this.renderMessageOnboarding()}</>
: ( ) : (
<> <>
<SessionSearchInput <SessionSearchInput
searchString={this.props.searchTerm} searchString={this.props.searchTerm}
onChange={this.updateSearchBound} onChange={this.updateSearchBound}
placeholder={window.i18n('searchForAKeyPhrase')} placeholder={window.i18n('searchForAKeyPhrase')}
/> />
{this.renderList()} {this.renderList()}
</> </>
)} )}
</div> </div>
); );
} }
public renderMessageOnboarding() { public renderMessageOnboarding() {
return ( return (
<div className="onboarding-message-section"> <div className="onboarding-message-section">
<div className="onboarding-message-section__exit"> <div className="onboarding-message-section__exit">
@ -221,7 +223,7 @@ export class LeftPaneMessageSection extends React.Component<Props, any> {
</div> </div>
<div className="onboarding-message-section__icons"> <div className="onboarding-message-section__icons">
<img src="./images/session/chat-bubbles.svg"/> <img src="./images/session/chat-bubbles.svg" alt="" />
</div> </div>
<div className="onboarding-message-section__info"> <div className="onboarding-message-section__info">
@ -247,11 +249,10 @@ export class LeftPaneMessageSection extends React.Component<Props, any> {
/> />
</div> </div>
</div> </div>
</div> </div>
) );
} }
public handleCloseOnboarding() { public handleCloseOnboarding() {
this.setState({ this.setState({
shouldRenderMessageOnboarding: false, shouldRenderMessageOnboarding: false,

Loading…
Cancel
Save