Просмотр исходного кода

Adjusted nav-title padding.
- Removed modal body padding.
- The body part will be fixed in GW-3841.
Add border bottom to nav-title

oshikishintaro 5 лет назад
Родитель
Сommit
f3d546c8f6

+ 22 - 20
src/client/js/components/PageAccessoriesModal.jsx

@@ -147,26 +147,28 @@ const PageAccessoriesModal = (props) => {
             </NavItem>
           </Nav>
           <hr id="grw-nav-slide-hr" className="my-0"></hr>
-          <TabContent activeTab={activeTab}>
-
-            <TabPane tabId="pagelist">
-              {pageAccessoriesContainer.state.activeComponents.has('pagelist') && <PageList />}
-            </TabPane>
-            <TabPane tabId="timeline" className="p-4">
-              {pageAccessoriesContainer.state.activeComponents.has('timeline') && <PageTimeline /> }
-            </TabPane>
-            <TabPane tabId="page-history">
-              <div className="overflow-auto">
-                {pageAccessoriesContainer.state.activeComponents.has('page-history') && <PageHistory /> }
-              </div>
-            </TabPane>
-            <TabPane tabId="attachment" className="p-4">
-              {pageAccessoriesContainer.state.activeComponents.has('attachment') && <PageAttachment />}
-            </TabPane>
-            <TabPane tabId="share-link" className="p-4">
-              {pageAccessoriesContainer.state.activeComponents.has('share-link') && <ShareLink />}
-            </TabPane>
-          </TabContent>
+          <div className="page-list-container-create">
+            <TabContent activeTab={activeTab}>
+
+              <TabPane tabId="pagelist">
+                {pageAccessoriesContainer.state.activeComponents.has('pagelist') && <PageList />}
+              </TabPane>
+              <TabPane tabId="timeline" className="p-4">
+                {pageAccessoriesContainer.state.activeComponents.has('timeline') && <PageTimeline /> }
+              </TabPane>
+              <TabPane tabId="page-history">
+                <div className="overflow-auto">
+                  {pageAccessoriesContainer.state.activeComponents.has('page-history') && <PageHistory /> }
+                </div>
+              </TabPane>
+              <TabPane tabId="attachment" className="p-4">
+                {pageAccessoriesContainer.state.activeComponents.has('attachment') && <PageAttachment />}
+              </TabPane>
+              <TabPane tabId="share-link" className="p-4">
+                {pageAccessoriesContainer.state.activeComponents.has('share-link') && <ShareLink />}
+              </TabPane>
+            </TabContent>
+          </div>
         </ModalBody>
       </Modal>
     </React.Fragment>

+ 1 - 0
src/client/styles/scss/_layout_growi.scss

@@ -41,6 +41,7 @@
     }
 
     #grw-nav-slide-hr {
+      border-top: 0rem;
       transition: 0.3s ease-in-out;
     }
   }

+ 5 - 1
src/client/styles/scss/theme/_apply-colors.scss

@@ -287,8 +287,12 @@ pre:not(.hljs):not(.CodeMirror-line) {
   .nav-link svg {
     fill: $color-link;
   }
+  .page-list-container-create {
+    border-top: 1px solid $bordercolor-nav-tabs;
+  }
+
   #grw-nav-slide-hr {
-    border-bottom: 2px solid $color-link;
+    border-bottom: 3px solid $color-link;
   }
 }