Merge git://github.com/tootsuite/mastodon into tootsuite-master

2017-07-25 21:36:22 +02:00
parent 852acbd738 7232cdf7e8
commit 7e5691804d
139 changed files with 1196 additions and 758 deletions
--- a/app/javascript/styles/stream_entries.scss
+++ b/app/javascript/styles/stream_entries.scss
@@ -36,6 +36,18 @@
    }
  }

+  &.with-header {
+    .entry {
+      &:first-child {
+        &,
+        .detailed-status.light,
+        .status.light {
+          border-radius: 0;
+        }
+      }
+    }
+  }
+
  .status.light {
    padding: 14px 14px 14px (48px + 14px * 2);
    position: relative;
@@ -247,7 +259,9 @@
    border: medium none;
    display: block;
    flex: 1 1 auto;
+    width: 100%;
    height: 100%;
+    overflow: hidden;
    margin-right: 2px;

    &:last-child {