diff --git a/src/Flows.css b/src/Flows.css index 8357422..c672bd2 100644 --- a/src/Flows.css +++ b/src/Flows.css @@ -398,15 +398,15 @@ margin: 0 0.25em; } -.box-content-wrapper { +.box-post { display: flex; } -.box-content-wrapper .box-content { +.box .box-post-main { flex: 1 1; } -.box-content-wrapper .box-content-vote { +.box .box-post-vote { flex: 0 0; margin-left: 6px; } diff --git a/src/Flows.js b/src/Flows.js index b55c8c4..8ca4be8 100644 --- a/src/Flows.js +++ b/src/Flows.js @@ -246,110 +246,113 @@ class FlowItem extends PureComponent { )}
- {!!window.LATEST_POST_ID && - parseInt(info.pid, 10) > window.LATEST_POST_ID && ( -
- )} - {!!attention && !cached &&
} -
- {!!do_filter_name && ( - { - do_filter_name(DZ_NAME); - }} - > - - - )} - {!do_react && ( - - - - {info.up_votes - info.down_votes} +
+ {!!window.LATEST_POST_ID && + parseInt(info.pid, 10) > window.LATEST_POST_ID && ( +
+ )} + {!!attention && !cached &&
} +
+ {!!do_filter_name && ( + { + do_filter_name(DZ_NAME); + }} + > + - - )} - {!!parseInt(info.likenum, 10) && ( - - {info.likenum}  + )} + {!do_react && ( + + + + {info.up_votes - info.down_votes} + + + )} + {!!parseInt(info.likenum, 10) && ( + + {info.likenum}  + + + )} + {!!parseInt(info.reply, 10) && ( + + {info.reply}  + + + )} + + + #{info.pid} + {info.room_id !== parseInt(window.config.room) && ( + <> @{info.room_id} + )} + + +   + {info.author_title && ( + {`"${info.author_title}"`} + )} + {info.is_tmp && ( + 临时账号 + )} + {info.is_reported && R } + {!!do_delete && !!info.can_del && ( { + do_delete('pid', info.pid); + }} /> - - )} - {!!parseInt(info.reply, 10) && ( - - {info.reply}  - - - )} - - - #{info.pid} - {info.room_id !== parseInt(window.config.room) && ( - <> @{info.room_id} - )} - - -   - {info.author_title && ( - {`"${info.author_title}"`} - )} - {info.is_tmp && ( - 临时账号 - )} - {info.is_reported && R } - {!!do_delete && !!info.can_del && ( - { - do_delete('pid', info.pid); - }} - /> - )} - {!!do_block && ( - - )} - {info.dangerous_user && ( - {info.dangerous_user} - )} - {info.blocked_count && ( - {info.blocked_count} - )} - {info.cw !== null && (!do_edit_cw || !info.can_del) && ( - {info.cw} - )} - {!!do_edit_cw && !!info.can_del && ( -
- - -
+ )} + {info.dangerous_user && ( + {info.dangerous_user} + )} + {info.blocked_count && ( + {info.blocked_count} + )} + {info.cw !== null && (!do_edit_cw || !info.can_del) && ( + {info.cw} + )} + {!!do_edit_cw && !!info.can_del && ( +
+ + +
+ )} + {!info.allow_search && } +
+ {!!info.hot_score && ( + hot score: {info.hot_score} )} - {!info.allow_search && } -
- {!!info.hot_score && ( - hot score: {info.hot_score} - )} -
- {do_react && ( -
- do_react(info.reaction_status === 1 ? 0 : 1)} - > - - - - -
{info.up_votes}
-
-
{info.down_votes}
- - do_react && do_react(info.reaction_status === -1 ? 0 : -1) + {info.poll && ( +
+ a.votes).join('_')} + question={''} + answers={info.poll.answers} + onVote={do_vote} + customStyles={{ theme: 'cyan' }} + noStorage={true} + vote={ + localStorage['VOTE_RECORD:' + info.pid] || info.poll.vote } - > - - - - + />
)} + {!!(attention && info.variant.latest_reply) && ( +

+ 最新回复{' '} +

+ )}
- {info.poll && ( -
- a.votes).join('_')} - question={''} - answers={info.poll.answers} - onVote={do_vote} - customStyles={{ theme: 'cyan' }} - noStorage={true} - vote={localStorage['VOTE_RECORD:' + info.pid] || info.poll.vote} - /> + {do_react && ( +
+ do_react(info.reaction_status === 1 ? 0 : 1)} + > + + + + +
{info.up_votes}
+
+
{info.down_votes}
+ + do_react && do_react(info.reaction_status === -1 ? 0 : -1) + } + > + + + +
)} - {!!(attention && info.variant.latest_reply) && ( -

- 最新回复

- )}
); diff --git a/src/infrastructure/widgets.css b/src/infrastructure/widgets.css index 3d66b1c..6ead413 100644 --- a/src/infrastructure/widgets.css +++ b/src/infrastructure/widgets.css @@ -317,6 +317,7 @@ a.app-switcher-item, .time-str { color: #999999; + display: inline-block; } a.button {