From fe9c271d443382fbd61abd597d780bee2c9e7f04 Mon Sep 17 00:00:00 2001
From: Tim Lange <tim.lange@online.de>
Date: Wed, 10 Apr 2019 19:00:39 +0200
Subject: [PATCH] FIX: Fixed deleted posts layout (#7348)

---
 .../discourse/components/user-stream.js.es6            | 10 ++++++++++
 app/assets/javascripts/discourse/templates/user.hbs    |  2 +-
 .../stylesheets/common/components/user-stream.scss     |  7 +++++++
 test/javascripts/acceptance/user-anonymous-test.js.es6 |  2 ++
 4 files changed, 20 insertions(+), 1 deletion(-)
 create mode 100644 app/assets/stylesheets/common/components/user-stream.scss

diff --git a/app/assets/javascripts/discourse/components/user-stream.js.es6 b/app/assets/javascripts/discourse/components/user-stream.js.es6
index 9060022d6f..be0ba24750 100644
--- a/app/assets/javascripts/discourse/components/user-stream.js.es6
+++ b/app/assets/javascripts/discourse/components/user-stream.js.es6
@@ -8,6 +8,16 @@ import { popupAjaxError } from "discourse/lib/ajax-error";
 import { getOwner } from "discourse-common/lib/get-owner";
 
 export default Ember.Component.extend(LoadMore, {
+  _initialize: function() {
+    const filter = this.get("stream.filter");
+    if (filter) {
+      this.set("classNames", [
+        "user-stream",
+        "filter-" + filter.toString().replace(",", "-")
+      ]);
+    }
+  }.on("init"),
+
   loading: false,
   eyelineSelector: ".user-stream .item",
   classNames: ["user-stream"],
diff --git a/app/assets/javascripts/discourse/templates/user.hbs b/app/assets/javascripts/discourse/templates/user.hbs
index 765b011da8..afee93b845 100644
--- a/app/assets/javascripts/discourse/templates/user.hbs
+++ b/app/assets/javascripts/discourse/templates/user.hbs
@@ -193,7 +193,7 @@
             {{/if}}
 
             {{#if canDeleteUser}}
-              <div>{{d-button action=(action "adminDelete") icon="exclamation-triangle" label="user.admin_delete" class="btn-danger"}}</div>
+              <div class='pull-right'>{{d-button action=(action "adminDelete") icon="exclamation-triangle" label="user.admin_delete" class="btn-danger"}}</div>
             {{/if}}
           </dl>
           {{plugin-outlet name="user-profile-secondary" args=(hash model=model)}}
diff --git a/app/assets/stylesheets/common/components/user-stream.scss b/app/assets/stylesheets/common/components/user-stream.scss
new file mode 100644
index 0000000000..56ab2a9a15
--- /dev/null
+++ b/app/assets/stylesheets/common/components/user-stream.scss
@@ -0,0 +1,7 @@
+.user-stream {
+  &.filter-deleted {
+    grid-column-start: 1;
+    grid-column-end: 3;
+    grid-row-start: 2;
+  }
+}
diff --git a/test/javascripts/acceptance/user-anonymous-test.js.es6 b/test/javascripts/acceptance/user-anonymous-test.js.es6
index f18791484a..2f4fbdf641 100644
--- a/test/javascripts/acceptance/user-anonymous-test.js.es6
+++ b/test/javascripts/acceptance/user-anonymous-test.js.es6
@@ -27,6 +27,8 @@ QUnit.test("Filters", async assert => {
 
   await visit("/u/eviltrout/activity/replies");
   hasStream(assert);
+
+  assert.ok(exists(".user-stream.filter-5"), "stream has filter class");
 });
 
 QUnit.test("Badges", async assert => {