diff --git a/containers/react/src/components/Messages/Message.tsx b/containers/react/src/components/Messages/Message.tsx index 38814ba3..53437504 100644 --- a/containers/react/src/components/Messages/Message.tsx +++ b/containers/react/src/components/Messages/Message.tsx @@ -23,9 +23,9 @@ import React from "react"; const MeStyleP = styled.p` background-color: #5843e4; padding 10px 20px; - border-radius 10px 0px 10px 10px; + border-radius 10px; color: white; - margin-right: 20px; + margin: 10px; ` interface MessageMeProps { diff --git a/containers/react/src/components/Social/Friend.tsx b/containers/react/src/components/Social/Friend.tsx index fe0436c5..b49245fc 100644 --- a/containers/react/src/components/Social/Friend.tsx +++ b/containers/react/src/components/Social/Friend.tsx @@ -46,7 +46,7 @@ interface UserProps { export default function Friend({currentUser}: UserProps) { const [profilePicture, setProfilePicture] = useState(''); - + useEffect(() => { const fetchProfilePicture = async () => { try { @@ -70,9 +70,9 @@ export default function Friend({currentUser}: UserProps) if (status === 0) statusColor = 'grey'; - else if (status === 1) + else if (status === 1) statusColor = 'green'; - else if (status === 2) + else if (status === 2) statusColor = 'blue'; return statusColor; } @@ -99,18 +99,18 @@ export default function Friend({currentUser}: UserProps) ) : ( Default Profile Picture )} -
+
handleButtonClick(currentUser)}>{currentUser.nickname} - - - {getStatus(currentUser) !== 'blue' ? ( - <> - ) : ( - - )} -
+
+ +
+
) } - - +// spectate visible +// {getStatus(currentUser) !== 'blue' ? ( +// <> +// ) : ( +// +// )} diff --git a/containers/react/src/styles/App.css b/containers/react/src/styles/App.css index 2efb207d..6b19368d 100644 --- a/containers/react/src/styles/App.css +++ b/containers/react/src/styles/App.css @@ -21,13 +21,14 @@ input.qr{ } .desactivate { - margin: 40vh; + margin: 20%; color: ghostwhite; outline: 0; - border-radius: 20px; - padding: 20px; + border-radius: 100px; + padding: 2%; background-image: linear-gradient(90deg, #5843e4, #5a0760); border: 0; + font-size: x-large; } .App-logo { height: 40vmin; diff --git a/containers/react/src/styles/Header.css b/containers/react/src/styles/Header.css index 55a965e2..531e5f06 100644 --- a/containers/react/src/styles/Header.css +++ b/containers/react/src/styles/Header.css @@ -22,7 +22,7 @@ display: grid; justify-content: center; position: fixed; - top: 0; + top: 0; left: 0; transition: 350ms; /* margin-top: 10px; */ @@ -127,4 +127,5 @@ span { display: flex; align-items: center; justify-content: center; -} \ No newline at end of file + z-index: 1; +} diff --git a/containers/react/src/styles/Messages.css b/containers/react/src/styles/Messages.css index 0c6a9d4c..4285e235 100644 --- a/containers/react/src/styles/Messages.css +++ b/containers/react/src/styles/Messages.css @@ -4,7 +4,7 @@ display: flex; align-items: center; justify-content: center; - + } select{ @@ -67,7 +67,7 @@ select{ align-items: center; justify-content: center; /* position:relative; */ - + } .container{ @@ -173,6 +173,7 @@ input{ width: 40px; height: 40px; border-radius: 50%; + margin: 10px; } .messageContent{ @@ -373,7 +374,7 @@ input.in_howLong{ .case{ height: auto; width: auto; - margin-left: 10px; + margin-left: 10px; } .catchat{