Browse Source

test border 1px; border-top 0

Skylsmoi 7 years ago
parent
commit
ebeeeb8b3d

+ 8 - 8
src/component/Workspace/FileItem.jsx View File

28
   })()
28
   })()
29
 
29
 
30
   return (
30
   return (
31
-    <div className={classnames('fileitem__rowfile', 'align-items-center', props.customClass)} onClick={props.onClickItem}>
31
+    <div className={classnames('file', 'align-items-center', props.customClass)} onClick={props.onClickItem}>
32
       <div className='col-2 col-sm-2 col-md-2 col-lg-2 col-xl-1'>
32
       <div className='col-2 col-sm-2 col-md-2 col-lg-2 col-xl-1'>
33
-        <div className='fileitem__rowfile__type'>
33
+        <div className='file__type'>
34
           <i className={iconType} />
34
           <i className={iconType} />
35
         </div>
35
         </div>
36
       </div>
36
       </div>
37
       <div className='col-8 col-sm-8 col-md-8 col-lg-8 col-xl-10'>
37
       <div className='col-8 col-sm-8 col-md-8 col-lg-8 col-xl-10'>
38
-        <div className='fileitem__rowfile__name'>
39
-          <div className='fileitem__rowfile__name__text'>
38
+        <div className='file__name'>
39
+          <div className='file__name__text'>
40
             { props.name }
40
             { props.name }
41
           </div>
41
           </div>
42
-          <div className='fileitem__rowfile__name__icons d-none d-md-flex'>
43
-            <div className='fileitem__rowfile__name__icons__download'>
42
+          <div className='file__name__icons d-none d-md-flex'>
43
+            <div className='file__name__icons__download'>
44
               <i className='fa fa-download' />
44
               <i className='fa fa-download' />
45
             </div>
45
             </div>
46
-            <div className='fileitem__rowfile__name__icons__archive'>
46
+            <div className='file__name__icons__archive'>
47
               <i className='fa fa-archive' />
47
               <i className='fa fa-archive' />
48
             </div>
48
             </div>
49
-            <div className='fileitem__rowfile__name__icons__delete'>
49
+            <div className='file__name__icons__delete'>
50
               <i className='fa fa-trash-o' />
50
               <i className='fa fa-trash-o' />
51
             </div>
51
             </div>
52
           </div>
52
           </div>

+ 4 - 4
src/component/Workspace/FileItemHeader.jsx View File

2
 
2
 
3
 const FileItemHeader = props => {
3
 const FileItemHeader = props => {
4
   return (
4
   return (
5
-    <div className='fileitem__header'>
5
+    <div className='file__header'>
6
       <div className='col-2 col-sm-2 col-md-2 col-lg-2 col-xl-1'>
6
       <div className='col-2 col-sm-2 col-md-2 col-lg-2 col-xl-1'>
7
-        <div className='fileitem__header__type'>
7
+        <div className='file__header__type'>
8
           Type
8
           Type
9
         </div>
9
         </div>
10
       </div>
10
       </div>
11
       <div className='col-8 col-sm-8 col-md-8 col-lg-8 col-xl-10'>
11
       <div className='col-8 col-sm-8 col-md-8 col-lg-8 col-xl-10'>
12
-        <div className='fileitem__header__name'>
12
+        <div className='file__header__name'>
13
           Nom du document ou fichier
13
           Nom du document ou fichier
14
         </div>
14
         </div>
15
       </div>
15
       </div>
16
       <div className='col-2 col-sm-2 col-md-2 col-lg-2 col-xl-1'>
16
       <div className='col-2 col-sm-2 col-md-2 col-lg-2 col-xl-1'>
17
-        <div className='fileitem__header__status'>
17
+        <div className='file__header__status'>
18
           Statut
18
           Statut
19
         </div>
19
         </div>
20
       </div>
20
       </div>

+ 4 - 1
src/component/Workspace/Folder.jsx View File

50
             </div>
50
             </div>
51
           </div>
51
           </div>
52
         </div>
52
         </div>
53
-        { this.props.children }
53
+
54
+        <div className='folder__content'>
55
+          { this.props.children }
56
+        </div>
54
       </div>
57
       </div>
55
     )
58
     )
56
   }
59
   }

+ 1 - 1
src/container/Chat.jsx View File

1
 import React, { Component } from 'react'
1
 import React, { Component } from 'react'
2
 import classnames from 'classnames'
2
 import classnames from 'classnames'
3
-import imgProfil from '../img/img_profil.png'
3
+import imgProfil from '../img/imgProfil.png'
4
 
4
 
5
 class Chat extends Component {
5
 class Chat extends Component {
6
   render () {
6
   render () {

+ 13 - 11
src/container/Workspace.jsx View File

31
 
31
 
32
         <PageContent parentClass='workspace__content'>
32
         <PageContent parentClass='workspace__content'>
33
 
33
 
34
-          <div className='workspace__content__fileandfolder'>
34
+          <div className='workspace__content__fileandfolder folder active'>
35
             <FileItemHeader />
35
             <FileItemHeader />
36
 
36
 
37
             <FileItem
37
             <FileItem
54
             />
54
             />
55
 
55
 
56
             <Folder>
56
             <Folder>
57
-              <FileItem type='file' name='Facture 57839 - Société ABC - 01/09/2017' status='current' customClass='inFolder' />
58
-              <FileItem type='file' name='Facture 57839 - Société ABC - 01/09/2017' status='current' customClass='inFolder' />
59
-              <FileItem type='task' name='Editer la facture pour Phillipe GIRARD' status='check' customClass='inFolder' />
57
+              <FileItem type='file' name='Facture 57839 - Société ABC - 01/09/2017' status='current' />
58
+              <FileItem type='file' name='Facture 57839 - Société ABC - 01/09/2017' status='current' />
59
+              <FileItem type='task' name='Editer la facture pour Phillipe GIRARD' status='check' />
60
 
60
 
61
               <Folder>
61
               <Folder>
62
-                <FileItem type='chat' name='Discussions à propos du nouveau système de facturation' status='nouse' customClass='inFolder' />
63
-                <FileItem type='file' name='Facture 57537 - Claudia Martin - 14/08/2017' status='check' customClass='inFolder' />
62
+                <FileItem type='chat' name='Discussions à propos du nouveau système de facturation' status='nouse' />
63
+                <FileItem type='file' name='Facture 57537 - Claudia Martin - 14/08/2017' status='check' />
64
               </Folder>
64
               </Folder>
65
-              <FileItem name='Facture 57841 - Pierre Maurice - 06/06/2017' type='file' status='current' customClass='inFolder' />
66
-              <FileItem type='file' name='Facture 57840 - Jean-michel Chevalier - 04/09/2017' status='check' customClass='inFolder' />
67
-              <FileItem name='Facture 57841 - Pierre Maurice - 06/06/2017' type='file' status='current' customClass='inFolder' />
65
+
66
+              <FileItem name='Facture 57841 - Pierre Maurice - 06/06/2017' type='file' status='current' />
67
+              <FileItem type='file' name='Facture 57840 - Jean-michel Chevalier - 04/09/2017' status='check' />
68
+              <FileItem name='Facture 57841 - Pierre Maurice - 06/06/2017' type='file' status='current' />
69
+
68
               <Folder>
70
               <Folder>
69
-                <FileItem type='chat' name='Discussions à propos du nouveau système de facturation' status='nouse' customClass='inFolder' />
70
-                <FileItem type='file' name='Facture 57537 - Claudia Martin - 14/08/2017' status='check' customClass='inFolder' />
71
+                <FileItem type='chat' name='Discussions à propos du nouveau système de facturation' status='nouse' />
72
+                <FileItem type='file' name='Facture 57537 - Claudia Martin - 14/08/2017' status='check' />
71
               </Folder>
73
               </Folder>
72
             </Folder>
74
             </Folder>
73
           </div>
75
           </div>

+ 2 - 5
src/css/FileItem.styl View File

1
-.fileitem__rowfile
1
+.file
2
   display flex
2
   display flex
3
-  border 1px solid dark-blue
4
   border-bottom 0
3
   border-bottom 0
5
   &:hover
4
   &:hover
6
     background-color hover-files
5
     background-color hover-files
7
-  &:last-child
8
-    border-bottom 1px solid dark-blue
9
   &__type
6
   &__type
10
     font-size 30px
7
     font-size 30px
11
     text-align center
8
     text-align center
31
     text-align center
28
     text-align center
32
 
29
 
33
 @media (min-width: max-xs) and (max-width: max-lg)
30
 @media (min-width: max-xs) and (max-width: max-lg)
34
-  .fileitem__rowfile
31
+  .file
35
     border-right 1px solid grey
32
     border-right 1px solid grey
36
     &__name__icons
33
     &__name__icons
37
         margin-top 5px
34
         margin-top 5px

+ 1 - 1
src/css/FileItemHeader.styl View File

1
-.fileitem__header
1
+.file__header
2
   display flex
2
   display flex
3
   font-size 17px
3
   font-size 17px
4
   &__type
4
   &__type

+ 23 - 13
src/css/Folder.styl View File

10
   visibility visible
10
   visibility visible
11
   transition opacity 1s
11
   transition opacity 1s
12
 
12
 
13
+border-style = 1px solid dark-blue
14
+.folder__header
15
+  border border-style
16
+  border-top 0
17
+.file
18
+  border border-style
19
+  border-top 0
20
+.folder + .file
21
+  border-top border-style
22
+.folder:last-child > .folder__header
23
+  border-bottom border-style
24
+.folder:not(:last-child) > .folder__header
25
+  border-bottom border-style
26
+
13
 .folder
27
 .folder
14
   padding-left 30px
28
   padding-left 30px
15
-  &:last-child
16
-    border-bottom 1px solid dark-blue
17
-  & > .inFolder
18
-    folderclose()
19
-  & > .folder
29
+  & > .folder__header
30
+    folderopen()
31
+  & > .folder__content
20
     folderclose()
32
     folderclose()
33
+    //& > .fileitem__rowfile, > .folder__header
34
+    //  folderclose()
21
   &.active
35
   &.active
22
-    & > .inFolder
23
-      border 1px solid dark-blue
24
-      border-bottom 0
25
-      folderopen()
26
-    & > .folder
27
-      folderopen()
28
     & > .folder__header
36
     & > .folder__header
29
       .folder__header__triangleborder
37
       .folder__header__triangleborder
30
         display block
38
         display block
31
         &__triangle
39
         &__triangle
32
           display block
40
           display block
41
+    & > .folder__content
42
+      folderopen()
43
+
33
 
44
 
34
   &__header
45
   &__header
35
     position relative
46
     position relative
36
     display flex
47
     display flex
37
     justify-content space-between
48
     justify-content space-between
38
     margin-left -30px
49
     margin-left -30px
39
-    border 1px solid dark-blue
40
     border-bottom 0
50
     border-bottom 0
41
     background-color light-grey
51
     background-color light-grey
42
     cursor pointer
52
     cursor pointer
47
     &__triangleborder
57
     &__triangleborder
48
       display none
58
       display none
49
       position absolute
59
       position absolute
50
-      top 61px
60
+      top 62px
51
       left -1px
61
       left -1px
52
       border-style solid
62
       border-style solid
53
       border-width 25px 30px 0 30px
63
       border-width 25px 30px 0 30px