Shun Miyazawa 3 лет назад
Родитель
Сommit
78b714634d

+ 1 - 1
packages/app/src/components/Admin/AuditLog/DateRangePicker.tsx

@@ -50,7 +50,7 @@ export const DateRangePicker: FC<DateRangePickerProps> = (props: DateRangePicker
   }, []);
 
   return (
-    <div className="btn-group mr-2 mb-3">
+    <div className="btn-group mr-2">
       <DatePicker
         selectsRange
         startDate={startDate}

+ 1 - 1
packages/app/src/components/Admin/AuditLog/SelectActionDropdown.tsx

@@ -27,7 +27,7 @@ export const SelectActionDropdown: FC<Props> = (props: Props) => {
   }, [onChangeMultipleAction]);
 
   return (
-    <div className="btn-group mr-2 mb-3">
+    <div className="btn-group mr-2">
       <button className="btn btn-outline-secondary dropdown-toggle" type="button" id="dropdownMenuButton" data-toggle="dropdown">
         <i className="fa fa-fw fa-bolt" />Action
       </button>

+ 19 - 17
packages/app/src/components/Admin/AuditLogManagement.tsx

@@ -83,23 +83,25 @@ export const AuditLogManagement: FC = () => {
     <div data-testid="admin-auditlog">
       <h2 className="admin-setting-header mb-3">{t('AuditLog')}</h2>
 
-      <SearchUsernameInput />
-
-      <DateRangePicker
-        startDate={startDate}
-        endDate={endDate}
-        onChangeDatePicker={datePickerChangedHandler}
-      />
-
-      <SelectActionDropdown
-        dropdownItems={[
-          { actionCategory: 'Page', actionNames: PageActions },
-          { actionCategory: 'Comment', actionNames: CommentActions },
-        ]}
-        actionMap={actionMap}
-        onChangeAction={actionCheckboxChangedHandler}
-        onChangeMultipleAction={multipleActionCheckboxChangedHandler}
-      />
+      <div className="form-inline mb-3">
+        <SearchUsernameInput />
+
+        <DateRangePicker
+          startDate={startDate}
+          endDate={endDate}
+          onChangeDatePicker={datePickerChangedHandler}
+        />
+
+        <SelectActionDropdown
+          dropdownItems={[
+            { actionCategory: 'Page', actionNames: PageActions },
+            { actionCategory: 'Comment', actionNames: CommentActions },
+          ]}
+          actionMap={actionMap}
+          onChangeAction={actionCheckboxChangedHandler}
+          onChangeMultipleAction={multipleActionCheckboxChangedHandler}
+        />
+      </div>
 
       { isLoading
         ? (