瀏覽代碼

fixed rebase of border management

Skylsmoi 6 年之前
父節點
當前提交
b7791d1813
共有 3 個文件被更改,包括 16 次插入14 次删除
  1. 1 1
      src/component/Workspace/FileItem.jsx
  2. 1 1
      src/container/Workspace.jsx
  3. 14 12
      src/css/Folder.styl

+ 1 - 1
src/component/Workspace/FileItem.jsx 查看文件

@@ -53,7 +53,7 @@ const FileItem = props => {
53 53
         </div>
54 54
       </div>
55 55
       <div className='col-2 col-sm-2 col-md-2 col-lg-2 col-xl-1'>
56
-        <div className='fileitem__rowfile__status'>
56
+        <div className='file__status'>
57 57
           <i className={iconStatus} />
58 58
         </div>
59 59
       </div>

+ 1 - 1
src/container/Workspace.jsx 查看文件

@@ -31,7 +31,7 @@ class Workspace extends React.Component {
31 31
 
32 32
         <PageContent parentClass='workspace__content'>
33 33
 
34
-          <div className='workspace__content__fileandfolder folder active'>
34
+          <div className='workspace__content__fileandfolder folder__content active'>
35 35
             <FileItemHeader />
36 36
 
37 37
             <FileItem

+ 14 - 12
src/css/Folder.styl 查看文件

@@ -1,14 +1,5 @@
1
-folderclose()
2
-  height 0
3
-  visibility hidden
4
-  opacity 0
5
-
6
-folderopen()
7
-  height 100%
8
-  opacity 1
9
-  visibility visible
10
-  transition opacity 1s
11
-
1
+// -----------------------------------------------------
2
+// border management for Workspace container
12 3
 border-style = 1px solid dark-blue
13 4
 .folder__header
14 5
   border border-style
@@ -19,6 +10,18 @@ border-style = 1px solid dark-blue
19 10
 .folder__content > .file, .folder__content > .folder
20 11
   border-bottom 0
21 12
 // @TODO the very last line of file or folder has to be added a border bottom in js
13
+// -----------------------------------------------------
14
+
15
+folderclose()
16
+  height 0
17
+  visibility hidden
18
+  opacity 0
19
+
20
+folderopen()
21
+  height 100%
22
+  opacity 1
23
+  visibility visible
24
+  transition opacity 1s
22 25
 
23 26
 .folder
24 27
   padding-left 30px
@@ -39,7 +42,6 @@ border-style = 1px solid dark-blue
39 42
       & > .file, > .folder
40 43
         folderopen()
41 44
 
42
-
43 45
   &__header
44 46
     position relative
45 47
     display flex