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

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

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

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

@ -532,13 +532,13 @@ label {
.conversation-header {
.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 {
margin-right: 10px;
}
.session-icon-button {
@include standard-icon-button();
}
@ -1595,7 +1595,11 @@ input {
align-items: flex-start;
position: relative;
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 {
position: absolute;
@ -1614,11 +1618,10 @@ input {
height: 400px;
text-align: center;
font-family: "SF Pro Text";
font-family: 'SF Pro Text';
}
&__title h1{
&__title h1 {
color: $session-color-white;
font-size: $session-font-h1;
font-weight: bold;
@ -1631,7 +1634,7 @@ input {
}
&__info {
font-family: "Wasa";
font-family: 'Wasa';
margin-bottom: 2 * $session-margin-lg;
&--title {
@ -1641,7 +1644,7 @@ input {
}
&--subtitle {
font-family: "SF Pro Text";
font-family: 'SF Pro Text';
font-weight: 300;
line-height: $session-font-md;
opacity: 0.8;
@ -1655,4 +1658,4 @@ input {
margin-bottom: $session-margin-md;
}
}
}
}

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

Loading…
Cancel
Save