Sfoglia il codice sorgente

Merge pull request #4702 from weseek/feat/80324-81762-replace-grid-with-flex

81762 replace grid with flex
Yuki Takei 4 anni fa
parent
commit
e31a4c5c2e

+ 3 - 3
packages/app/src/components/SearchPage/SearchPageLayout.tsx

@@ -23,8 +23,8 @@ const SearchPageLayout: FC<Props> = (props: Props) => {
 
   return (
     <div className="content-main">
-      <div className="search-result row" id="search-result">
-        <div className="col-lg-6  page-list border boder-gray search-result-list px-0" id="search-result-list">
+      <div className="search-result d-flex" id="search-result">
+        <div className="flex-grow-1 flex-basis-0 page-list border boder-gray search-result-list" id="search-result-list">
 
           <nav><SearchControl></SearchControl></nav>
           <div className="d-flex align-items-start justify-content-between mt-1">
@@ -40,7 +40,7 @@ const SearchPageLayout: FC<Props> = (props: Props) => {
             <ul className="page-list-ul page-list-ul-flat nav nav-pills"><SearchResultList></SearchResultList></ul>
           </div>
         </div>
-        <div className="col-lg-6 d-none d-lg-block search-result-content">
+        <div className="flex-grow-1 flex-basis-0 d-none d-lg-block search-result-content">
           <SearchResultContent></SearchResultContent>
         </div>
       </div>

+ 2 - 7
packages/app/src/server/views/search.html

@@ -14,13 +14,8 @@
 {% block layout_main %}
 <div id="grw-fav-sticky-trigger" class="sticky-top"></div>
 
-<div class="container-fluid">
-
-  <div class="row">
-    <div id="main" class="main col-lg-12 search-page mt-0">
-      <div class="" id="search-page"></div>
-    </div>
+  <div id="main" class="main search-page mt-0">
+    <div id="search-page"></div>
   </div>
 
-</div><!-- /.container-fluid -->
 {% endblock %} {# layout_main #}