resolve merge issues
This commit is contained in:
parent
634aaa36d4
commit
ecaf37cc82
|
@ -66,8 +66,7 @@
|
|||
Whisper.AppLoadingScreen = Whisper.View.extend({
|
||||
templateName: 'app-loading-screen',
|
||||
className: 'app-loading-screen',
|
||||
updateProgress() {
|
||||
},
|
||||
updateProgress() {},
|
||||
render_attributes: {
|
||||
message: i18n('loading'),
|
||||
},
|
||||
|
|
|
@ -235,8 +235,7 @@ $session-compose-margin: 20px;
|
|||
}
|
||||
}
|
||||
|
||||
.session-logo{
|
||||
|
||||
.session-logo {
|
||||
&-128 {
|
||||
@include session-filter-color-green();
|
||||
width: 128px;
|
||||
|
@ -246,14 +245,12 @@ $session-compose-margin: 20px;
|
|||
&-text {
|
||||
font-size: 70px;
|
||||
font-weight: bold;
|
||||
margin:0px;
|
||||
margin: 0px;
|
||||
color: $session-color-white;
|
||||
font-family: $session-font-family;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
.app-loading-screen {
|
||||
@include session-dark-background;
|
||||
}
|
||||
|
|
|
@ -219,7 +219,6 @@ export class ActionsPanel extends React.Component<Props, State> {
|
|||
}
|
||||
unreadCount += conversation.unreadCount;
|
||||
if (unreadCount > 9) {
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
|
|
|
@ -2,7 +2,7 @@ import React from 'react';
|
|||
|
||||
import {
|
||||
ConversationListItem,
|
||||
PropsData as ConversationListItemPropsType
|
||||
PropsData as ConversationListItemPropsType,
|
||||
} from '../ConversationListItem';
|
||||
import { PropsData as SearchResultsProps } from '../SearchResults';
|
||||
import { debounce } from 'lodash';
|
||||
|
@ -258,7 +258,6 @@ export class LeftPaneContactSection extends React.Component<Props, any> {
|
|||
);
|
||||
}
|
||||
|
||||
|
||||
// true: received only, false: sent only
|
||||
private getFriendRequests(
|
||||
received: boolean
|
||||
|
|
|
@ -15,7 +15,6 @@ interface Window {
|
|||
i18n: any;
|
||||
friends: any;
|
||||
generateID: any;
|
||||
pushToast: any;
|
||||
storage: any;
|
||||
pushToast: any;
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue