Browse Source

Refactor color

AlexiCauvin 7 years ago
parent
commit
a4cf76784c

+ 24 - 0
jsonserver/static_db.json View File

25
         "status": "current"
25
         "status": "current"
26
       },
26
       },
27
       {
27
       {
28
+        "id": 6,
29
+        "title": "La prommation fonctionnelle est-elle vraiment utile ?",
30
+        "type": "file",
31
+        "status": "current"
32
+      },
33
+      {
34
+        "id": 10,
35
+        "title": "La prommation fonctionnelle est-elle vraiment utile ?",
36
+        "type": "pageMarkdown",
37
+        "status": "current"
38
+      },
39
+      {
40
+        "id": 7,
41
+        "title": "La prommation fonctionnelle est-elle vraiment utile ?",
42
+        "type": "task",
43
+        "status": "current"
44
+      },
45
+      {
46
+        "id": 8,
47
+        "title": "La prommation fonctionnelle est-elle vraiment utile ?",
48
+        "type": "issue",
49
+        "status": "current"
50
+      },
51
+      {
28
         "id": 3,
52
         "id": 3,
29
         "title": "Programmation objet",
53
         "title": "Programmation objet",
30
         "type": "folder",
54
         "type": "folder",

+ 30 - 18
src/component/Sidebar/WorkspaceListItem.jsx View File

46
         id={`sidebarSubMenu_${props.number}`}
46
         id={`sidebarSubMenu_${props.number}`}
47
       >
47
       >
48
         <li className='sidebar__navigation__workspace__item__submenu__dropdown'>
48
         <li className='sidebar__navigation__workspace__item__submenu__dropdown'>
49
+
50
+          <div className='dropdown__icon'>
51
+            <i className='fa fa-th' />
52
+          </div>
53
+
49
           <div
54
           <div
50
             className='sidebar__navigation__workspace__item__submenu__dropdown__showdropdown dropdown-toggle'
55
             className='sidebar__navigation__workspace__item__submenu__dropdown__showdropdown dropdown-toggle'
51
             role='button'
56
             role='button'
53
             aria-haspopup='true'
58
             aria-haspopup='true'
54
             aria-expanded='false'
59
             aria-expanded='false'
55
           >
60
           >
56
-            <div className='dropdown__icon'>
57
-              <i className='fa fa-th' />
58
-            </div>
59
 
61
 
60
             <div className='dropdown__title' id='navbarDropdown'>
62
             <div className='dropdown__title' id='navbarDropdown'>
61
               <div className='dropdown__title__text'>
63
               <div className='dropdown__title__text'>
90
         </li>
92
         </li>
91
 
93
 
92
         <li className='sidebar__navigation__workspace__item__submenu__dropdown'>
94
         <li className='sidebar__navigation__workspace__item__submenu__dropdown'>
95
+
96
+          <div className='dropdown__icon'>
97
+            <i className='fa fa-signal dashboard-color' />
98
+          </div>
99
+
93
           <div
100
           <div
94
             className='sidebar__navigation__workspace__item__submenu__dropdown__showdropdown dropdown-toggle'
101
             className='sidebar__navigation__workspace__item__submenu__dropdown__showdropdown dropdown-toggle'
95
             role='button'
102
             role='button'
97
             aria-haspopup='true'
104
             aria-haspopup='true'
98
             aria-expanded='false'
105
             aria-expanded='false'
99
           >
106
           >
100
-            <div className='dropdown__icon'>
101
-              <i className='fa fa-signal dashboard-color' />
102
-            </div>
103
 
107
 
104
             <div className='dropdown__title' id='navbarDropdown'>
108
             <div className='dropdown__title' id='navbarDropdown'>
105
               <div className='dropdown__title__text'>
109
               <div className='dropdown__title__text'>
110
         </li>
114
         </li>
111
 
115
 
112
         <li className='sidebar__navigation__workspace__item__submenu__dropdown'>
116
         <li className='sidebar__navigation__workspace__item__submenu__dropdown'>
117
+
118
+          <div className='dropdown__icon'>
119
+            <i className='fa fa-list-ul task-color' />
120
+          </div>
121
+
113
           <div
122
           <div
114
             className='sidebar__navigation__workspace__item__submenu__dropdown__showdropdown dropdown-toggle'
123
             className='sidebar__navigation__workspace__item__submenu__dropdown__showdropdown dropdown-toggle'
115
             role='button'
124
             role='button'
117
             aria-haspopup='true'
126
             aria-haspopup='true'
118
             aria-expanded='false'
127
             aria-expanded='false'
119
           >
128
           >
120
-            <div className='dropdown__icon'>
121
-              <i className='fa fa-list-ul task-color' />
122
-            </div>
123
 
129
 
124
             <div className='dropdown__title' id='navbarDropdown'>
130
             <div className='dropdown__title' id='navbarDropdown'>
125
               <div className='dropdown__title__text'>
131
               <div className='dropdown__title__text'>
130
         </li>
136
         </li>
131
 
137
 
132
         <li className='sidebar__navigation__workspace__item__submenu__dropdown'>
138
         <li className='sidebar__navigation__workspace__item__submenu__dropdown'>
139
+
140
+          <div className='dropdown__icon'>
141
+            <i className='fa fa-folder-o docandfile-color' />
142
+          </div>
143
+
133
           <div
144
           <div
134
             className='sidebar__navigation__workspace__item__submenu__dropdown__showdropdown dropdown-toggle'
145
             className='sidebar__navigation__workspace__item__submenu__dropdown__showdropdown dropdown-toggle'
135
             role='button'
146
             role='button'
137
             aria-haspopup='true'
148
             aria-haspopup='true'
138
             aria-expanded='false'
149
             aria-expanded='false'
139
           >
150
           >
140
-            <div className='dropdown__icon'>
141
-              <i className='fa fa-folder-o docandfile-color' />
142
-            </div>
143
 
151
 
144
             <div className='dropdown__title' id='navbarDropdown'>
152
             <div className='dropdown__title' id='navbarDropdown'>
145
               <div className='dropdown__title__text'>
153
               <div className='dropdown__title__text'>
150
         </li>
158
         </li>
151
 
159
 
152
         <li className='sidebar__navigation__workspace__item__submenu__dropdown'>
160
         <li className='sidebar__navigation__workspace__item__submenu__dropdown'>
161
+
162
+          <div className='dropdown__icon'>
163
+            <i className='fa fa-comments talk-color' />
164
+          </div>
165
+
153
           <div
166
           <div
154
             className='sidebar__navigation__workspace__item__submenu__dropdown__showdropdown dropdown-toggle'
167
             className='sidebar__navigation__workspace__item__submenu__dropdown__showdropdown dropdown-toggle'
155
             role='button'
168
             role='button'
157
             aria-haspopup='true'
170
             aria-haspopup='true'
158
             aria-expanded='false'
171
             aria-expanded='false'
159
           >
172
           >
160
-            <div className='dropdown__icon'>
161
-              <i className='fa fa-comments talk-color' />
162
-            </div>
163
 
173
 
164
             <div className='dropdown__title' id='navbarDropdown'>
174
             <div className='dropdown__title' id='navbarDropdown'>
165
               <div className='dropdown__title__text'>
175
               <div className='dropdown__title__text'>
170
         </li>
180
         </li>
171
 
181
 
172
         <li className='sidebar__navigation__workspace__item__submenu__dropdown'>
182
         <li className='sidebar__navigation__workspace__item__submenu__dropdown'>
183
+
184
+          <div className='dropdown__icon'>
185
+            <i className='fa fa-calendar calendar-color' />
186
+          </div>
187
+
173
           <div
188
           <div
174
             className='sidebar__navigation__workspace__item__submenu__dropdown__showdropdown dropdown-toggle'
189
             className='sidebar__navigation__workspace__item__submenu__dropdown__showdropdown dropdown-toggle'
175
             role='button'
190
             role='button'
177
             aria-haspopup='true'
192
             aria-haspopup='true'
178
             aria-expanded='false'
193
             aria-expanded='false'
179
           >
194
           >
180
-            <div className='dropdown__icon'>
181
-              <i className='fa fa-calendar calendar-color' />
182
-            </div>
183
 
195
 
184
             <div className='dropdown__title' id='navbarDropdown'>
196
             <div className='dropdown__title' id='navbarDropdown'>
185
               <div className='dropdown__title__text'>
197
               <div className='dropdown__title__text'>

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

7
   const iconType = (() => {
7
   const iconType = (() => {
8
     switch (props.type) {
8
     switch (props.type) {
9
       case FILE_TYPE.PAGE_HTML:
9
       case FILE_TYPE.PAGE_HTML:
10
-        return 'fa fa-exclamation-triangle'
10
+        return 'fa fa-file-word-o'
11
       case FILE_TYPE.PAGE_MARKDOWN:
11
       case FILE_TYPE.PAGE_MARKDOWN:
12
-        return 'fa fa-exclamation-triangle'
12
+        return 'fa fa-file-code-o'
13
       case FILE_TYPE.FILE:
13
       case FILE_TYPE.FILE:
14
         return 'fa fa-file-text-o docandfile-color'
14
         return 'fa fa-file-text-o docandfile-color'
15
       case FILE_TYPE.THREAD:
15
       case FILE_TYPE.THREAD:
16
-        return 'fa fa-comments talk-color'
16
+        return 'fa fa-comments-o talk-color'
17
       case FILE_TYPE.TASK:
17
       case FILE_TYPE.TASK:
18
         return 'fa fa-list-ul task-color'
18
         return 'fa fa-list-ul task-color'
19
       case FILE_TYPE.ISSUE:
19
       case FILE_TYPE.ISSUE:
20
-        return 'fa fa-exclamation-triangle'
20
+        return 'fa fa-ticket'
21
     }
21
     }
22
   })()
22
   })()
23
 
23
 

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

11
       <PopinFixed customClass={'wsFileText'}>
11
       <PopinFixed customClass={'wsFileText'}>
12
         <PopinFixedHeader
12
         <PopinFixedHeader
13
           customClass='wsFileText'
13
           customClass='wsFileText'
14
-          icon='fa fa-file-text-o'
14
+          icon='fa fa-file-word-o'
15
           name='Facture 57840 - Jean-michel Chevalier - 04/09/2017'
15
           name='Facture 57840 - Jean-michel Chevalier - 04/09/2017'
16
         />
16
         />
17
 
17
 

+ 5 - 5
src/container/WorkspaceContent.jsx View File

3
 import Folder from '../component/Workspace/Folder.jsx'
3
 import Folder from '../component/Workspace/Folder.jsx'
4
 import FileItem from '../component/Workspace/FileItem.jsx'
4
 import FileItem from '../component/Workspace/FileItem.jsx'
5
 import FileItemHeader from '../component/Workspace/FileItemHeader.jsx'
5
 import FileItemHeader from '../component/Workspace/FileItemHeader.jsx'
6
-// import Thread from './Thread.jsx'
7
-import PageText from './PageText.jsx'
6
+import Thread from './Thread.jsx'
7
+// import PageText from './PageText.jsx'
8
 import PageWrapper from '../component/common/layout/PageWrapper.jsx'
8
 import PageWrapper from '../component/common/layout/PageWrapper.jsx'
9
 import PageTitle from '../component/common/layout/PageTitle.jsx'
9
 import PageTitle from '../component/common/layout/PageTitle.jsx'
10
 import PageContent from '../component/common/layout/PageContent.jsx'
10
 import PageContent from '../component/common/layout/PageContent.jsx'
47
                 name={c.title}
47
                 name={c.title}
48
                 type={c.type}
48
                 type={c.type}
49
                 status={c.status}
49
                 status={c.status}
50
-                onClickItem={() => this.setState({activeFileType: 'file'})}
50
+                onClickItem={() => this.setState({activeFileType: 'thread'})}
51
                 key={c.id}
51
                 key={c.id}
52
               />
52
               />
53
             )}
