2 files changed, 51 insertions, 40 deletions

diff --git a/webapp/sass/responsive/_mobile.scss b/webapp/sass/responsive/_mobile.scss
index ba72a8119..9db962ec1 100644
--- a/webapp/sass/responsive/_mobile.scss
+++ b/webapp/sass/responsive/_mobile.scss
@@ -85,8 +85,9 @@
             margin-bottom: 0;
 
             .col__reply {
-                top: 0;
+                top: -3px;
                 width: 65px;
+                z-index: auto;
             }
 
             .col__name {
@@ -146,7 +147,7 @@
             &.post--comment {
                 .post__header {
                     .col__reply {
-                        top: 0;
+                        top: -3px;
                     }
                 }
             }
@@ -158,6 +159,12 @@
             }
         }
 
+        &.current--user {
+            .post__link {
+                margin: 0 0 8px;
+            }
+        }
+
         &.same--root {
             &.same--user {
                 .post__header {
@@ -355,9 +362,10 @@
                     margin-top: 10px;
                 }
 
-                button.close {
+                .close {
                     font-size: 27px;
                     font-weight: normal;
+                    margin-top: -2px;
                 }
 
                 .modal-title {
@@ -453,8 +461,8 @@
                         }
 
                         &.minimize-settings {
-                            padding: 0;
                             display: none;
+                            padding: 0;
 
                             .user-settings {
                                 padding: 70px 20px 30px;
@@ -469,13 +477,12 @@
                     .nav {
                         > li {
                             > a {
-                                border-top: 1px solid #dddddd;
+                                border-top: 1px solid transparent;
                                 font-size: 1.1em;
                                 line-height: 2.7;
-                                color: #555555;
 
-                                .glyphicon {
-                                    margin-left: 7px;
+                                .icon {
+                                    margin: 0 7px;
                                 }
                             }
                         }
@@ -667,7 +674,8 @@
             padding: 7px 20px 0 49px;
             position: relative;
 
-            .glyphicon-refresh-animate {
+            .icon--refresh {
+                @include opacity(.6);
                 color: $black;
                 right: 33px;
                 top: 15px;
@@ -793,7 +801,6 @@
         @include translate3d(100%, 0, 0);
         right: 0;
         width: 100%;
-        z-index: 5;
 
         .sidebar__collapse,
         .sidebar__search-icon {
diff --git a/webapp/sass/responsive/_tablet.scss b/webapp/sass/responsive/_tablet.scss
index 69443aafc..d58e99969 100644
--- a/webapp/sass/responsive/_tablet.scss
+++ b/webapp/sass/responsive/_tablet.scss
@@ -16,7 +16,6 @@
     .sidebar--right {
         @include single-transition(all, .5s, ease);
         @include translateX(100%);
-        z-index: 5;
 
         &.move--left {
             -webkit-transform: translateX(0) !important;
@@ -113,22 +112,25 @@
 
     .post {
         &.post--compact {
-            &:not(.post--thread) {
-                padding: 5px .5em 0 70px;
-
-                .post__link {
-                    margin: 4px 0 7px;
-                    vertical-align: bottom;
-                }
 
+            .channel__wrap & {
                 .post__time {
                     font-size: .85em;
                     left: -70px;
                     position: absolute;
                     text-align: right;
-                    top: 4px;
+                    top: 6px;
                     width: 60px;
                 }
+            }
+
+            &:not(.post--thread) {
+                padding: 5px .5em 0 70px;
+
+                .post__link {
+                    margin: 4px 0 7px;
+                    vertical-align: bottom;
+                }
 
                 span {
                     p {
@@ -156,7 +158,7 @@
                     }
 
                     .col__reply {
-                        top: 2px;
+                        top: -1px;
                     }
                 }
 
@@ -176,7 +178,7 @@
                     &.post--comment {
                         .post__header {
                             .col__reply {
-                                top: 0;
+                                top: -1px;
                             }
                         }
                     }
@@ -191,7 +193,7 @@
                 }
 
                 .post__content {
-                    padding-right: 85px;
+                    padding-right: 45px;
                 }
             }
 
@@ -202,7 +204,7 @@
 
                     .post__header {
                         .col__reply {
-                            top: 4px;
+                            top: -1px;
                         }
                     }
 
@@ -211,6 +213,18 @@
                             display: none;
                         }
                     }
+
+                    &.post--root {
+                        .post__img {
+                            img {
+                                display: block;
+                            }
+                        }
+
+                        .post__time {
+                            @include opacity(.6);
+                        }
+                    }
                 }
 
                 &.post--comment {
@@ -241,26 +255,16 @@
             &.same--user {
                 .post__time {
                     @include opacity(0);
-                    font-size: 11px;
-                    left: -4px;
-                    line-height: 37px;
-                    position: absolute;
-                    text-rendering: auto;
-                    top: -2px;
                 }
 
-                &.post--compact {
-                    &.post--system {
-                        .post__time {
-                            position: absolute;
-                            top: 3px;
-                        }
-                    }
-
+                &:not(.post--compact) {
                     .post__time {
-                        font-size: .85em;
-                        left: -70px;
-                        top: -5px;
+                        font-size: 11px;
+                        left: -4px;
+                        line-height: 37px;
+                        position: absolute;
+                        text-rendering: auto;
+                        top: -2px;
                     }
                 }
             }