Ver código fonte

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

Skylsmoi 5 anos atrás
pai
commit
3970e0617a

+ 1 - 1
frontend/src/container/Sidebar.jsx Ver arquivo

@@ -86,7 +86,7 @@ class Sidebar extends React.Component {
86 86
 
87 87
             <div className='sidebar__btnnewworkspace'>
88 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 90
               </button>
91 91
             </div>
92 92
 

+ 0 - 4
frontend_lib/src/component/Input/SelectStatus/SelectStatus.jsx Ver arquivo

@@ -27,10 +27,6 @@ export const SelectStatus = props => {
27 27
       </button>
28 28
 
29 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 30
         {props.availableStatus.map(s =>
35 31
           <button
36 32
             className='selectStatus__submenu__item current dropdown-item'

+ 4 - 2
frontend_lib/src/component/Timeline/Comment.jsx Ver arquivo

@@ -26,10 +26,12 @@ const Comment = props => {
26 26
         </div>
27 27
       </div>
28 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 33
           {props.createdAt}
31 34
         </div>
32
-        {props.author}
33 35
       </div>
34 36
       <div
35 37
         className={classnames(`${props.customClass}__messagelist__item__content`, 'timeline__body__messagelist__item__content')}

+ 3 - 6
frontend_lib/src/component/Timeline/Timeline.styl Ver arquivo

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