53
             )}
55
 
55
 
56
           <DropdownCreateButton customClass='workspace__content__button mb-5' />
56
           <DropdownCreateButton customClass='workspace__content__button mb-5' />
57
 
57
 
58
-          <PageText visible={this.state.activeFileType === 'file'} />
58
+          <Thread visible={this.state.activeFileType === 'thread'} />
59
           {/*
59
           {/*
60
-          <Thread visible={this.state.activeFileType === 'chat'} />
60
+          <PageText visible={this.state.activeFileType === 'file'} />
61
           */}
61
           */}
62
         </PageContent>
62
         </PageContent>
63
 
63
 

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

2
   display flex
2
   display flex
3
   border-bottom 0
3
   border-bottom 0
4
   &:hover
4
   &:hover
5
-    background-color hover-files
5
+    background-color files-hover
6
   &__type
6
   &__type
7
     font-size 30px
7
     font-size 30px
8
     text-align center
8
     text-align center

+ 11 - 11
src/css/Folder.styl View File

1
 // -----------------------------------------------------
1
 // -----------------------------------------------------
2
 // border management for Workspace container
2
 // border management for Workspace container
3
-border-style = 1px solid dark-blue
3
+border-style = 1px solid darkBlue
4
 .folder__header
4
 .folder__header
