From 724a433b693611344fa685de39c4d1bb5ca8d686 Mon Sep 17 00:00:00 2001
From: crupest <crupest@outlook.com>
Date: Thu, 6 May 2021 15:32:02 +0800
Subject: ...

---
 FrontEnd/src/app/views/timeline-common/TimelinePageCardTemplate.tsx | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'FrontEnd/src/app/views/timeline-common/TimelinePageCardTemplate.tsx')

diff --git a/FrontEnd/src/app/views/timeline-common/TimelinePageCardTemplate.tsx b/FrontEnd/src/app/views/timeline-common/TimelinePageCardTemplate.tsx
index ad9b7ede..be0c536b 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 ? (
-- 
cgit v1.2.3


From d4ecfedd9b8fa203ec5461a758e83991823d2d1c Mon Sep 17 00:00:00 2001
From: crupest <crupest@outlook.com>
Date: Thu, 6 May 2021 15:44:09 +0800
Subject: ...

---
 FrontEnd/src/app/views/admin/UserAdmin.tsx                          | 2 +-
 FrontEnd/src/app/views/common/SearchInput.tsx                       | 2 +-
 FrontEnd/src/app/views/home/index.tsx                               | 2 +-
 FrontEnd/src/app/views/timeline-common/MarkdownPostEdit.tsx         | 4 ++--
 FrontEnd/src/app/views/timeline-common/TimelinePageCardTemplate.tsx | 2 +-
 FrontEnd/src/app/views/timeline-common/TimelinePostEdit.tsx         | 4 ++--
 FrontEnd/src/app/views/timeline-common/TimelinePostView.tsx         | 2 +-
 7 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'FrontEnd/src/app/views/timeline-common/TimelinePageCardTemplate.tsx')

diff --git a/FrontEnd/src/app/views/admin/UserAdmin.tsx b/FrontEnd/src/app/views/admin/UserAdmin.tsx
index 74b3503f..61140bb1 100644
--- a/FrontEnd/src/app/views/admin/UserAdmin.tsx
+++ b/FrontEnd/src/app/views/admin/UserAdmin.tsx
@@ -205,7 +205,7 @@ const UserItem: React.FC<UserItemProps> = ({ user, on }) => {
   return (
     <ListGroup.Item className="admin-user-item">
       <i
-        className="bi-pencil-square float-right icon-button text-warning"
+        className="bi-pencil-square float-end icon-button text-warning"
         onClick={() => setEditMaskVisible(true)}
       />
       <h4 className="text-primary">{user.username}</h4>
diff --git a/FrontEnd/src/app/views/common/SearchInput.tsx b/FrontEnd/src/app/views/common/SearchInput.tsx
index 63fa02c9..c2234cb9 100644
--- a/FrontEnd/src/app/views/common/SearchInput.tsx
+++ b/FrontEnd/src/app/views/common/SearchInput.tsx
@@ -39,8 +39,8 @@ const SearchInput: React.FC<SearchInputProps> = (props) => {
 
   return (
     <Form
-      inline
       className={classnames(
+        "d-flex",
         alwaysOneline ? "flex-nowrap" : "flex-sm-nowrap",
         props.className
       )}
diff --git a/FrontEnd/src/app/views/home/index.tsx b/FrontEnd/src/app/views/home/index.tsx
index 519d59f8..0eca23ee 100644
--- a/FrontEnd/src/app/views/home/index.tsx
+++ b/FrontEnd/src/app/views/home/index.tsx
@@ -54,7 +54,7 @@ const HomeV2: React.FC = () => {
   return (
     <>
       <SearchInput
-        className="mx-2 my-3 float-sm-right"
+        className="mx-2 my-3 float-sm-end"
         value={navText}
         onChange={setNavText}
         onButtonClick={() => {
diff --git a/FrontEnd/src/app/views/timeline-common/MarkdownPostEdit.tsx b/FrontEnd/src/app/views/timeline-common/MarkdownPostEdit.tsx
index d81d18b7..2e569b7c 100644
--- a/FrontEnd/src/app/views/timeline-common/MarkdownPostEdit.tsx
+++ b/FrontEnd/src/app/views/timeline-common/MarkdownPostEdit.tsx
@@ -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 be0c536b..d8ad04af 100644
--- a/FrontEnd/src/app/views/timeline-common/TimelinePageCardTemplate.tsx
+++ b/FrontEnd/src/app/views/timeline-common/TimelinePageCardTemplate.tsx
@@ -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 e9c75de7..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();
-- 
cgit v1.2.3

