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

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

@@ -179,7 +179,7 @@ export const SearchPage = (): JSX.Element => {
           >
             <button
               type="button"
-              className="btn"
+              className="btn border-0 text-danger"
               disabled={isDisabled}
               onClick={deleteAllButtonClickedHandler}
             >

+ 9 - 0
apps/app/src/components/SearchPage/SearchControl.module.scss

@@ -0,0 +1,9 @@
+
+@use '@growi/core/scss/bootstrap/init' as bs;
+
+@use '@growi/ui/scss/atoms/btn-muted';
+
+// == Colors
+.btn-delete {
+  @include btn-muted.colorize(bs.$red);
+}

+ 5 - 3
apps/app/src/components/SearchPage/SearchControl.tsx

@@ -12,6 +12,8 @@ import SearchForm from '../SearchForm';
 import SearchOptionModal from './SearchOptionModal';
 import SortControl from './SortControl';
 
+import styles from './SearchControl.module.scss';
+
 type Props = {
   isSearchServiceReachable: boolean,
   isEnableSort: boolean,
@@ -160,9 +162,9 @@ const SearchControl = React.memo((props: Props): JSX.Element => {
         )}
         <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 className={`btn btn-sm rounded ${styles['btn-delete']}`} type="button" data-bs-toggle="dropdown" aria-expanded="false">
+              <span className="material-symbols-outlined ">delete</span>
+              <span className="material-symbols-outlined ">expand_more</span>
             </button>
             <ul className="dropdown-menu">
               {allControl}

+ 8 - 17
apps/app/src/components/SearchPage/SortControl.tsx

@@ -25,26 +25,17 @@ const SortControl: FC <Props> = (props: Props) => {
     }
   };
 
-  const renderOrderIcon = () => {
-    const iconClassName = ASC === order ? 'fa fa-sort-amount-asc' : 'fa fa-sort-amount-desc';
-    return <i className={iconClassName} aria-hidden="true" />;
-  };
 
   return (
     <>
-      <div className="input-group flex-nowrap">
-        <div className="input-group-text text-muted border rounded-start" id="btnGroupAddon">
-          {renderOrderIcon()}
-        </div>
-        <div className="border rounded-end">
-          <button
-            type="button"
-            className="btn dropdown-toggle py-1"
-            data-bs-toggle="dropdown"
-          >
-            <span className="me-2 text-secondary">{t(`search_result.sort_axis.${sort}`)}</span>
+      <div className="d-flex">
+        <div className="btn-group">
+          <button className="d-flex btn btn-sm btn-outline-neutral-secondary rounded-pill" type="button" data-bs-toggle="dropdown" aria-expanded="false">
+            <span className="material-symbols-outlined text-secondary">sort</span>
+            <span className="ms-2 me-6 text-secondary">{t(`search_result.sort_axis.${sort}`)}</span>
+            <span className="material-symbols-outlined text-secondary">expand_more</span>
           </button>
-          <div className="dropdown-menu dropdown-menu-right">
+          <ul className="dropdown-menu">
             {Object.values(SORT_AXIS).map((sortAxis) => {
               const nextOrder = (sort !== sortAxis || order === ASC) ? DESC : ASC;
               return (
@@ -58,7 +49,7 @@ const SortControl: FC <Props> = (props: Props) => {
                 </button>
               );
             })}
-          </div>
+          </ul>
         </div>
       </div>
     </>