5
   border border-style
5
   border border-style
6
 .file
6
 .file
48
     justify-content space-between
48
     justify-content space-between
49
     margin-left -30px
49
     margin-left -30px
50
     border-bottom 0
50
     border-bottom 0
51
-    background-color light-grey
51
+    background-color lightGrey
52
     cursor pointer
52
     cursor pointer
53
     &:hover
53
     &:hover
54
-      background-color hover-folder
54
+      background-color folder-hover
55
       .folder__header__triangleborder__triangle
55
       .folder__header__triangleborder__triangle
56
         border-color hover-folder transparent transparent transparent
56
         border-color hover-folder transparent transparent transparent
57
     &__triangleborder
57
     &__triangleborder
61
       left -1px
61
       left -1px
62
       border-style solid
62
       border-style solid
63
       border-width 25px 30px 0 30px
63
       border-width 25px 30px 0 30px
64
-      border-color dark-blue transparent transparent transparent
64
+      border-color darkBlue transparent transparent transparent
65
       z-index 1
65
       z-index 1
66
       &__triangle
66
       &__triangle
67
         display none
67
         display none
70
         left -30px
70
         left -30px
71
         border-style solid
71
         border-style solid
72
         border-width 25px 30px 0 30px
72
         border-width 25px 30px 0 30px
