From 3c6ce7a80f8221e921f19156e7a1416ce4bc31af Mon Sep 17 00:00:00 2001 From: Belen Curcio Date: Tue, 11 Apr 2017 21:56:43 -0300 Subject: [PATCH 1/6] QuestionBox --- client/coral-embed-stream/style/default.css | 21 ++++++++++++------- .../coral-plugin-questionbox/QuestionBox.js | 4 +++- 2 files changed, 17 insertions(+), 8 deletions(-) diff --git a/client/coral-embed-stream/style/default.css b/client/coral-embed-stream/style/default.css index 89436e000..41ec7a64b 100644 --- a/client/coral-embed-stream/style/default.css +++ b/client/coral-embed-stream/style/default.css @@ -129,15 +129,15 @@ hr { margin-bottom: 0px; font-weight: bold; font-size: 14px; - display: block; overflow: hidden; - height: 50px; + min-height: 50px; + display: flex; } .coral-plugin-questionbox-icon.bubble{ position: absolute; top: 11px; - left: 15px; + left: 10px; color: #949393; font-size: 20px; z-index: 0; @@ -146,7 +146,7 @@ hr { .coral-plugin-questionbox-icon.person{ z-index: 2; top: 20px; - left: 20px; + left: 15px; position: absolute; font-size: 24px; color: white; @@ -161,12 +161,19 @@ hr { margin-left: 0px !important; margin-right: 10px; display: inline-block; - width: 15px; - height: 100%; - padding: 3px 20px; + width: 10px; + min-height: 100%; + padding: 5px 20px; vertical-align: middle; } +.coral-plugin-questionbox-content { + padding: 5px; + display: flex; + align-items: center; + justify-content: center; +} + .hidden { visibility: hidden; display: none; diff --git a/client/coral-plugin-questionbox/QuestionBox.js b/client/coral-plugin-questionbox/QuestionBox.js index 3c2410d44..31ad45869 100644 --- a/client/coral-plugin-questionbox/QuestionBox.js +++ b/client/coral-plugin-questionbox/QuestionBox.js @@ -7,7 +7,9 @@ const QuestionBox = ({enable, content}) => chat_bubble person - {content} +
+ {content} +
; export default QuestionBox; From e4aa98b87a1446d19fbf8d00d71fdbdc9d4aab42 Mon Sep 17 00:00:00 2001 From: Belen Curcio Date: Tue, 11 Apr 2017 22:00:55 -0300 Subject: [PATCH 2/6] Hidding login as --- client/coral-embed-stream/src/Embed.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/coral-embed-stream/src/Embed.js b/client/coral-embed-stream/src/Embed.js index d9b5c8310..673fee69e 100644 --- a/client/coral-embed-stream/src/Embed.js +++ b/client/coral-embed-stream/src/Embed.js @@ -158,7 +158,7 @@ class Embed extends Component { this.props.data.refetch(); }}>{lang.t('showAllComments')} } - {loggedIn && this.props.logout().then(refetch)} changeTab={this.changeTab}/>} + {loggedIn && activeTab !== 1 && this.props.logout().then(refetch)} changeTab={this.changeTab}/>} { openStream From 63b630833a86d83f6845cc8d083f3e6ef7cf07ad Mon Sep 17 00:00:00 2001 From: Belen Curcio Date: Tue, 11 Apr 2017 22:12:10 -0300 Subject: [PATCH 3/6] Fake Comment Style --- client/coral-sign-in/components/FakeComment.js | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/client/coral-sign-in/components/FakeComment.js b/client/coral-sign-in/components/FakeComment.js index b5af6bf1c..518bda5e3 100644 --- a/client/coral-sign-in/components/FakeComment.js +++ b/client/coral-sign-in/components/FakeComment.js @@ -28,10 +28,10 @@ class FakeComment extends React.Component { author={{'name': username}}/> -
+
- @@ -43,16 +43,16 @@ class FakeComment extends React.Component { banned={false} />
-
+
From 2e3021e66bd6612e10bdc27f9e19dab5b8514cfe Mon Sep 17 00:00:00 2001 From: Belen Curcio Date: Tue, 11 Apr 2017 22:17:04 -0300 Subject: [PATCH 4/6] Linting --- client/coral-sign-in/components/FakeComment.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/client/coral-sign-in/components/FakeComment.js b/client/coral-sign-in/components/FakeComment.js index 518bda5e3..f5926852c 100644 --- a/client/coral-sign-in/components/FakeComment.js +++ b/client/coral-sign-in/components/FakeComment.js @@ -30,8 +30,8 @@ class FakeComment extends React.Component {
- From cc0f757746c32a745abb920947b47c416b88e6b3 Mon Sep 17 00:00:00 2001 From: Belen Curcio Date: Wed, 12 Apr 2017 08:16:02 -0300 Subject: [PATCH 5/6] Removing username --- client/coral-embed-stream/src/Embed.js | 2 +- client/coral-settings/containers/ProfileContainer.js | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/client/coral-embed-stream/src/Embed.js b/client/coral-embed-stream/src/Embed.js index 673fee69e..d9b5c8310 100644 --- a/client/coral-embed-stream/src/Embed.js +++ b/client/coral-embed-stream/src/Embed.js @@ -158,7 +158,7 @@ class Embed extends Component { this.props.data.refetch(); }}>{lang.t('showAllComments')} } - {loggedIn && activeTab !== 1 && this.props.logout().then(refetch)} changeTab={this.changeTab}/>} + {loggedIn && this.props.logout().then(refetch)} changeTab={this.changeTab}/>} { openStream diff --git a/client/coral-settings/containers/ProfileContainer.js b/client/coral-settings/containers/ProfileContainer.js index 9a8117e87..6df926c7c 100644 --- a/client/coral-settings/containers/ProfileContainer.js +++ b/client/coral-settings/containers/ProfileContainer.js @@ -44,7 +44,6 @@ class ProfileContainer extends Component { return (
- { // Hiding bio until moderation can get figured out From 1a678a0cb31525e49b001e5f21cd93f8f4d3c27b Mon Sep 17 00:00:00 2001 From: Belen Curcio Date: Wed, 12 Apr 2017 08:21:39 -0300 Subject: [PATCH 6/6] Removing username -- with lintin --- client/coral-settings/containers/ProfileContainer.js | 1 - 1 file changed, 1 deletion(-) diff --git a/client/coral-settings/containers/ProfileContainer.js b/client/coral-settings/containers/ProfileContainer.js index 6df926c7c..331069058 100644 --- a/client/coral-settings/containers/ProfileContainer.js +++ b/client/coral-settings/containers/ProfileContainer.js @@ -8,7 +8,6 @@ import {myCommentHistory} from 'coral-framework/graphql/queries'; import {link} from 'coral-framework/services/PymConnection'; import NotLoggedIn from '../components/NotLoggedIn'; import {Spinner} from 'coral-ui'; -import ProfileHeader from '../components/ProfileHeader'; import CommentHistory from 'coral-plugin-history/CommentHistory'; import translations from '../translations';