Browse Source

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

Skylsmoi 6 years ago
parent
commit
3970e0617a

+ 1 - 1
frontend/src/container/Sidebar.jsx View File

86
 
86
 
87
             <div className='sidebar__btnnewworkspace'>
87
             <div className='sidebar__btnnewworkspace'>
88
               <button className='sidebar__btnnewworkspace__btn btn btn-primary primaryColorBg primaryColorBorder primaryColorBorderDarkenHover mb-5'>
88
               <button className='sidebar__btnnewworkspace__btn btn btn-primary primaryColorBg primaryColorBorder primaryColorBorderDarkenHover mb-5'>
89
-                {t('Create new workspace')}
89
+                {t('Create a workspace')}
90
               </button>
90
               </button>
91
             </div>
91
             </div>
92
 
92
 

+ 0 - 4
frontend_lib/src/component/Input/SelectStatus/SelectStatus.jsx View File

27
       </button>
27
       </button>
28
 
28
 
29
       <div className='selectStatus__submenu dropdown-menu' aria-labelledby='dropdownMenu2'>
29
       <div className='selectStatus__submenu dropdown-menu' aria-labelledby='dropdownMenu2'>
30
-        <h6 className='dropdown-header'>{props.t('File status')}</h6>
31
-
32
-        <div className='dropdown-divider' />
33
-
34
         {props.availableStatus.map(s =>
30
         {props.availableStatus.map(s =>
35
           <button
31
           <button
36
             className='selectStatus__submenu__item current dropdown-item'
32
             className='selectStatus__submenu__item current dropdown-item'

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

26
         </div>
26
         </div>
27
       </div>
27
       </div>
28
       <div className={classnames(`${props.customClass}__messagelist__item__authorandhour`, 'timeline__body__messagelist__item__authorandhour')}>
28
       <div className={classnames(`${props.customClass}__messagelist__item__authorandhour`, 'timeline__body__messagelist__item__authorandhour')}>
29
-        <div className='mr-5'>
29
+        <div className={classnames(`${props.customClass}__messagelist__item__authorandhour__author`, 'timeline__body__messagelist__item__authorandhour__author')}>
30
+          {props.author}
31
+        </div>
32
+        <div className={classnames(`${props.customClass}__messagelist__item__authorandhour__date`, 'timeline__body__messagelist__item__authorandhour__date')}>
30
           {props.createdAt}
33
           {props.createdAt}
31
         </div>
34
         </div>
32
-        {props.author}
33
       </div>
35
       </div>
34
       <div
36
       <div
35
         className={classnames(`${props.customClass}__messagelist__item__content`, 'timeline__body__messagelist__item__content')}
37
         className={classnames(`${props.customClass}__messagelist__item__content`, 'timeline__body__messagelist__item__content')}

+ 3 - 6
frontend_lib/src/component/Timeline/Timeline.styl View File

36
         padding 0 25px 0 35px
36
         padding 0 25px 0 35px
37
         &__avatar
37
         &__avatar
38
           position relative
38
           position relative
39
-          top 40px
39
+          top 60px
40
           left -20px
40
           left -20px
41
           border-radius 50%
41
           border-radius 50%
42
           width 45px
42
           width 45px
46
             height 45px
46
             height 45px
47
             border-radius 25px
47
             border-radius 25px
48
         &__authorandhour
48
         &__authorandhour
49
-          display flex
50
-          align-items center
51
-          justify-content flex-end
52
-          margin-right 35px
49
+          margin-left 35px
53
           opacity 0.7
50
           opacity 0.7
54
           font-size 14px
51
           font-size 14px
55
         &__content
52
         &__content
118
       flex-direction row-reverse
115
       flex-direction row-reverse
119
     &__avatar
116
     &__avatar
120
       left 20px
117
       left 20px
121
-    &__createhour
118
+    &__authorandhour
122
       margin-left 0
119
       margin-left 0
123
       margin-right 35px
120
       margin-right 35px
124
 
121