73
-        border-color light-grey transparent transparent transparent
73
+        border-color lightGrey transparent transparent transparent
74
     &__name
74
     &__name
75
       display flex
75
       display flex
76
       padding-left 5px
76
       padding-left 5px
77
       &__icon
77
       &__icon
78
         margin auto 15px
78
         margin auto 15px
79
         font-size 25px
79
         font-size 25px
80
-        color dark-blue
80
+        color darkBlue
81
       &__text
81
       &__text
82
         margin auto 15px
82
         margin auto 15px
83
         font-size 17px
83
         font-size 17px
84
-        color dark-blue
84
+        color darkBlue
85
       &__addbtn
85
       &__addbtn
86
         margin auto 0
86
         margin auto 0
87
         cursor pointer
87
         cursor pointer
88
         &:hover > .folder__header__name__addbtn__text
88
         &:hover > .folder__header__name__addbtn__text
89
           color white
89
           color white
90
         &__text
90
         &__text
91
-          border 1px solid dark-blue
91
+          border 1px solid darkBlue
92
           background-color transparent
92
           background-color transparent
93
-          color dark-blue
93
+          color darkBlue
94
           font-size 17px
94
           font-size 17px
95
     &__contenttype
95
     &__contenttype
96
       display flex
96
       display flex
97
       &__text
97
       &__text
98
         padding 18px 15px
98
         padding 18px 15px
99
         font-size 17px
99
         font-size 17px
100
-        color dark-blue
100
+        color darkBlue
101
       &__icon
101
       &__icon
102
         padding 18px 5px
102
         padding 18px 5px
103
         font-size 17px
103
         font-size 17px
104
-        color dark-blue
104
+        color darkBlue
105
         & > i
105
         & > i
106
           margin-right 15px
106
           margin-right 15px
107
 
107
 

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

1
 .footer
1
 .footer
2
   border-top 1px solid grey
2
   border-top 1px solid grey
3
   width 100%
3
   width 100%
4
-  background-color light-grey
4
+  background-color lightGrey
5
   &__text
5
   &__text
6
     display none
6
     display none
7
     vertical-align middle
7
     vertical-align middle

+ 21 - 2
src/css/Generic.styl View File

45
   &__title
45
   &__title
46
     margin-left 10px
46
     margin-left 10px
47
     font-size 30px
47
     font-size 30px
48
-    color dark-grey
48
+    color darkGrey
49
 @media (max-width: max-xs)
49
 @media (max-width: max-xs)
50
   .pageTitleGeneric
50
   .pageTitleGeneric
51
     display block
51
     display block
74
       padding 5px 65px 5px 10px
74
       padding 5px 65px 5px 10px
75
 
75
 
76
 
76
 
77
+.fa-file-text-o
78
+  color fileColor
79
+
80
+.fa-comments-o
81
+  color threadColor
82
+
83
+.fa-list-ul
84
+  color taskColor
85
+
86
+.fa-file-code-o
87
+  color markdownColor
88
+
89
+.fa-file-word-o
90
+  color htmlColor
91
+
92
+.fa-ticket
93
+  color issueColor
94
+
95
+
77
 .wsFileGeneric
