Browse Source

Merge branch 'develop' of github.com:tracim/tracim_lib into develop

AlexiCauvin 6 years ago
parent
commit
01e477297c

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

1
 @import '../../../css/Variable.styl'
1
 @import '../../../css/Variable.styl'
2
 
2
 
3
 .selectStatus
3
 .selectStatus
4
-  margin-right 20px
5
   &__dropdownbtn
4
   &__dropdownbtn
6
     border 1px solid grey
5
     border 1px solid grey
7
     background-color transparent
6
     background-color transparent

+ 1 - 1
src/component/OptionComponent/NewVersionBtn.jsx View File

3
 const NewVersionBtn = props => {
3
 const NewVersionBtn = props => {
4
   return (
4
   return (
5
     <button
5
     <button
6
-      className='wsContentGeneric__option__menu__addversion newversionbtn btn btn-outline-primary mr-auto'
6
+      className='wsContentGeneric__option__menu__addversion newversionbtn btn btn-outline-primary'
7
       onClick={props.onClickNewVersionBtn}
7
       onClick={props.onClickNewVersionBtn}
8
       disabled={props.disabled}
8
       disabled={props.disabled}
9
     >
9
     >

+ 11 - 0
src/component/PopinFixed/PopinFixed.styl View File

57
     &__menu
57
     &__menu
58
       & > div
58
       & > div
59
         display flex
59
         display flex
60
+        flex-flow row
61
+        justify-content space-between
60
         align-items center
62
         align-items center
61
       &__addversion
63
       &__addversion
62
         display flex
64
         display flex
63
         align-items center
65
         align-items center
64
         cursor pointer
66
         cursor pointer
67
+      &__lastversion
68
+        display flex
69
+        align-items center
70
+        cursor pointer
71
+        margin-left 15px
72
+        & > i
73
+          margin-right 10px
74
+          color darkGrey
75
+          font-size 22px
65
       &__action
76
       &__action
66
         font-size 18px
77
         font-size 18px
67
         background-color transparent
78
         background-color transparent

+ 1 - 1
src/component/Timeline/Revision.jsx View File

13
     </button>
13
     </button>
14
 
14
 
15
     <div className={classnames(`${props.customClass}__messagelist__version__date`, 'timeline__messagelist__version__date')}>
15
     <div className={classnames(`${props.customClass}__messagelist__version__date`, 'timeline__messagelist__version__date')}>
16
-      Créer le {props.createdAt}
16
+      Créé le {props.createdAt}
17
     </div>
17
     </div>
18
   </li>
18
   </li>
19
 )
19
 )

+ 5 - 3
src/component/Timeline/Timeline.jsx View File

12
   }
12
   }
13
 
13
 
14
   componentDidUpdate () {
14
   componentDidUpdate () {
15
-    this.scrollToBottom()
15
+    this.props.shouldScrollToBottom && this.scrollToBottom()
16
   }
16
   }
17
 
17
 
18
   scrollToBottom = () => this.timelineBottom.scrollIntoView({behavior: 'instant'})
18
   scrollToBottom = () => this.timelineBottom.scrollIntoView({behavior: 'instant'})
115
   loggedUser: PropTypes.object,
115
   loggedUser: PropTypes.object,
116
   wysiwyg: PropTypes.bool,
116
   wysiwyg: PropTypes.bool,
117
   onClickWysiwygBtn: PropTypes.func,
117
   onClickWysiwygBtn: PropTypes.func,
118
-  onClickRevisionBtn: PropTypes.func
118
+  onClickRevisionBtn: PropTypes.func,
119
+  shouldScrollToBottom: PropTypes.bool
119
 }
120
 }
120
 
121
 
121
 Timeline.defaultProps = {
122
 Timeline.defaultProps = {
128
   },
129
   },
129
   timelineData: [],
130
   timelineData: [],
130
   wysiwyg: false,
131
   wysiwyg: false,
131
-  onClickWysiwygBtn: () => {}
132
+  onClickWysiwygBtn: () => {},
133
+  shouldScrollToBottom: true
132
 }
134
 }