OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #3741 from vector-im/dbkr/remove_unused_droptarget_placeholder 

Remove unused `placeholder` prop on RoomDropTarget
pull/3742/head
Luke Barnard 2017-04-26 16:46:48 +01:00 committed by GitHub
parent c070e86c1f 7b3719bc3c
commit 71685b5eab
2 changed files with 6 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/components/views/rooms/RoomDropTarget.js
View File

@ -22,20 +22,12 @@ module.exports = React.createClass({
displayName: 'RoomDropTarget', displayName: 'RoomDropTarget',
render: function() { render: function() {
if (this.props.placeholder) { return (
return ( <div className="mx_RoomDropTarget">
<div className="mx_RoomDropTarget mx_RoomDropTarget_placeholder"> <div className="mx_RoomDropTarget_label">
{ this.props.label }
</div> </div>
); </div>
} );
else {
return (
<div className="mx_RoomDropTarget">
<div className="mx_RoomDropTarget_label">
{ this.props.label }
</div>
</div>
);
}
} }
}); });

5
src/skins/vector/css/vector-web/views/rooms/_RoomDropTarget.scss
View File

@ -33,11 +33,6 @@ limitations under the License.
margin-left: 10px; margin-left: 10px;
} }
.mx_RoomDropTarget_placeholder {
padding-top: 1px;
padding-bottom: 1px;
}
.mx_RoomDropTarget_label { .mx_RoomDropTarget_label {
position: relative; position: relative;
margin-top: 3px; margin-top: 3px;