96
 .wsFileGeneric
78
   position fixed
97
   position fixed
79
   top 85px
98
   top 85px
80
   right 0
99
   right 0
81
   border 1px solid grey
100
   border 1px solid grey
82
   height 100%
101
   height 100%
83
-  background-color light-grey
102
+  background-color lightGrey
84
   box-shadow shadow-page
103
   box-shadow shadow-page
85
   visibility hidden
104
   visibility hidden
86
   &.visible
105
   &.visible

+ 6 - 6
src/css/Header.styl View File

2
   position fixed
2
   position fixed
3
   width 100%
3
   width 100%
4
   box-shadow shadow-bottom
4
   box-shadow shadow-bottom
5
-  background off-white
5
+  background mainColor
6
   z-index 3
6
   z-index 3
7
   &__logo
7
   &__logo
8
     &__img
8
     &__img
40
           .languagedropdown
40
           .languagedropdown
41
             &__btnlanguage
41
             &__btnlanguage
42
               margin-right 25px
42
               margin-right 25px
43
-              color dark-grey
43
+              color darkGrey
44
               &:focus
44
               &:focus
45
                 box-shadow shadow-all-side-blue
45
                 box-shadow shadow-all-side-blue
46
                 border-radius 5px
46
                 border-radius 5px
68
             padding 0 5px
68
             padding 0 5px
69
             background-color transparent
69
             background-color transparent
70
             &:hover
70
             &:hover
71
-              background-color light-grey
71
+              background-color lightGrey
72
             &:focus
72
             &:focus
73
               box-shadow shadow-all-side-blue
73
               box-shadow shadow-all-side-blue
74
-              background-color light-grey
74
+              background-color lightGrey
75
             &::after //bootstrap overrides
75
             &::after //bootstrap overrides
76
               vertical-align middle
76
               vertical-align middle
77
-              color dark-grey
77
+              color darkGrey
78
             &__imgprofil
78
             &__imgprofil
79
               display inline-block
79
               display inline-block
80
               margin-right 10px
80
               margin-right 10px
84
               display inline-block
84
               display inline-block
85
               vertical-align middle
85
               vertical-align middle
86
               margin-right 10px
86
               margin-right 10px
87
-              color dark-grey
87
+              color darkGrey
88
           .profilgroup__sub
88
           .profilgroup__sub
89
             color dark-grey
89
             color dark-grey
90
             cursor pointer
90
             cursor pointer

+ 3 - 3
src/css/Login.styl View File

1
 .loginpage
1
 .loginpage
2
   padding-top 85px // 85 = header height
2
   padding-top 85px // 85 = header height
3
   min-height calc(100% - 50px)
3
   min-height calc(100% - 50px)
4
-  background dark-blue url('../img/tracimLogoAsBg.png') no-repeat 25% 3px
4
+  background darkBlue url('../img/tracimLogoAsBg.png') no-repeat 25% 3px
5
   background-size contain
5
   background-size contain
6
   width 100%
6
   width 100%
7
   &__logo
7
   &__logo
49
       display block
49
       display block
50
       margin 0 auto
50
       margin 0 auto
51
       &:hover
51
       &:hover
52
-        background-color dark-green
52
+        background-color btnCallAction-hover
53
       &:focus
53
       &:focus
54
         box-shadow shadow-all-side-green
54
         box-shadow shadow-all-side-green
55
     &__pwforgot
55
     &__pwforgot
63
         right 15px
63
         right 15px
64
         width 130px
64
         width 130px
65
         padding-bottom 2px
65
         padding-bottom 2px
66
-        border-bottom 1px solid dark-grey
66
+        border-bottom 1px solid darkGrey
67
 
67
 
68
 @media (min-width: min-lg) and (max-width: max-lg)
68
 @media (min-width: min-lg) and (max-width: max-lg)
69
   .loginpage__content
69
   .loginpage__content

+ 20 - 17
src/css/PageText.styl View File

3
   height calc(100% - 85px)
3
   height calc(100% - 85px)
4
   overflow-Y auto
4
   overflow-Y auto
5
   &__header
5
   &__header
6
-    background-color orange
6
+    background-color htmlColor
7
+    &__icon
8
+      .fa-file-word-o
9
+        color white
7
   &__contentpage
10
   &__contentpage
8
     display flex
11
     display flex
9
     overflow-Y auto
12
     overflow-Y auto
