Browse Source

added color management for create popup

Skylsmoi 6 years ago
parent
commit
47de7ec50a
4 changed files with 11 additions and 21 deletions
  1. 3 3
      src/container/PopupCreateThread.jsx
  2. 1 1
      src/container/Thread.jsx
  3. 6 16
      src/css/index.styl
  4. 1 1
      src/helper.js

+ 3 - 3
src/container/PopupCreateThread.jsx View File

10
     label: 'Thread',
10
     label: 'Thread',
11
     slug: 'thread',
11
     slug: 'thread',
12
     faIcon: 'file-text-o',
12
     faIcon: 'file-text-o',
13
-    hexcolor: '#3f52e3',
13
+    hexcolor: '#ad4cf9',
14
     creationLabel: 'Write a thread',
14
     creationLabel: 'Write a thread',
15
     domContainer: 'appContainer',
15
     domContainer: 'appContainer',
16
     apiUrl: 'http://localhost:3001',
16
     apiUrl: 'http://localhost:3001',
22
     }
22
     }
23
   },
23
   },
24
   loggedUser: {
24
   loggedUser: {
25
-    id: 5,
25
+    id: 1,
26
     username: 'Smoi',
26
     username: 'Smoi',
27
     firstname: 'Côme',
27
     firstname: 'Côme',
28
     lastname: 'Stoilenom',
28
     lastname: 'Stoilenom',
85
         onClose={this.handleClose}
85
         onClose={this.handleClose}
86
         onValidate={this.handleValidate}
86
         onValidate={this.handleValidate}
87
         label={this.state.config.label} // @TODO get the lang of user
87
         label={this.state.config.label} // @TODO get the lang of user
88
-        hexcolor={this.state.config.hexcolor}
88
+        customColor={this.state.config.hexcolor}
89
         faIcon={this.state.config.faIcon}
89
         faIcon={this.state.config.faIcon}
90
         contentName={this.state.newContentName}
90
         contentName={this.state.newContentName}
91
         onChangeContentName={this.handleChangeNewContentName}
91
         onChangeContentName={this.handleChangeNewContentName}

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

218
             onClickValidateNewCommentBtn={this.handleClickValidateNewCommentBtn}
218
             onClickValidateNewCommentBtn={this.handleClickValidateNewCommentBtn}
219
             onClickWysiwygBtn={this.handleToggleWysiwyg}
219
             onClickWysiwygBtn={this.handleToggleWysiwyg}
220
             onClickRevisionBtn={() => {}}
220
             onClickRevisionBtn={() => {}}
221
-            shouldScrollToBottom={false}
221
+            shouldScrollToBottom
222
             showHeader={false}
222
             showHeader={false}
223
           />
223
           />
224
         </PopinFixedContent>
224
         </PopinFixedContent>

+ 6 - 16
src/css/index.styl View File

1
 @import "../../node_modules/tracim_lib/src/css/Variable.styl"
1
 @import "../../node_modules/tracim_lib/src/css/Variable.styl"
2
 
2
 
3
 .thread
3
 .thread
4
-  width 1100px
4
+  width 70%
5
   &__header
5
   &__header
6
     &__editionmode
6
     &__editionmode
7
       display none
7
       display none
23
       &__texteditor
23
       &__texteditor
24
         flex 0 0 auto
24
         flex 0 0 auto
25
 
25
 
26
-@media (min-width: min-lg) and (max-width: max-lg)
27
-  .wsContentThread
28
-    width 900px
29
-
30
-@media (min-width: min-md) and (max-width: max-md)
31
-  .wsContentThread
32
-    width 700px
33
-
34
 @media (min-width: min-sm) and (max-width: max-sm)
26
 @media (min-width: min-sm) and (max-width: max-sm)
35
-  .wsContentThread
36
-    top 69px
37
-    width 500px
27
+  .thread
28
+    top 68px
29
+    width 100%
38
 
30
 
39
 @media (max-width: max-xs)
31
 @media (max-width: max-xs)
40
-  .wsContentThread
41
-    top 69px
32
+  .thread
33
+    top 68px
42
     width 100%
34
     width 100%
43
-    box-shadow none
44
-    z-index 1

+ 1 - 1
src/helper.js View File

47
     }]
47
     }]
48
   },
48
   },
49
   loggedUser: { // @FIXME this object is outdated
49
   loggedUser: { // @FIXME this object is outdated
50
-    user_id: 5,
50
+    user_id: 1,
51
     username: 'Smoi',
51
     username: 'Smoi',
52
     firstname: 'Côme',
52
     firstname: 'Côme',
53
     lastname: 'Stoilenom',
53
     lastname: 'Stoilenom',