merge conflicts

src/component/PopinFixed/PopinFixed.styl

@@ -7,7 +7,7 @@
   border 1px solid grey
   height 100%
   background-color lightGrey
-  box-shadow shadow-page
+  box-shadow shadow-right
   z-index 4
   &.visible
     visibility visible
@@ -107,24 +107,28 @@
   .wsContentGeneric__content
     overflow-Y auto
     &__left
+      margin-bottom 20px
       width 100%
-      margin-bottom 50px
+      height auto
+      &__textnote
+        height auto
+        overflow-y hidden
     &__right
       width 100%
 
 @media (min-width: min-sm) and (max-width: max-sm)
 
   .wsContentGeneric
-    top 70px
+    top 68px
 
 @media (max-width: max-xs)
 
   .wsContentGeneric
-    top 70px
+    top 68  px
     &__content
       overflow-Y auto
       &__left
         width 100%
-        margin-bottom 50px
+        margin-bottom 20px
       &__right
         width 100%

src/component/Timeline/Timeline.styl

@@ -125,50 +125,16 @@
 .mce-btn-group:not(:first-child)
   border-left none!important //remove the left borders of the wysiwyg for a better aesthetic result
 
+@media (min-width: min-lg) and (max-width: max-lg)
+  .timeline
+    margin 0
 
-/**** MEDIA 576px & 1199px ****/
-
-@media (min-width: min-sm) and (max-width: max-lg)
-
-  .timeline__body
-    &__messagelist
-      min-height 350px
-      max-height 700px
-      &__item
-        margin-right 55px
-
-/**** MEDIA 576px & 767px ****/
-
-@media (min-width: min-sm) and (max-width: max-sm)
-
-  .timeline__body
-    &__messagelist__item
-      margin-right 35px
-    &__texteditor
-      display flex
-      align-items center
-      &__wysiwyg
-        width 70%
-        & > textarea
-          border-radius 5px
-          height 40px
-      &__submit
-        width 30%
-        margin-left 10px
-
-/**** MEDIA 575px ****/
+@media (min-width: min-sm) and (max-width: max-md)
+  .timeline
+    display block
+    margin 0
 
 @media (max-width: max-xs)
-
-  .timeline__body
-    &__texteditor
-      display flex
-      align-items center
-      &__wysiwyg
-        width 70%
-        & > textarea
-          border-radius 5px
-          height 40px
-      &__submit
-        width 30%
-        margin-left 10px
+  .timeline
+    display block
+    margin 0