20
       &__title
23
       &__title
21
         margin 10px 0
24
         margin 10px 0
22
         font-size 30px
25
         font-size 30px
23
-        color orange
26
+        color htmlColor
24
       &__data
27
       &__data
25
         flex-grow 1
28
         flex-grow 1
26
         flex-shrink 1
29
         flex-shrink 1
38
       text-align center
41
       text-align center
39
       font-size 20px
42
       font-size 20px
40
       color dark-grey
43
       color dark-grey
41
-      background-color hover-grey
44
+      background-color grey-hover
42
     &__messagelist
45
     &__messagelist
43
       min-height 300px
46
       min-height 300px
44
       &__item
47
       &__item
46
           color dark-grey
49
           color dark-grey
47
       &__version
50
       &__version
48
         margin-top 40px
51
         margin-top 40px
49
-        background-color hover-grey
52
+        background-color grey-hover
50
         &__btn
53
         &__btn
51
           padding 5px 25px
54
           padding 5px 25px
52
           border-radius 5px
55
           border-radius 5px
53
           width 145px
56
           width 145px
54
           color white
57
           color white
55
           font-size 17px
58
           font-size 17px
56
-          background-color orange
59
+          background-color htmlColor
57
           & > i
60
           & > i
58
             margin-right 10px
61
             margin-right 10px
59
             color dark-grey
62
             color dark-grey
60
             font-size 22px
63
             font-size 22px
61
           &:hover
64
           &:hover
62
-            background-color dark-orange
65
+            background-color darkHtmlColor
63
           &:focus
66
           &:focus
64
-            background-color dark-orange
67
+            background-color darkHtmlColor
65
         &__date
68
         &__date
66
-          color orange
69
+          color fontColor
67
           font-size 17px
70
           font-size 17px
68
     &__texteditor
71
     &__texteditor
69
       &__simpletext
72
       &__simpletext
70
         &__input
73
         &__input
71
           &:focus
74
           &:focus
72
-            color orange
73
-            border-color orange
75
+            color htmlColor
76
+            border-color htmlColor
74
       &__submit
77
       &__submit
75
         &__btn
78
         &__btn
76
-          border-color orange
77
-          background-color orange
79
+          border-color htmlColor
80
+          background-color htmlColor
78
           color white
81
           color white
79
           &:hover
82
           &:hover
80
-            border-color orange
81
-            background-color orange
83
+            border-color htmlColor
84
+            background-color htmlColor
82
           &:focus
85
           &:focus
83
-            border-color orange
84
-            background-color orange
86
+            border-color htmlColor
87
+            background-color htmlColor
85
 
88
 
86
 /***** CLASS MESSAGELISTSIZE *****/
89
 /***** CLASS MESSAGELISTSIZE *****/
87
 
90
 
96
 
99
 
97
 .received
100
 .received
98
   .wsFileText__contentpage__messagelist__item__content
101
   .wsFileText__contentpage__messagelist__item__content
99
-      background-color orange
102
+      background-color htmlColor
100
 
103
 
101
 /*****************************/
104
 /*****************************/
102
 
105
 

+ 18 - 13
src/css/Sidebar.styl View File

2
   position absolute
2
   position absolute
3
   left 0
3
   left 0
4
   display none
4
   display none
5
-  border 1px solid dark-blue
5
+  border 1px solid darkBlue
6
   border-top-width 2px
6
   border-top-width 2px
7
   padding 11px 15px
7
   padding 11px 15px
8
   background-color blue
8
   background-color blue
17
 .sidebar
17
 .sidebar
18
   display none
18
   display none
19
   min-height 100%
19
   min-height 100%
20
-  background-color dark-blue
20
+  background-color secondColor
21
   z-index 1
21
   z-index 1
22
 
22
 
23
 sidebar-width = 300px
23
 sidebar-width = 300px
42
         position relative
42
         position relative
43
         margin-top 2px
43
         margin-top 2px
44
         width sidebar-width
44
         width sidebar-width
45
-        background-color blue
45
+        background-color thirdColor
46
         cursor pointer
46
         cursor pointer
47
         &__number
47
         &__number
48
           display inline-block
48
           display inline-block
49
-          padding 5px 0 5px 0
49
+          padding 10px 0
50
           width 50px
50
           width 50px
51
           font-size 20px
51
           font-size 20px
52
           letter-spacing 2px
52
           letter-spacing 2px
53
           text-align center
53
           text-align center
