Browse Source

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

Skylsmoi 6 years ago
parent
commit
cfb88727bf

+ 1 - 1
src/component/Input/TextAreaApp/TextAreaApp.jsx View File

12
       onChange={props.onChangeText}
12
       onChange={props.onChangeText}
13
     />
13
     />
14
 
14
 
15
-    <div className={`${props.customClass}__button editionmode__button text-right`}>
15
+    <div className={`${props.customClass}__button editionmode__button`}>
16
       <button
16
       <button
17
         type='button'
17
         type='button'
18
         className={`${props.customClass}__cancel editionmode__button__cancel btn btn-outline-primary mr-3`}
18
         className={`${props.customClass}__cancel editionmode__button__cancel btn btn-outline-primary mr-3`}

+ 1 - 1
src/component/Input/TextAreaApp/TextAreaApp.styl View File

1
 @import '../../../css/Variable.styl'
1
 @import '../../../css/Variable.styl'
2
 
2
 
3
 .editiontitle
3
 .editiontitle
4
-  width 60%
4
+  width 300px
5
 
5
 
6
 .editionmode
6
 .editionmode
7
   display flex
7
   display flex

+ 1 - 1
src/component/PopinFixed/PopinFixedHeader.jsx View File

37
 
37
 
38
         <div className={classnames('wsContentGeneric__header__title mr-auto', `${customClass}__header__title`)}>
38
         <div className={classnames('wsContentGeneric__header__title mr-auto', `${customClass}__header__title`)}>
39
           {this.state.editTitle
39
           {this.state.editTitle
40
-            ? <input value={this.state.editTitleValue} onChange={this.onChangeTitle} />
40
+            ? <input className='wsContentGeneric__header__title__editiontitle editiontitle' value={this.state.editTitleValue} onChange={this.onChangeTitle} />
41
             : <div>{title}</div>
41
             : <div>{title}</div>
42
           }
42
           }
43
         </div>
43
         </div>

+ 1 - 1
src/component/Timeline/Timeline.styl View File

50
     &__version
50
     &__version
51
       display flex
51
       display flex
52
       justify-content space-between
52
       justify-content space-between
53
-      margin 40px 0 20px 0
53
+      margin 20px 0 20px 0
54
       padding 10px 15px
54
       padding 10px 15px
55
       width 100%
55
       width 100%
56
       background-color lightGrey
56
       background-color lightGrey