Browse Source

redo fixes before repo merge

AlexiCauvin 5 years ago
parent
commit
0e03339cfa

+ 1 - 0
frontend_lib/src/component/Input/SelectStatus/SelectStatus.styl View File

@@ -16,6 +16,7 @@
16 16
       display inline-block
17 17
       margin 0 15px
18 18
   &__submenu
19
+    width 100%
19 20
     &__item
20 21
       display flex
21 22
       justify-content space-between

+ 14 - 4
frontend_lib/src/component/Timeline/Timeline.jsx View File

@@ -34,7 +34,15 @@ class Timeline extends React.Component {
34 34
             className={classnames(`${props.customClass}__header`, 'timeline__header')}
35 35
             onClick={props.toggleRightPart}
36 36
           >
37
-            <span className='timeline__header__text'>Timeline</span>
37
+            <div className='timeline__header__icon mt-3 mb-auto'>
38
+              <i className={classnames('fa fa-fw', {'fa-angle-double-right': props.rightPartOpen, 'fa-angle-double-left': !props.rightPartOpen})} />
39
+            </div>
40
+            <div className='timeline__header__title'>
41
+              Timeline
42
+            </div>
43
+            <div className='timeline__header__icon mb-3 mt-auto'>
44
+              <i className={classnames('fa fa-fw', {'fa-angle-double-right': props.rightPartOpen, 'fa-angle-double-left': !props.rightPartOpen})} />
45
+            </div>
38 46
           </div>
39 47
         }
40 48
 
@@ -71,7 +79,7 @@ class Timeline extends React.Component {
71 79
             <div className={classnames(`${props.customClass}__texteditor__textinput`, 'timeline__body__texteditor__textinput')}>
72 80
               <textarea
73 81
                 id='wysiwygTimelineComment'
74
-                placeholder='Taper votre commentaire ici'
82
+                placeholder='Votre message ...'
75 83
                 value={props.newComment}
76 84
                 onChange={props.onChangeNewComment}
77 85
                 disabled={props.disableComment}
@@ -147,7 +155,8 @@ Timeline.propTypes = {
147 155
   onClickWysiwygBtn: PropTypes.func,
148 156
   onClickRevisionBtn: PropTypes.func,
149 157
   shouldScrollToBottom: PropTypes.bool,
150
-  showHeader: PropTypes.bool
158
+  showHeader: PropTypes.bool,
159
+  rightPartOpen: PropTypes.bool // irrelevent if showHeader in false
151 160
 }
152 161
 
153 162
 Timeline.defaultProps = {
@@ -163,5 +172,6 @@ Timeline.defaultProps = {
163 172
   wysiwyg: false,
164 173
   onClickWysiwygBtn: () => {},
165 174
   shouldScrollToBottom: true,
166
-  showHeader: true
175
+  showHeader: true,
176
+  rightPartOpen: false
167 177
 }

+ 9 - 7
frontend_lib/src/component/Timeline/Timeline.styl View File

@@ -9,16 +9,16 @@
9 9
   height 100%
10 10
   &__header
11 11
     display flex
12
-    width 50px
12
+    flex-direction column
13 13
     border-radius 10px 0 0 10px
14
-    padding 15px
14
+    width 50px
15 15
     background-color grey-hover
16
-    text-align center
17 16
     font-size 20px
18 17
     color darkGrey
19 18
     cursor pointer
20
-    &__text
21
-      margin auto 0 auto -25px
19
+    &__icon
20
+      text-align center
21
+    &__title
22 22
       transform rotate(-90deg)
23 23
   &__body
24 24
     display flex
@@ -79,9 +79,9 @@
79 79
         &__date
80 80
           color fontColor
81 81
           font-size 17px
82
-          margin auto 0
82
+          margin auto 15px
83 83
     &__texteditor
84
-      flex 1 0 auto
84
+      flex 0 1 auto
85 85
       margin 20px
86 86
       &__textinput
87 87
         width 100%
@@ -136,3 +136,5 @@
136 136
   .timeline
137 137
     display block
138 138
     margin 0
139
+    &__messagelist__version__date
140
+      font-size 15px