wassname/talk
1
0
Fork 0
mirror of https://github.com/wassname/talk.git synced 2026-07-24 13:20:47 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'next' into account-history

Browse Source
This commit is contained in:
Kim Gardner
2018-01-11 15:34:50 -05:00
committed by GitHub
parent 9187231737 54ec9ea9a6
commit 9b4dcd8d32
9 changed files with 18 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
client/coral-admin/src/components/CommentDetails.css
+1 -1
View File
@@ -5,7 +5,7 @@
.moreDetail {
position: absolute;
font-size: 12px;
font-size: 13px;
font-weight: 500;
color: black;
right: 16px;
client/coral-admin/src/components/ToastContainer.css
+1 -1
View File
@@ -207,7 +207,7 @@
.toastify__body {
color: white;
overflow-x: scroll;
overflow-x: auto;
font-size: 15px;
font-weight: 400;
}
client/coral-admin/src/containers/UserDetailComment.js
+3
View File
@@ -35,6 +35,9 @@ export default withFragments({
editing {
edited
}
status_history {
type
}
...${getDefinitionName(CommentLabels.fragments.comment)}
...${getDefinitionName(CommentDetails.fragments.comment)}
}
client/coral-admin/src/routes/Configure/components/Configure.css
+1 -1
View File
@@ -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;
}
client/coral-admin/src/routes/Moderation/components/Moderation.js
+1 -1
View File
@@ -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}
client/coral-framework/components/CommentDetail.css
+4 -4
View File
@@ -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;
}
plugins/talk-plugin-flag-details/client/components/FlagDetails.css
+3 -3
View File
@@ -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;
}
plugins/talk-plugin-flag-details/client/components/UserFlagDetails.css
+3 -3
View File
@@ -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;
}
plugins/talk-plugin-flag-details/client/translations.yml
+1 -1
View File
@@ -1,6 +1,6 @@
en:
talk-plugin-flag-details:
flags: Flags
flags: Reports
es:
talk-plugin-flag-details:
flags: Reportes