3 files changed, 21 insertions, 30 deletions
diff --git a/web/sass-files/sass/partials/_files.scss b/web/sass-files/sass/partials/_files.scss
index b01d2e157..1268d8a07 100644
--- a/web/sass-files/sass/partials/_files.scss
+++ b/web/sass-files/sass/partials/_files.scss
@@ -13,6 +13,7 @@
     vertical-align: top;
     position: relative;
     border: 1px solid #DDD;
+    @include clearfix;
     &.custom-file {
       width: 85px;
       height: 100px;
@@ -31,8 +32,8 @@
     }
   }
   .preview-img {
-    width:100%;
-    height:100%;
+      height: auto;
+      max-width: 100%;
   }
   .remove-preview {
     position: absolute;
@@ -136,6 +137,7 @@
     border: 1px solid #E2E2E2;
     background-color: #FFF;
     background-repeat: no-repeat;
+    background-position: left center;
   }
   a {
     text-decoration: none;
diff --git a/web/sass-files/sass/partials/_post.scss b/web/sass-files/sass/partials/_post.scss
index e35979b64..f33cedd16 100644
--- a/web/sass-files/sass/partials/_post.scss
+++ b/web/sass-files/sass/partials/_post.scss
@@ -63,13 +63,13 @@ body.ios {
 		}
 		&.hovered--after {
 			&:before {
-				background: #f6f6f6;
+				background: #f5f5f5;
 				display: block;
 			}
 		}
 		&.hovered--before {
 			&:after {
-				background: #f6f6f6;
+				background: #f5f5f5;
 				display: block;
 			}
 		}
@@ -202,25 +202,19 @@ body.ios {
 				@include opacity(1);
 			}
 		}
-		background: #f6f6f6;
+		background: #f5f5f5;
 	}
 	&.current--user {
 		.post-body {
 			@include border-radius(4px);
 			background: #f5f5f5;
 		}
-		&:hover {
-			.post-body {
-				background: #fff;
-			}
-		}
 	}
 	&.post--comment {
 		&.other--root {
 			.post-comment {
 				border-left: 4px solid #EEE;
 				padding: 4px 0 6px 10px;
-				background: #F5F5F5;
 				margin: 0 0 0 30px;
 				@include border-radius(0 4px 4px 0);
 			}
@@ -229,13 +223,17 @@ body.ios {
 				margin: 0;
 				padding: 1px 0px;
 			}
-			&:hover {
-				background: #f5f5f5;
+			&.current--user {
 				.post-comment {
-					background: #fff;
+					background: #f5f5f5;
 				}
 			}
 		}
+		&.same--root {
+			.post-body {
+				@include border-radius(0 4px 4px 0);
+			}
+		}
 	}
 	&.same--root {
 		.comment-icon__container {
diff --git a/web/sass-files/sass/partials/_responsive.scss b/web/sass-files/sass/partials/_responsive.scss
index e2c89a6f2..1a2befc3f 100644
--- a/web/sass-files/sass/partials/_responsive.scss
+++ b/web/sass-files/sass/partials/_responsive.scss
@@ -210,10 +210,14 @@
     #post-list {
         .date-seperator, .new-separator {
             &.hovered--after {
-                background: none;
+                &:before {
+                    background: none;
+                }
             }
             &.hovered--before {
-                background: none;
+                &:after {
+                    background: none;
+                }
             }
         }
     }
@@ -224,23 +228,10 @@
         &:hover {
             background: none;
         }
-        &.current--user {
-            &:hover {
-                .post-body {
-                    background: #f5f5f5;
-                }
-            }
-        }
         &.post--comment {
             &.other--root {
                 &:hover {
                     background: none;
-                    .post-body {
-                        background: none;
-                        .post-comment {
-                            background: #f5f5f5;
-                        }
-                    }
                 }
             }
         }
@@ -598,7 +589,7 @@
         &.post--comment {
             &.other--root {
                 .post-comment {
-                    margin-left: 4px;
+                    margin-left: 11px;
                 }
             }
         }