aboutsummaryrefslogtreecommitdiff
path: root/FrontEnd/src/app/views/timeline-common
diff options
context:
space:
mode:
Diffstat (limited to 'FrontEnd/src/app/views/timeline-common')
-rw-r--r--FrontEnd/src/app/views/timeline-common/MarkdownPostEdit.tsx6
-rw-r--r--FrontEnd/src/app/views/timeline-common/TimelinePageCardTemplate.tsx8
-rw-r--r--FrontEnd/src/app/views/timeline-common/TimelinePostEdit.tsx4
-rw-r--r--FrontEnd/src/app/views/timeline-common/TimelinePostView.tsx8
4 files changed, 13 insertions, 13 deletions
diff --git a/FrontEnd/src/app/views/timeline-common/MarkdownPostEdit.tsx b/FrontEnd/src/app/views/timeline-common/MarkdownPostEdit.tsx
index f293bb21..2e569b7c 100644
--- a/FrontEnd/src/app/views/timeline-common/MarkdownPostEdit.tsx
+++ b/FrontEnd/src/app/views/timeline-common/MarkdownPostEdit.tsx
@@ -108,7 +108,7 @@ const MarkdownPostEdit: React.FC<MarkdownPostEditProps> = ({
) : (
<>
<FlatButton
- className="mr-2"
+ className="me-2"
variant="danger"
onClick={() => {
if (canLeave) {
@@ -166,8 +166,8 @@ const MarkdownPostEdit: React.FC<MarkdownPostEditProps> = ({
/>
</div>
))}
- <Form.File
- label={t("chooseImage")}
+ <Form.Control
+ type="file"
accept="image/jpeg,image/jpg,image/png,image/gif,image/webp"
onChange={(event: React.ChangeEvent<HTMLInputElement>) => {
const { files } = event.currentTarget;
diff --git a/FrontEnd/src/app/views/timeline-common/TimelinePageCardTemplate.tsx b/FrontEnd/src/app/views/timeline-common/TimelinePageCardTemplate.tsx
index ad9b7ede..d8ad04af 100644
--- a/FrontEnd/src/app/views/timeline-common/TimelinePageCardTemplate.tsx
+++ b/FrontEnd/src/app/views/timeline-common/TimelinePageCardTemplate.tsx
@@ -54,7 +54,7 @@ const TimelinePageCardTemplate: React.FC<TimelineCardTemplateProps> = ({
<i
className={classnames(
timeline.isHighlight ? "bi-star-fill" : "bi-star",
- "icon-button text-yellow mr-3"
+ "icon-button text-yellow me-3"
)}
onClick={
user?.hasHighlightTimelineAdministrationPermission
@@ -77,7 +77,7 @@ const TimelinePageCardTemplate: React.FC<TimelineCardTemplateProps> = ({
<i
className={classnames(
timeline.isBookmark ? "bi-bookmark-fill" : "bi-bookmark",
- "icon-button text-yellow mr-3"
+ "icon-button text-yellow me-3"
)}
onClick={() => {
getHttpBookmarkClient()
@@ -94,7 +94,7 @@ const TimelinePageCardTemplate: React.FC<TimelineCardTemplateProps> = ({
/>
) : null}
<i
- className={"icon-button bi-people text-primary mr-3"}
+ className={"icon-button bi-people text-primary me-3"}
onClick={() => setDialog("member")}
/>
{manageItems != null ? (
@@ -112,7 +112,7 @@ const TimelinePageCardTemplate: React.FC<TimelineCardTemplateProps> = ({
className={classnames("cru-card p-2 clearfix", className)}
style={{ zIndex: collapse ? 1029 : 1031 }}
>
- <div className="float-right d-flex align-items-center">
+ <div className="float-end d-flex align-items-center">
<CollapseButton collapse={collapse} onClick={toggleCollapse} />
</div>
{isSmallScreen ? (
diff --git a/FrontEnd/src/app/views/timeline-common/TimelinePostEdit.tsx b/FrontEnd/src/app/views/timeline-common/TimelinePostEdit.tsx
index db2dc23d..5c379a9a 100644
--- a/FrontEnd/src/app/views/timeline-common/TimelinePostEdit.tsx
+++ b/FrontEnd/src/app/views/timeline-common/TimelinePostEdit.tsx
@@ -77,8 +77,8 @@ const TimelinePostEditImage: React.FC<TimelinePostEditImageProps> = (props) => {
return (
<>
- <Form.File
- label={t("chooseImage")}
+ <Form.Control
+ type="file"
onChange={onInputChange}
accept="image/*"
disabled={disabled}
diff --git a/FrontEnd/src/app/views/timeline-common/TimelinePostView.tsx b/FrontEnd/src/app/views/timeline-common/TimelinePostView.tsx
index 295ee3b9..6bd6ea98 100644
--- a/FrontEnd/src/app/views/timeline-common/TimelinePostView.tsx
+++ b/FrontEnd/src/app/views/timeline-common/TimelinePostView.tsx
@@ -55,7 +55,7 @@ const TimelinePostView: React.FC<TimelinePostViewProps> = (props) => {
<div ref={cardRef} className="timeline-item-card" style={cardStyle}>
{post.editable ? (
<i
- className="bi-chevron-down text-info icon-button float-right"
+ className="bi-chevron-down text-info icon-button float-end"
onClick={(e) => {
setOperationMaskVisible(true);
e.stopPropagation();
@@ -63,15 +63,15 @@ const TimelinePostView: React.FC<TimelinePostViewProps> = (props) => {
/>
) : null}
<div className="timeline-item-header">
- <span className="mr-2">
+ <span className="me-2">
<span>
<Link to={"/users/" + props.post.author.username}>
<UserAvatar
username={post.author.username}
- className="timeline-avatar mr-1"
+ className="timeline-avatar me-1"
/>
</Link>
- <small className="text-dark mr-2">{post.author.nickname}</small>
+ <small className="text-dark me-2">{post.author.nickname}</small>
<small className="text-secondary white-space-no-wrap">
{new Date(post.time).toLocaleTimeString()}
</small>