From 8427e82c9d27c01be1f92c1670e12810798c44e8 Mon Sep 17 00:00:00 2001 From: Sharon Kennedy Date: Tue, 26 May 2020 09:22:08 -0400 Subject: [PATCH] add namespace to avoid css collistions --- src/components/_chat.scss | 1 + src/components/chatbox.jsx | 170 +++++++++++++++++++------------------ src/components/styles.scss | 10 ++- 3 files changed, 93 insertions(+), 88 deletions(-) diff --git a/src/components/_chat.scss b/src/components/_chat.scss index 7498372..a7b6558 100644 --- a/src/components/_chat.scss +++ b/src/components/_chat.scss @@ -99,6 +99,7 @@ width: 400px; max-width: calc(100vw - 10px); border-bottom: none; + margin: 0; animation-duration: 0.2s; animation-fill-mode: forwards; diff --git a/src/components/chatbox.jsx b/src/components/chatbox.jsx index 5994634..e49168e 100644 --- a/src/components/chatbox.jsx +++ b/src/components/chatbox.jsx @@ -599,103 +599,105 @@ class ChatBox extends React.Component { const inputLabel = 'Send a message...' return ( -
- - {(status) => { - return ( -
-
-
+
+
+ + {(status) => { + return ( +
+
+
-
-
-
-
{ this.props.introMessage }
-
- -
-
Please read the full terms and conditions. By using this chat, you agree to these terms.
-
- -
-
{ this.props.agreementMessage }
-
- -
-
- {`👉`} - - +
+
+
+
{ this.props.introMessage }
-
- { - messages.map((message, index) => { - return( - - ) - }) - } - - { - messagesInFlight.map((message, index) => { - return( - - ) - }) - } - - { typingStatus && -
-
{typingStatus}
+
+
Please read the full terms and conditions. By using this chat, you agree to these terms.
+
+ +
+
{ this.props.agreementMessage }
- } - { Boolean(Object.keys(decryptionErrors).length) &&
- {`Restart chat without encryption?`} - + {`👉`} + +
- } - { !ready &&
loading...
} + { + messages.map((message, index) => { + return( + + ) + }) + } + + { + messagesInFlight.map((message, index) => { + return( + + ) + }) + } + + { typingStatus && +
+
{typingStatus}
+
+ } + + { Boolean(Object.keys(decryptionErrors).length) && +
+
+ {`Restart chat without encryption?`} + +
+
+ } + + { !ready &&
loading...
} +
+
+
+
+
+ + { + (status === "entered") && !isMobile && + + } +
+ +
-
-
-
- - { - (status === "entered") && !isMobile && - - } -
- -
-
-
- )} - } - - {showDock && !roomId && } - {showDock && roomId &&
} + )} + } + + {showDock && !roomId && } + {showDock && roomId &&
} +
); } diff --git a/src/components/styles.scss b/src/components/styles.scss index 6e75844..0f7d659 100644 --- a/src/components/styles.scss +++ b/src/components/styles.scss @@ -1,4 +1,6 @@ -@import "variables"; -@import "loader"; -@import "chat"; -@import "dark_mode"; \ No newline at end of file +#safesupport { + @import "variables"; + @import "loader"; + @import "chat"; + @import "dark_mode"; +} \ No newline at end of file