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

src/component/Input/SelectStatus/SelectStatus.styl

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

src/component/OptionComponent/NewVersionBtn.jsx

@@ -3,7 +3,7 @@ import React from 'react'
 const NewVersionBtn = props => {
   return (
     <button
-      className='wsContentGeneric__option__menu__addversion newversionbtn btn btn-outline-primary mr-auto'
+      className='wsContentGeneric__option__menu__addversion newversionbtn btn btn-outline-primary'
       onClick={props.onClickNewVersionBtn}
       disabled={props.disabled}
     >

src/component/PopinFixed/PopinFixed.styl

@@ -57,11 +57,22 @@
     &__menu
       & > div
         display flex
+        flex-flow row
+        justify-content space-between
         align-items center
       &__addversion
         display flex
         align-items center
         cursor pointer
+      &__lastversion
+        display flex
+        align-items center
+        cursor pointer
+        margin-left 15px
+        & > i
+          margin-right 10px
+          color darkGrey
+          font-size 22px
       &__action
         font-size 18px
         background-color transparent

src/component/Timeline/Revision.jsx

@@ -13,7 +13,7 @@ const Revision = props => (
     </button>
 
     <div className={classnames(`${props.customClass}__messagelist__version__date`, 'timeline__messagelist__version__date')}>
-      Créer le {props.createdAt}
+      Créé le {props.createdAt}
     </div>
   </li>
 )

src/component/Timeline/Timeline.jsx

@@ -12,7 +12,7 @@ class Timeline extends React.Component {
   }
 
   componentDidUpdate () {
-    this.scrollToBottom()
+    this.props.shouldScrollToBottom && this.scrollToBottom()
   }
 
   scrollToBottom = () => this.timelineBottom.scrollIntoView({behavior: 'instant'})
@@ -115,7 +115,8 @@ Timeline.propTypes = {
   loggedUser: PropTypes.object,
   wysiwyg: PropTypes.bool,
   onClickWysiwygBtn: PropTypes.func,
-  onClickRevisionBtn: PropTypes.func
+  onClickRevisionBtn: PropTypes.func,
+  shouldScrollToBottom: PropTypes.bool
 }
 
 Timeline.defaultProps = {
@@ -128,5 +129,6 @@ Timeline.defaultProps = {
   },
   timelineData: [],
   wysiwyg: false,
-  onClickWysiwygBtn: () => {}
+  onClickWysiwygBtn: () => {},
+  shouldScrollToBottom: true
 }