4 files changed, 121 insertions, 19 deletions

diff --git a/webapp/sass/layout/_headers.scss b/webapp/sass/layout/_headers.scss
index 35fef8e08..7db561438 100644
--- a/webapp/sass/layout/_headers.scss
+++ b/webapp/sass/layout/_headers.scss
@@ -67,8 +67,9 @@
 
 .channel-intro {
     border-bottom: 1px solid $light-gray;
-    margin: 0 18px 35px;
-    padding: 0 0 5px;
+    margin: 0 auto 15px;
+    max-width: 990px;
+    padding: 0 15px;
 
     .intro-links {
         display: inline-block;
@@ -118,7 +119,8 @@
 
 // Team Header in Sidebar
 .sidebar--left,
-.sidebar--menu {
+.sidebar--menu,
+.admin-sidebar {
     .team__header {
         @include legacy-pie-clearfix;
         padding: 9px 10px;
diff --git a/webapp/sass/layout/_markdown.scss b/webapp/sass/layout/_markdown.scss
index cb29aa20e..9bac332d6 100644
--- a/webapp/sass/layout/_markdown.scss
+++ b/webapp/sass/layout/_markdown.scss
@@ -55,18 +55,14 @@
 
 .post-code__language {
     @include opacity(0);
-    @include translate3d(0, 0, 0);
+    @include transition(opacity, .6s);
     background: #21586d;
-    border-radius: 0 .25em;
+    border-radius: 0 0 0 2px;
     color: $white;
     padding: 4px 10px 5px;
     position: absolute;
     right: 0;
     top: 0;
-    -webkit-transition: opacity 0.6s;
-    -moz-transition: opacity 0.6s;
-    -o-transition: opacity 0.6s;
-    transition: opacity 0.6s;
     z-index: 5;
 }
 
diff --git a/webapp/sass/layout/_post.scss b/webapp/sass/layout/_post.scss
index a99c6d57c..e3818ea94 100644
--- a/webapp/sass/layout/_post.scss
+++ b/webapp/sass/layout/_post.scss
@@ -417,7 +417,8 @@ body.ios {
     .post-create-footer {
         @include clearfix;
         font-size: 13px;
-        padding: 3px 0 0 0;
+        padding: 3px 0 0;
+
         .control-label {
             font-weight: normal;
             margin-bottom: 0;
@@ -482,6 +483,80 @@ body.ios {
         background-color: beige;
     }
 
+    &.post--compact {
+
+        .markdown__heading {
+            font-size: 1em;
+            margin: 0 0 7px;
+        }
+
+        .post__body {
+            background: transparent !important;
+            margin-top: -1px;
+            padding: 3px 0;
+        }
+
+        .post-image__columns {
+            clear: both;
+        }
+
+        .post-image__column {
+            @include border-radius(2px);
+            font-size: .9em;
+            height: 26px;
+            line-height: 25px;
+            padding: 0 7px;
+            width: auto;
+
+            .post-image__thumbnail {
+                display: none;
+            }
+
+            .post-image__details {
+                background: transparent;
+                border: none;
+                padding: 0;
+                width: 100%;
+
+                > div {
+                    display: none;
+                }
+            }
+
+            .post-image__name {
+                @include clearfix;
+                display: block;
+                margin: 0;
+                padding-right: 10px;
+                text-overflow: ellipsis;
+                white-space: nowrap;
+
+                i {
+                    font-size: .9em;
+                    margin-right: 5px;
+                    opacity: .5;
+                }
+            }
+
+            a {
+                &:hover {
+                    text-decoration: none;
+                }
+            }
+        }
+
+        .post__img {
+            padding-top: 3px;
+            width: 28px;
+
+            img,
+            svg {
+                height: 20px;
+                width: 20px;
+            }
+        }
+    }
+
     p {
         font-size: .97em;
         line-height: 1.6em;
@@ -526,6 +601,12 @@ body.ios {
                 }
             }
 
+            .post__img {
+                img {
+                    display: none;
+                }
+            }
+
             .post__header {
                 height: 0;
                 margin: 0;
@@ -545,9 +626,11 @@ body.ios {
                 display: none;
             }
 
-            .post__img {
-                img {
-                    display: none;
+            &.same--user {
+                .post__img {
+                    img {
+                        display: none;
+                    }
                 }
             }
         }
@@ -644,11 +727,11 @@ body.ios {
     }
 
     .post__img {
-        width: 46px;
+        width: 42px;
 
         svg {
-            height: 36px;
-            width: 36px;
+            height: 32px;
+            width: 32px;
         }
 
         path {
@@ -657,9 +740,9 @@ body.ios {
 
         img {
             @include border-radius(50px);
-            height: 36px;
+            height: 32px;
             vertical-align: inherit;
-            width: 36px;
+            width: 32px;
         }
     }
 
@@ -731,6 +814,7 @@ body.ios {
         padding: .2em .5em;
         width: calc(100% - 75px);
         word-wrap: break-word;
+        position: relative;
 
         p {
             margin: 0 0 .4em;
@@ -796,6 +880,20 @@ body.ios {
                 margin-right: 8px;
             }
         }
+
+        .pending-post-actions {
+            position: absolute;
+            right: 0;
+            top: 0;
+            padding: 5px 7px;
+            background: rgba(0, 0, 0, .7);
+            color: white;
+            font-size: .9em;
+
+            a {
+                color: white;
+            }
+        }
     }
 
     .post__link {
diff --git a/webapp/sass/layout/_sidebar-left.scss b/webapp/sass/layout/_sidebar-left.scss
index 7ac1fee75..cc8f13730 100644
--- a/webapp/sass/layout/_sidebar-left.scss
+++ b/webapp/sass/layout/_sidebar-left.scss
@@ -40,7 +40,7 @@
     }
 
     .dropdown-menu {
-        max-height: 400px;
+        max-height: 80vh;
         max-width: 200px;
         overflow-x: hidden;
         overflow-y: auto;
@@ -140,6 +140,12 @@
                 text-transform: uppercase;
             }
 
+            .divider {
+                & + .divider {
+                    display: none;
+                }
+            }
+
             > a {
                 border-radius: 0;
                 line-height: 1.5;