浏览代码

fixed rebase of border management

Skylsmoi 7 年前
父节点
当前提交
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
         </div>
53
         </div>
54
       </div>
54
       </div>
55
       <div className='col-2 col-sm-2 col-md-2 col-lg-2 col-xl-1'>
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
           <i className={iconStatus} />
57
           <i className={iconStatus} />
58
         </div>
58
         </div>
59
       </div>
59
       </div>

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

31
 
31
 
32
         <PageContent parentClass='workspace__content'>
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
             <FileItemHeader />
35
             <FileItemHeader />
36
 
36
 
37
             <FileItem
37
             <FileItem

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

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
 border-style = 1px solid dark-blue
3
 border-style = 1px solid dark-blue
13
 .folder__header
4
 .folder__header
14
   border border-style
5
   border border-style
19
 .folder__content > .file, .folder__content > .folder
10
 .folder__content > .file, .folder__content > .folder
20
   border-bottom 0
11
   border-bottom 0
21
 // @TODO the very last line of file or folder has to be added a border bottom in js
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
 .folder
26
 .folder
24
   padding-left 30px
27
   padding-left 30px
39
       & > .file, > .folder
42
       & > .file, > .folder
40
         folderopen()
43
         folderopen()
41
 
44
 
42
-
43
   &__header
45
   &__header
44
     position relative
46
     position relative
45
     display flex
47
     display flex