54
-          background-color light-blue
54
+          background-color rgba(253,253,253,0.3)
55
         &__name
55
         &__name
56
           display inline-block
56
           display inline-block
57
           vertical-align top
57
           vertical-align top
58
-          padding 5px 5px
58
+          padding 10px 5px
59
           width 220px
59
           width 220px
60
           font-size 20px
60
           font-size 20px
61
           color white
61
           color white
70
           padding-left 0
70
           padding-left 0
71
           height 0 // height is handled is js
71
           height 0 // height is handled is js
72
           list-style none
72
           list-style none
73
-          background-color opacity-blue
73
+          background-color fourthColor
74
           overflow hidden
74
           overflow hidden
75
           transition height 0.5s
75
           transition height 0.5s
76
           &__dropdown
76
           &__dropdown
77
-            border-top 1px solid dark-blue
77
+            border-top 1px solid darkBlue
78
             &:hover
78
             &:hover
79
-              background-color light-blue
79
+              background-color lightBlue
80
             &__showdropdown
80
             &__showdropdown
81
-              padding 10px 0
81
+              display inline-block
82
+              padding 10px 15px
82
             .dropdown__icon
83
             .dropdown__icon
83
               display inline-block
84
               display inline-block
84
-              margin 0 35px 0 15px
85
+              padding 10px 15px
86
+              width 50px
87
+              text-align center
88
+              background-color rgba(253,253,253,0.3)
85
               font-size 20px
89
               font-size 20px
86
             .dropdown__title
90
             .dropdown__title
87
               position relative
91
               position relative
88
               display inline-block
92
               display inline-block
89
               font-size 18px
93
               font-size 18px
90
               font-weight 400
94
               font-weight 400
91
-              color dark-grey
95
+              color darkGrey
92
               cursor pointer
96
               cursor pointer
93
               &::after //bootstrap override
97
               &::after //bootstrap override
94
                 position absolute
98
                 position absolute
98
                 display inline-block
102
                 display inline-block
99
                 width 200px
103
                 width 200px
100
             .dropdown__subdropdown
104
             .dropdown__subdropdown
105
+              margin 0
101
               border-radius 0
106
               border-radius 0
102
               padding 0
107
               padding 0
103
               .alignname
108
               .alignname
105
                 font-size 18px
110
                 font-size 18px
106
               &__item
111
               &__item
107
                 cursor pointer
112
                 cursor pointer
108
-                border-top 1px solid dark-blue
113
+                border-top 1px solid darkBlue
109
                 padding 13px 0
114
                 padding 13px 0
110
                 &__iconfile
115
                 &__iconfile
111
                   padding-left 18px
116
                   padding-left 18px

+ 7 - 6
src/css/Thread.styl View File

2
   width 550px
2
   width 550px
3
   &__header
3
   &__header
4
     color white
4
     color white
5
-    background-color blue
5
+    background-color threadColor
6
   &__wrapper
6
   &__wrapper
7
     height calc(100% - 209px) /* height of chat__header + height of option + top of chat */
7
     height calc(100% - 209px) /* height of chat__header + height of option + top of chat */
8
   &__messagelist
8
   &__messagelist
9
     padding 15px 35px
9
     padding 15px 35px
10
     &__item
10
     &__item
11
       &__content
11
       &__content
12
-        color dark-blue
12
+        color darkBlue
13
   &__texteditor
13
   &__texteditor
14
     &__simpletext
14
     &__simpletext
15
       &__input
15
       &__input
16
         &:focus
16
         &:focus
17
-          color dark-blue
18
-          border-color dark-blue
17
+          color darkBlue
18
+          border-color darkBlue
19
     &__submit
19
     &__submit
20
       &__btn
20
       &__btn
21
-        color dark-blue
21
+        color darkBlue
22
 
22
 
23
 .received
23
 .received
24
   .wsFileThread__messagelist__item__content
24
   .wsFileThread__messagelist__item__content
25
-      background-color dark-blue
25
+      background-color darkBlue
26
+      color white
26
 
27
 
27
 @media (min-width: max-xs) and (max-width: max-lg)
28
 @media (min-width: max-xs) and (max-width: max-lg)
28
   .wsFileThread
29
   .wsFileThread

+ 42 - 35
src/css/Variable.styl View File

1
 /**** VARIABLES ****/
1
 /**** VARIABLES ****/
2
 /*** COULEURS ****/
2
 /*** COULEURS ****/
