From 11b38f7ea0780f60180fd01bed70659dcdf9f410 Mon Sep 17 00:00:00 2001 From: Chi Vinh Le Date: Thu, 11 Jan 2018 13:55:09 +0100 Subject: [PATCH 1/5] Fix no status history error --- client/coral-admin/src/containers/UserDetailComment.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/client/coral-admin/src/containers/UserDetailComment.js b/client/coral-admin/src/containers/UserDetailComment.js index fe95f4ae4..479d28dc7 100644 --- a/client/coral-admin/src/containers/UserDetailComment.js +++ b/client/coral-admin/src/containers/UserDetailComment.js @@ -35,6 +35,9 @@ export default withFragments({ editing { edited } + status_history { + type + } ...${getDefinitionName(CommentLabels.fragments.comment)} ...${getDefinitionName(CommentDetails.fragments.comment)} } From 1337873adf6b6474eaadaf2ea7f007373afcaa27 Mon Sep 17 00:00:00 2001 From: Chi Vinh Le Date: Thu, 11 Jan 2018 16:05:02 +0100 Subject: [PATCH 2/5] Remove unwanted scroll in configure --- .../coral-admin/src/routes/Configure/components/Configure.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/coral-admin/src/routes/Configure/components/Configure.css b/client/coral-admin/src/routes/Configure/components/Configure.css index 82760acff..f4bcb8b01 100644 --- a/client/coral-admin/src/routes/Configure/components/Configure.css +++ b/client/coral-admin/src/routes/Configure/components/Configure.css @@ -20,7 +20,7 @@ .mainContent { width: calc(100% - 300px); - padding: 10px 14px 80px 14px; + padding: 10px 14px 120px 14px; box-sizing: border-box; max-width: 718px; } From 210b0ab907d33a5b050e6339acf5af28b2da5119 Mon Sep 17 00:00:00 2001 From: Chi Vinh Le Date: Thu, 11 Jan 2018 16:05:20 +0100 Subject: [PATCH 3/5] Only show scrollbars when necessary --- client/coral-admin/src/components/ToastContainer.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/coral-admin/src/components/ToastContainer.css b/client/coral-admin/src/components/ToastContainer.css index 2fcbd7f7d..100f97f89 100644 --- a/client/coral-admin/src/components/ToastContainer.css +++ b/client/coral-admin/src/components/ToastContainer.css @@ -207,7 +207,7 @@ .toastify__body { color: white; - overflow-x: scroll; + overflow-x: auto; font-size: 15px; font-weight: 400; } From 2269c91244ee6ff8b46ab240df11af32ca8ae262 Mon Sep 17 00:00:00 2001 From: Chi Vinh Le Date: Thu, 11 Jan 2018 16:54:54 +0100 Subject: [PATCH 4/5] Restore shortcut functionality --- .../coral-admin/src/routes/Moderation/components/Moderation.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/coral-admin/src/routes/Moderation/components/Moderation.js b/client/coral-admin/src/routes/Moderation/components/Moderation.js index e14df7a89..a7a7d16ac 100644 --- a/client/coral-admin/src/routes/Moderation/components/Moderation.js +++ b/client/coral-admin/src/routes/Moderation/components/Moderation.js @@ -176,7 +176,7 @@ class Moderation extends Component { hasNextPage={comments.hasNextPage} activeTab={activeTab} singleView={moderation.singleView} - selectedCommentId={this.state.selectedCommentId} + selectedCommentId={moderation.selectedCommentId} acceptComment={props.acceptComment} rejectComment={props.rejectComment} loadMore={this.loadMore} From 90f1ef050b268b28c8aba3f4938fb4ceca026efe Mon Sep 17 00:00:00 2001 From: Chi Vinh Le Date: Thu, 11 Jan 2018 18:41:53 +0100 Subject: [PATCH 5/5] Change Flags to Reports and make a bit bigger --- client/coral-admin/src/components/CommentDetails.css | 2 +- client/coral-framework/components/CommentDetail.css | 8 ++++---- .../client/components/FlagDetails.css | 6 +++--- .../client/components/UserFlagDetails.css | 6 +++--- plugins/talk-plugin-flag-details/client/translations.yml | 2 +- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/client/coral-admin/src/components/CommentDetails.css b/client/coral-admin/src/components/CommentDetails.css index 1ee1c46dd..2727a8607 100644 --- a/client/coral-admin/src/components/CommentDetails.css +++ b/client/coral-admin/src/components/CommentDetails.css @@ -5,7 +5,7 @@ .moreDetail { position: absolute; - font-size: 12px; + font-size: 13px; font-weight: 500; color: black; right: 16px; diff --git a/client/coral-framework/components/CommentDetail.css b/client/coral-framework/components/CommentDetail.css index 4806b9522..f5bb33bf2 100644 --- a/client/coral-framework/components/CommentDetail.css +++ b/client/coral-framework/components/CommentDetail.css @@ -12,18 +12,18 @@ margin: 0; font-weight: 500; display: inline-block; - font-size: 12px; + font-size: 13px; line-height: 12px; margin-right: 7px; } .info { - font-size: 12px; + font-size: 13px; } .details { padding: 0 20px 16px; - font-size: 12px; + font-size: 13px; &:empty { display: none; @@ -32,6 +32,6 @@ .icon { vertical-align: middle; - font-size: 12px; + font-size: 13px; margin-right: 7px; } diff --git a/plugins/talk-plugin-flag-details/client/components/FlagDetails.css b/plugins/talk-plugin-flag-details/client/components/FlagDetails.css index 3b59653c2..1e8d03ac4 100644 --- a/plugins/talk-plugin-flag-details/client/components/FlagDetails.css +++ b/plugins/talk-plugin-flag-details/client/components/FlagDetails.css @@ -4,7 +4,7 @@ list-style: none; display: inline-block; padding: 0; - font-size: 12px; + font-size: 13px; margin: 0; } @@ -12,7 +12,7 @@ margin: 0; padding: 0; list-style: none; - font-size: 12px; + font-size: 13px; font-weight: 500; } @@ -20,7 +20,7 @@ margin-left:10px; padding: 0; list-style: none; - font-size: 12px; + font-size: 13px; font-weight: normal; color: #888; } diff --git a/plugins/talk-plugin-flag-details/client/components/UserFlagDetails.css b/plugins/talk-plugin-flag-details/client/components/UserFlagDetails.css index 3b59653c2..1e8d03ac4 100644 --- a/plugins/talk-plugin-flag-details/client/components/UserFlagDetails.css +++ b/plugins/talk-plugin-flag-details/client/components/UserFlagDetails.css @@ -4,7 +4,7 @@ list-style: none; display: inline-block; padding: 0; - font-size: 12px; + font-size: 13px; margin: 0; } @@ -12,7 +12,7 @@ margin: 0; padding: 0; list-style: none; - font-size: 12px; + font-size: 13px; font-weight: 500; } @@ -20,7 +20,7 @@ margin-left:10px; padding: 0; list-style: none; - font-size: 12px; + font-size: 13px; font-weight: normal; color: #888; } diff --git a/plugins/talk-plugin-flag-details/client/translations.yml b/plugins/talk-plugin-flag-details/client/translations.yml index f978ca7ee..df7a14fe9 100644 --- a/plugins/talk-plugin-flag-details/client/translations.yml +++ b/plugins/talk-plugin-flag-details/client/translations.yml @@ -1,6 +1,6 @@ en: talk-plugin-flag-details: - flags: Flags + flags: Reports es: talk-plugin-flag-details: flags: Reportes