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

Merge pull request #2835 from weseek/fix/delete-dot-in-pageAttachmentModal

delete li add div
Yuki Takei 5 лет назад
Родитель
Сommit
5510cc0cf7

+ 7 - 11
src/client/js/components/PageAttachment/Attachment.jsx

@@ -54,20 +54,16 @@ export default class Attachment extends React.Component {
       : '';
       : '';
 
 
     return (
     return (
-      <li className="attachment">
+      <div className="attachment mb-2">
         <span className="mr-1 attachment-userpicture">
         <span className="mr-1 attachment-userpicture">
           <UserPicture user={attachment.creator} size="sm"></UserPicture>
           <UserPicture user={attachment.creator} size="sm"></UserPicture>
         </span>
         </span>
-
-        <a href={attachment.filePathProxied}><i className={formatIcon}></i> {attachment.originalName}</a>
-
-        {fileType}
-
-        {fileInUse}
-
-        {btnDownload}
-        {btnTrash}
-      </li>
+        <a className="mr-2" href={attachment.filePathProxied}><i className={formatIcon}></i> {attachment.originalName}</a>
+        <span className="mr-2">{fileType}</span>
+        <span className="mr-2">{fileInUse}</span>
+        <span className="mr-2">{btnDownload}</span>
+        <span className="mr-2">{btnTrash}</span>
+      </div>
     );
     );
   }
   }
 
 

+ 0 - 3
src/client/js/components/PageAttachment/PageAttachmentList.jsx

@@ -24,9 +24,6 @@ export default class PageAttachmentList extends React.Component {
 
 
     return (
     return (
       <div>
       <div>
-        {(attachmentList.length !== 0)
-          && <h5><strong>Attachments</strong></h5>
-        }
         <ul className="pl-2">
         <ul className="pl-2">
           {attachmentList}
           {attachmentList}
         </ul>
         </ul>

+ 12 - 0
src/client/styles/scss/theme/_apply-colors.scss

@@ -294,6 +294,16 @@ pre:not(.hljs):not(.CodeMirror-line) {
       color: $secondary;
       color: $secondary;
     }
     }
   }
   }
+
+  .modal-title {
+    position: relative;
+  }
+
+  .nav-link {
+    &:hover {
+      background-color: rgba($link-color, 0.08);
+    }
+  }
   .nav-link svg {
   .nav-link svg {
     fill: $color-link;
     fill: $color-link;
   }
   }
@@ -302,6 +312,8 @@ pre:not(.hljs):not(.CodeMirror-line) {
   }
   }
 
 
   .grw-nav-slide-hr {
   .grw-nav-slide-hr {
+    position: absolute;
+    bottom: 0px;
     border-color: $color-link;
     border-color: $color-link;
   }
   }
 }
 }