From 7b3719bc3c8056660144ef61c180e9f4373c3ae6 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Wed, 26 Apr 2017 16:27:25 +0100
Subject: [PATCH] Remove unused `placeholder` prop on RoomDropTarget

---
 src/components/views/rooms/RoomDropTarget.js  | 20 ++++++-------------
 .../views/rooms/_RoomDropTarget.scss          |  5 -----
 2 files changed, 6 insertions(+), 19 deletions(-)

diff --git a/src/components/views/rooms/RoomDropTarget.js b/src/components/views/rooms/RoomDropTarget.js
index 1c5eb3c115..f5ca4f015d 100644
--- a/src/components/views/rooms/RoomDropTarget.js
+++ b/src/components/views/rooms/RoomDropTarget.js
@@ -22,20 +22,12 @@ module.exports = React.createClass({
     displayName: 'RoomDropTarget',
 
     render: function() {
-        if (this.props.placeholder) {
-            return (
-                <div className="mx_RoomDropTarget mx_RoomDropTarget_placeholder">
+        return (
+            <div className="mx_RoomDropTarget">
+                <div className="mx_RoomDropTarget_label">
+                    { this.props.label }
                 </div>
-            );
-        }
-        else {
-            return (
-                <div className="mx_RoomDropTarget">
-                    <div className="mx_RoomDropTarget_label">
-                        { this.props.label }
-                    </div>
-                </div>
-            );
-        }
+            </div>
+        );
     }
 });
diff --git a/src/skins/vector/css/vector-web/views/rooms/_RoomDropTarget.scss b/src/skins/vector/css/vector-web/views/rooms/_RoomDropTarget.scss
index e0a50a95c7..08229e377b 100644
--- a/src/skins/vector/css/vector-web/views/rooms/_RoomDropTarget.scss
+++ b/src/skins/vector/css/vector-web/views/rooms/_RoomDropTarget.scss
@@ -33,11 +33,6 @@ limitations under the License.
     margin-left: 10px;
 }
 
-.mx_RoomDropTarget_placeholder {
-    padding-top: 1px;
-    padding-bottom: 1px;
-}
-
 .mx_RoomDropTarget_label {
     position: relative;
     margin-top: 3px;