reiji-h 2 лет назад
Родитель
Сommit
974c6e80bc

+ 1 - 2
apps/app/src/components/SearchPage.tsx

@@ -179,11 +179,10 @@ export const SearchPage = (): JSX.Element => {
           >
           >
             <button
             <button
               type="button"
               type="button"
-              className="btn btn-outline-danger text-nowrap border-0 px-2 py-1"
+              className="btn"
               disabled={isDisabled}
               disabled={isDisabled}
               onClick={deleteAllButtonClickedHandler}
               onClick={deleteAllButtonClickedHandler}
             >
             >
-              <span className="material-symbols-outlined">delete</span>
               {t('search_result.delete_all_selected_page')}
               {t('search_result.delete_all_selected_page')}
             </button>
             </button>
           </OperateAllControl>
           </OperateAllControl>

+ 1 - 1
apps/app/src/components/SearchPage/OperateAllControl.tsx

@@ -57,7 +57,7 @@ const OperateAllControlSubstance: ForwardRefRenderFunction<ISelectableAndIndeter
         type="checkbox"
         type="checkbox"
         id="cb-check-all"
         id="cb-check-all"
         data-testid="cb-select-all"
         data-testid="cb-select-all"
-        className="me-2"
+        className="ms-2 me-1"
         innerRef={selectAllCheckboxElm}
         innerRef={selectAllCheckboxElm}
         disabled={isCheckboxDisabled}
         disabled={isCheckboxDisabled}
         onChange={checkboxChangedHandler}
         onChange={checkboxChangedHandler}

+ 16 - 17
apps/app/src/components/SearchPage/SearchControl.tsx

@@ -93,26 +93,12 @@ const SearchControl = React.memo((props: Props): JSX.Element => {
             onSubmit={searchFormSubmittedHandler}
             onSubmit={searchFormSubmittedHandler}
           />
           />
         </div>
         </div>
-
-        {/* sort option: show when screen is larger than lg */}
-        {isEnableSort && (
-          <div className="me-4 d-lg-flex d-none">
-            <SortControl
-              sort={sort}
-              order={order}
-              onChange={changeSortHandler}
-            />
-          </div>
-        )}
       </div>
       </div>
       {/* TODO: replace the following elements deleteAll button , relevance button and include specificPath button component */}
       {/* TODO: replace the following elements deleteAll button , relevance button and include specificPath button component */}
       <div className="search-control d-flex align-items-center py-md-2 py-3 px-md-4 px-3 border-bottom border-gray">
       <div className="search-control d-flex align-items-center py-md-2 py-3 px-md-4 px-3 border-bottom border-gray">
-        <div className="d-flex">
-          {allControl}
-        </div>
-        {/* sort option: show when screen is smaller than lg */}
+        {/* sort option */}
         {isEnableSort && (
         {isEnableSort && (
-          <div className="me-md-4 me-2 d-flex d-lg-none ms-auto">
+          <div className="d-flex me-auto">
             <SortControl
             <SortControl
               sort={sort}
               sort={sort}
               order={order}
               order={order}
@@ -129,7 +115,9 @@ const SearchControl = React.memo((props: Props): JSX.Element => {
                 className="btn"
                 className="btn"
                 onClick={() => setIsFileterOptionModalShown(true)}
                 onClick={() => setIsFileterOptionModalShown(true)}
               >
               >
-                <i className="icon-equalizer"></i>
+                <span className="material-symbols-outlined">
+                  tune
+                </span>
               </button>
               </button>
             </div>
             </div>
             <div className="d-none d-lg-flex align-items-center ms-auto search-control-include-options">
             <div className="d-none d-lg-flex align-items-center ms-auto search-control-include-options">
@@ -170,6 +158,17 @@ const SearchControl = React.memo((props: Props): JSX.Element => {
             </div>
             </div>
           </>
           </>
         )}
         )}
+        <div className="d-flex">
+          <div className="btn-group">
+            <button className="btn rounded" type="button" data-bs-toggle="dropdown" aria-expanded="false">
+              <span className="material-symbols-outlined text-secondary">delete</span>
+              <span className="material-symbols-outlined text-secondary">expand_more</span>
+            </button>
+            <ul className="dropdown-menu">
+              {allControl}
+            </ul>
+          </div>
+        </div>
       </div>
       </div>
 
 
       <SearchOptionModal
       <SearchOptionModal