Merge pull request #1438 from florianorben/PLT-924

PLT-924: Combine sequential messages from same user to look like one …

2 files changed, 90 insertions, 50 deletions

diff --git a/web/sass-files/sass/partials/_post.scss b/web/sass-files/sass/partials/_post.scss
index e2981e914..5a7d79afe 100644
--- a/web/sass-files/sass/partials/_post.scss
+++ b/web/sass-files/sass/partials/_post.scss
@@ -393,6 +393,15 @@ body.ios {
 			.post-body {
 				@include border-radius(0 4px 4px 0);
 			}
+			.post-body {
+				border-left: 4px solid #EEE;
+				width: 570px;
+				margin-left: 30px;
+				padding-left: 10px;
+				.post-link {
+					display: none;
+				}
+			}
 		}
 	}
 	&.same--root {
@@ -408,13 +417,12 @@ body.ios {
 		.post__content {
 			padding: 0;
 		}
-		.post-body {
-			border-left: 4px solid #EEE;
-			width: 570px;
-			margin-left: 30px;
-			padding-left: 10px;
-			.post-link {
-				display: none;
+		&.same--user {
+			.post__content {
+				padding-left: 46px;
+			}
+			.post-header-post {
+				visibility: hidden;
 			}
 		}
 	}
diff --git a/web/sass-files/sass/partials/_responsive.scss b/web/sass-files/sass/partials/_responsive.scss
index a4bdc3e92..aad991035 100644
--- a/web/sass-files/sass/partials/_responsive.scss
+++ b/web/sass-files/sass/partials/_responsive.scss
@@ -9,25 +9,26 @@
                 }
             }
             .post {
-                &.same--root {
-                    margin-left: 60px;
-                    padding-left: 10px;
-                    border-left: 4px solid #EEE;
-                    div.post-profile-img__container {
-                        .post-profile-img {
-                            display: none;
-                        }
-                    }
-                    .post__content {
-                        width: 825px;
-                    }
-                    .post-body {
-                        width: 736px;
-                        border: none;
-                        margin: 3px 0 0;
-                    }
-                }
                 &.post--comment {
+		            &.same--root {
+		                margin-left: 104px;
+		                padding-left: 10px;
+		                border-left: 4px solid #EEE;
+		                div.post-profile-img__container {
+		                    .post-profile-img {
+		                        display: none;
+		                    }
+		                }
+		                .post__content {
+		                    width: 825px;
+		                    margin-left: 0;
+		                }
+		                .post-body {
+		                    width: 736px;
+		                    border: none;
+		                    margin: 3px 0 0;
+		                }
+		            }
                     &.other--root {
                         .post-comment {
                             margin-left: 0;
@@ -105,34 +106,61 @@
         }
     }
     .post {
-        &.same--root {
-            margin-left: 60px;
-            padding-left: 10px;
-            border-left: 4px solid #EEE;
-            div.post-profile-img__container {
-                .post-profile-img {
-                    display: none;
-                }
-            }
-            .post__content {
-                width: 825px;
-            }
-            .post-body {
-                width: 736px;
-                border: none;
-                margin: 3px 0 0;
-            }
-        }
+		&.same--root.same--user {
+			.post-header-post {
+				visibility: hidden;
+				width: 100%;
+				position: relative;
+				top: -5px;
+				.post-header-col.post-header__name {
+					display: none;
+				}
+			}
+			.post-body {
+				top: -15px;
+				margin-bottom: -10px;
+			}
+			&:hover .post-header-post {
+				visibility: visible;
+			}
+		}
+
         &.post--comment {
             &.other--root {
                 .post-comment {
                     margin-left: 0;
                 }
             }
-            &.same--root {
-                margin-top: 5px;
-                margin-bottom: 5px;
-            }
+			&.same--root {
+				margin-top: 5px;
+				margin-bottom: 5px;
+				margin-left: 104px;
+				padding-left: 10px;
+				border-left: 4px solid #EEE;
+				div.post-profile-img__container {
+					.post-profile-img {
+						display: none;
+					}
+				}
+				.post-body {
+					margin-left: 0;
+					border-left: 0;
+				}
+				&.same--user {
+					.post__content {
+						margin-left: 0;
+						padding-left: 0;
+					}
+				}
+			}
+			.post__content {
+				width: 810px;
+			}
+			.post-body {
+				width: 736px;
+				border: none;
+				margin: 3px 0 0;
+			}
         }
         .post__content {
             width: 880px;
@@ -358,9 +386,6 @@
         }
     }
     .post {
-        &.same--root {
-            margin-left: 25px;
-        }
         &:hover {
             background: none;
             .post-header .post-header-col.post-header__reply {
@@ -370,7 +395,11 @@
             }
         }
         &.post--comment {
+            &.same--root {
+                margin-left: 25px;
+            }
             &.other--root {
+               margin-left: 0;
                 &:hover {
                     background: none;
                 }
@@ -381,6 +410,9 @@
                 content: '...';
             }
         }
+		&.same--root.same--user .post__content{
+			padding-left: 0;
+		}
     }
     .signup-team__container {
         padding: 30px 0;