From ab4ca7f24c65f4f2823c9228906067e737206abc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bel=C3=A9n=20Curcio?= Date: Sun, 12 Aug 2018 22:52:03 -0300 Subject: [PATCH] Adding PoweredBy and more --- .../stream/components/PostCommentForm.css | 9 +++++- .../stream/components/PostCommentForm.tsx | 31 ++++++++++--------- .../client/stream/components/PoweredBy.css | 0 .../client/stream/components/PoweredBy.tsx | 13 ++++++++ .../components/UserBoxAuthenticated.css | 4 +-- .../components/UserBoxAuthenticated.tsx | 10 +++--- .../stream/containers/UserBoxContainer.tsx | 12 +++---- src/core/client/ui/components/Flex/Flex.css | 6 ++-- 8 files changed, 52 insertions(+), 33 deletions(-) create mode 100644 src/core/client/stream/components/PoweredBy.css create mode 100644 src/core/client/stream/components/PoweredBy.tsx diff --git a/src/core/client/stream/components/PostCommentForm.css b/src/core/client/stream/components/PostCommentForm.css index 7a8ffebee..954a4de74 100644 --- a/src/core/client/stream/components/PostCommentForm.css +++ b/src/core/client/stream/components/PostCommentForm.css @@ -17,5 +17,12 @@ .postButtonContainer { display: flex; - justify-content: flex-end; + + &:first-child { + flex-grow: 1; + } + + &:last-child { + flex-grow: 0; + } } diff --git a/src/core/client/stream/components/PostCommentForm.tsx b/src/core/client/stream/components/PostCommentForm.tsx index c90c56b96..1f57246a7 100644 --- a/src/core/client/stream/components/PostCommentForm.tsx +++ b/src/core/client/stream/components/PostCommentForm.tsx @@ -5,8 +5,8 @@ import { Field, Form } from "react-final-form"; import { OnSubmit } from "talk-framework/lib/form"; import { required } from "talk-framework/lib/validation"; +import PoweredBy from "talk-stream/components/PoweredBy"; import { Button, Typography } from "talk-ui/components"; - import * as styles from "./PostCommentForm.css"; interface FormProps { @@ -41,25 +41,26 @@ const PostCommentForm: StatelessComponent = props => ( )} -
- {props.signedIn ? ( + {props.signedIn ? ( +
+ - ) : ( - - )} -
+
+ ) : ( + + )} )} diff --git a/src/core/client/stream/components/PoweredBy.css b/src/core/client/stream/components/PoweredBy.css new file mode 100644 index 000000000..e69de29bb diff --git a/src/core/client/stream/components/PoweredBy.tsx b/src/core/client/stream/components/PoweredBy.tsx new file mode 100644 index 000000000..5991c837a --- /dev/null +++ b/src/core/client/stream/components/PoweredBy.tsx @@ -0,0 +1,13 @@ +import React, { StatelessComponent } from "react"; +import { Flex, Typography } from "talk-ui/components"; + +const PoweredBy: StatelessComponent = () => { + return ( + + Powered by + The Coral Project + + ); +}; + +export default PoweredBy; diff --git a/src/core/client/stream/components/UserBoxAuthenticated.css b/src/core/client/stream/components/UserBoxAuthenticated.css index 272b33bdb..a98581e23 100644 --- a/src/core/client/stream/components/UserBoxAuthenticated.css +++ b/src/core/client/stream/components/UserBoxAuthenticated.css @@ -1,3 +1,3 @@ -.joinText { - margin-right: var(--spacing-unit); +.child { + width: initial; } diff --git a/src/core/client/stream/components/UserBoxAuthenticated.tsx b/src/core/client/stream/components/UserBoxAuthenticated.tsx index d897dd205..1b692ba9b 100644 --- a/src/core/client/stream/components/UserBoxAuthenticated.tsx +++ b/src/core/client/stream/components/UserBoxAuthenticated.tsx @@ -4,7 +4,7 @@ import React, { StatelessComponent } from "react"; import { Button, Flex, Typography } from "talk-ui/components"; import MatchMedia from "talk-ui/components/MatchMedia"; -// import * as styles from "./UserBoxUnauthenticated.css"; +import * as styles from "./UserBoxAuthenticated.css"; export interface UserBoxUnauthenticatedProps { onSignOut: () => void; @@ -15,7 +15,7 @@ const UserBoxAuthenticated: StatelessComponent< > = props => { return ( - + @@ -27,13 +27,13 @@ const UserBoxAuthenticated: StatelessComponent< - - + + Not you? - +