Browse Source

Fix message received, change of timeline comment design, fix icon on popinfixedoption

AlexiCauvin 5 years ago
parent
commit
17f9a4da78

+ 1 - 6
src/component/PopinFixed/PopinFixed.styl View File

@@ -54,11 +54,6 @@
54 54
     padding 10px
55 55
     height 58px
56 56
     background-color off-white
57
-    & > i
58
-      vertical-align middle
59
-      margin-right 15px
60
-      font-size 25px
61
-      cursor pointer
62 57
     &__menu
63 58
       & > div
64 59
         display flex
@@ -68,10 +63,10 @@
68 63
         align-items center
69 64
         cursor pointer
70 65
       &__action
71
-        margin 5px 10px 0 0
72 66
         font-size 18px
73 67
         background-color transparent
74 68
         border none
69
+        cursor pointer
75 70
         &:hover , &:focus
76 71
           color blue
77 72
   &__content

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

@@ -9,8 +9,10 @@ const Comment = props => (
9 9
       'received': !props.fromMe
10 10
     }
11 11
   )}>
12
-    <div className={classnames(`${props.customClass}__messagelist__item__avatar`, 'timeline__messagelist__item__avatar')}>
13
-      {props.avatar ? <img src={props.avatar} /> : ''}
12
+    <div className={classnames(`${props.customClass}__messagelist__item__wrapper`, 'timeline__messagelist__item__wrapper')}>
13
+      <div className={classnames(`${props.customClass}__messagelist__item__avatar`, 'timeline__messagelist__item__avatar')}>
14
+        {props.avatar ? <img src={props.avatar} /> : ''}
15
+      </div>
14 16
     </div>
15 17
     <div
16 18
       className={classnames(`${props.customClass}__messagelist__item__createhour`, 'timeline__messagelist__item__createhour')}>

+ 2 - 2
src/component/Timeline/Timeline.jsx View File

@@ -57,7 +57,7 @@ class Timeline extends React.Component {
57 57
           <li style={{visibility: 'hidden'}} ref={el => { this.timelineBottom = el }} />
58 58
         </ul>
59 59
 
60
-        <form className={classnames(`${props.customClass}__texteditor`, 'timeline__texteditor d-flex align-items-center justify-content-between flex-wrap')}>
60
+        <form className={classnames(`${props.customClass}__texteditor`, 'timeline__texteditor')}>
61 61
           <div className={classnames(`${props.customClass}__texteditor__textinput`, 'timeline__texteditor__textinput')}>
62 62
             <textarea
63 63
               id='wysiwygTimelineComment'
@@ -82,7 +82,7 @@ class Timeline extends React.Component {
82 82
               </button>
83 83
             </div>
84 84
 
85
-            <div className={classnames(`${props.customClass}__texteditor__submit`, 'timeline__texteditor__submit mb-2')}>
85
+            <div className={classnames(`${props.customClass}__texteditor__submit`, 'timeline__texteditor__submit')}>
86 86
               <button
87 87
                 type='button'
88 88
                 className={classnames(`${props.customClass}__texteditor__submit__btn`, 'timeline__texteditor__submit__btn btn')}

+ 12 - 20
src/component/Timeline/Timeline.styl View File

@@ -29,8 +29,8 @@
29 29
         top 40px
30 30
         left -20px
31 31
         border-radius 50%
32
-        width 50px
33
-        height 50px
32
+        width 45px
33
+        height 45px
34 34
         & > img
35 35
           width 45px
36 36
           height 45px
@@ -74,7 +74,7 @@
74 74
     flex 1 0 auto
75 75
     margin 20px
76 76
     &__textinput
77
-      width 70%
77
+      width 100%
78 78
       & > textarea
79 79
         border-radius 5px
80 80
         border 1.5px solid grey
@@ -83,10 +83,12 @@
83 83
         width 100%
84 84
     &__wrapper
85 85
       display flex
86
-      flex-direction column
87
-      justify-content center
86
+      align-items center
87
+      justify-content flex-end
88
+      margin-top 10px
89
+    &__advancedtext
90
+      margin-right 15px
88 91
     &__submit
89
-      margin 10px 0
90 92
       &__btn
91 93
         display inline-block
92 94
         cursor pointer
@@ -97,27 +99,17 @@
97 99
 .received
98 100
   text-align right
99 101
   .timeline__messagelist__item
102
+    &__wrapper
103
+      display flex
104
+      flex-direction row-reverse
100 105
     &__avatar
101
-      left 93%
106
+      left 20px
102 107
     &__createhour
103 108
       margin-left 0
104 109
       margin-right 35px
105 110
     &__content
106 111
       color white
107 112
 
108
-.activeAdvancedText
109
-  .timeline
110
-    &__texteditor
111
-      padding 10px
112
-      &__textinput
113
-        width 100%
114
-      &__wrapper
115
-        flex-direction row
116
-        align-items center
117
-        width 100%
118
-      &__advancedtext
119
-        margin-right 20px
120
-
121 113
 
122 114
 /**** MEDIA 576px & 1199px ****/
123 115