3
-dark-blue = #215E8E // #215E8E dark-blue
4
-hover-blue = #205AED // #205AED color blue use in hover rules
5
-blue = #2571FE // #2571FE blue
6
-light-blue = #569EDE // #569EDE light-blue
7
-opacity-blue = #82B2CC // #82B2CC  blue with light opacity
8
-off-white = #FDFDFD // #FDFDFD off-white
9
-dark-grey = #252525 // #252525 dark-grey
10
-hover-folder = #9BC1EB // #9BC1EB hover on folder
11
-hover-files = rgba(155,193,235,0.2) // hover on files
12
-grey = #ABABAB // #ABABAB grey
13
-light-grey = #f0f0f0 // #f0f0f0 light grey
14
-hover-grey = #E0E0E0 // #E0E0E0 color for hover files
15
-green = #28a745 // #28a745 green
16
-dark-green = #65A833 // #65A833 dark-green
17
-purple = #7E36A0 // color icon on the sidebar menu workspace
18
-orange = #D95620 // color icon on the sidebar menu workspace
19
-red = #D9352B // color icon on the sidebar menu workspace
3
+
4
+mainColor = #fdfdfd // Bg header
5
+secondColor = #215e8e // bg sidebar
6
+thirdColor = #2571fe // bg workspace name
7
+fourthColor = #82b2cc // bg filter sidebar
8
+
9
+fontColor = #252525
10
+
11
+darkGrey = #252525
12
+grey = #ababab
13
+lightGrey = #f0f0f0
14
+grey-hover = #e0e0e0
15
+
16
+folder-hover = #9BC1eb
17
+files-hover = rgba(155,193,235,0.2)
18
+
19
+off-white = #fdfdfd
20
+
21
+darkBlue = #215e8e
22
+blue = #2571fe
23
+lightBlue = #569EDE
24
+
25
+btnCallAction = #28a745 // couleur des boutons call2action dans le contexte generale (tout contexte sauf celui d'un type de contenu particulier)
26
+btnCallAction-hover = darken(btnCallAction, 15%)
27
+
28
+threadColor = #2674d3
29
+
30
+htmlColor = #65c7f2
31
+darkHtmlColor = darken(htmlColor, 15%)
32
+
33
+markdownColor = #e0082b
34
+
35
+fileColor = #263462
36
+
37
+taskColor = #2d5a88
38
+
39
+issueColor = #a4835e
40
+
41
+// calendarColor =
42
+// dashboard =
43
+
20
 
44
 
21
 /*************************/
45
 /*************************/
22
 /**** BOX SHADOW ****/
46
 /**** BOX SHADOW ****/
23
 shadow-bottom = 0px 0px 5px 1px #606060
47
 shadow-bottom = 0px 0px 5px 1px #606060
24
 shadow-right = 2px 2px 5px 0px #404040
48
 shadow-right = 2px 2px 5px 0px #404040
25
-shadow-all = 1px 1px 5px 2px #ABABAB
49
+shadow-all = 1px 1px 5px 2px #ababab
26
 shadow-all-side-blue = 0px 0px 1px 1px light-blue
50
 shadow-all-side-blue = 0px 0px 1px 1px light-blue
27
 shadow-all-side-green = 0 0 1px 2px green
51
 shadow-all-side-green = 0 0 1px 2px green
28
 
52
 
41
 max-lg = 1199px
65
 max-lg = 1199px
42
 
66
 
43
 min-xl = 1200px
67
 min-xl = 1200px
44
-/***********************/
45
 
68
 
46
-.dashboard-color
47
-  color purple
48
-.task-color
49
-  color green
50
-.docandfile-color
51
-  color orange
52
-.talk-color
53
-  color blue
54
-.calendar-color
55
-  color red
56
-.current-color
57
-  color blue
58
-.canceled-color
59
-  color dark-grey
60
-.validated-color
61
-  color green

+ 2 - 2
webpack.config.js View File

83
       new webpack.optimize.CommonsChunkPlugin({
83
       new webpack.optimize.CommonsChunkPlugin({
84
         name: 'vendor',
84
         name: 'vendor',
85
         filename: 'tracim.vendor.bundle.js'
85
         filename: 'tracim.vendor.bundle.js'
86
-      }),
87
-      new dashboardPlugin()
86
+      })
87
+      // new dashboardPlugin()
88
     ],
88
     ],
89
     ...(isProduction
89
     ...(isProduction
90
       ? [ // production specific plugins
90
       ? [ // production specific plugins