-
+
diff --git a/password.html b/password.html
index 40e231221..1e61f9f4b 100644
--- a/password.html
+++ b/password.html
@@ -29,7 +29,7 @@
-
+
diff --git a/stylesheets/_global.scss b/stylesheets/_global.scss
index 653c1d837..e78ebbf5a 100644
--- a/stylesheets/_global.scss
+++ b/stylesheets/_global.scss
@@ -122,6 +122,27 @@ a {
animation: loading 1500ms ease infinite 666ms;
}
}
+
+ .session-full-logo {
+ display: flex;
+ flex-direction: column;
+ align-items: center;
+ margin: auto;
+
+ .session-brand-logo {
+ height: 180px;
+ filter: brightness(0) saturate(100%) invert(75%) sepia(84%) saturate(3272%) hue-rotate(103deg)
+ brightness(106%) contrast(103%);
+ }
+
+ .session-text-logo {
+ margin-top: 10px;
+ width: 250px;
+ transition: 0s;
+ filter: var(--session-logo-text-current-filter);
+ }
+ }
+
.session-text-logo {
filter: var(--session-logo-text-current-filter);
}
diff --git a/stylesheets/_session_left_pane.scss b/stylesheets/_session_left_pane.scss
index 8ca3e21b2..35997b4e2 100644
--- a/stylesheets/_session_left_pane.scss
+++ b/stylesheets/_session_left_pane.scss
@@ -140,33 +140,3 @@ $session-compose-margin: 20px;
}
}
}
-
-.conversation.placeholder {
- margin: auto;
- height: 100%;
-
- .container {
- display: flex;
- height: 100%;
- }
-}
-
-.session-full-logo {
- display: flex;
- flex-direction: column;
- align-items: center;
- margin: auto;
-
- .session-brand-logo {
- height: 180px;
- filter: brightness(0) saturate(100%) invert(75%) sepia(84%) saturate(3272%) hue-rotate(103deg)
- brightness(106%) contrast(103%);
- }
-
- .session-text-logo {
- margin-top: 10px;
- width: 250px;
- transition: 0s;
- filter: var(--session-logo-text-current-filter);
- }
-}
diff --git a/ts/components/EmptyMessageView.tsx b/ts/components/EmptyMessageView.tsx
new file mode 100644
index 000000000..6a3c10515
--- /dev/null
+++ b/ts/components/EmptyMessageView.tsx
@@ -0,0 +1,42 @@
+import styled from 'styled-components';
+import { Flex } from './basic/Flex';
+
+const StyledPlaceholder = styled(Flex)`
+ margin: auto;
+ height: 100%;
+`;
+
+const StyledSessionFullLogo = styled(Flex)`
+ img:first-child {
+ height: 180px;
+ filter: brightness(0) saturate(100%) invert(75%) sepia(84%) saturate(3272%) hue-rotate(103deg)
+ brightness(106%) contrast(103%);
+ -webkit-user-drag: none;
+ }
+
+ img:nth-child(2) {
+ margin-top: 10px;
+ width: 250px;
+ transition: 0s;
+ filter: var(--session-logo-text-current-filter);
+ -webkit-user-drag: none;
+ }
+`;
+
+export const EmptyMessageView = () => {
+ return (
+
+
+
+
+
+
+ );
+};
diff --git a/ts/components/MainViewController.tsx b/ts/components/MainViewController.tsx
deleted file mode 100644
index 27a062a45..000000000
--- a/ts/components/MainViewController.tsx
+++ /dev/null
@@ -1,27 +0,0 @@
-import { CSSProperties } from 'styled-components';
-
-export const MessageView = () => {
- const noDragStyle = { '-webkit-user-drag': 'none' } as CSSProperties;
-
- return (
- {
} = this.props;
if (!selectedConversation || !messagesProps) {
- // return an empty message view
- return
+
+
-
-
- );
-};
diff --git a/ts/components/conversation/SessionConversation.tsx b/ts/components/conversation/SessionConversation.tsx
index 1438becc5..91d6cd392 100644
--- a/ts/components/conversation/SessionConversation.tsx
+++ b/ts/components/conversation/SessionConversation.tsx
@@ -45,7 +45,7 @@ import {
} from '../../types/attachments/VisualAttachment';
import { AttachmentUtil, GoogleChrome, arrayBufferToObjectURL } from '../../util';
import { getCurrentRecoveryPhrase } from '../../util/storage';
-import { MessageView } from '../MainViewController';
+import { EmptyMessageView } from '../EmptyMessageView';
import { SplitViewContainer } from '../SplitViewContainer';
import { SessionButtonColor } from '../basic/SessionButton';
import { InConversationCallContainer } from '../calling/InConversationCallContainer';
@@ -246,8 +246,7 @@ export class SessionConversation extends Component
-
-
-
-
-
-
-
-