Merge branch 'develop' into ghost-panel

This commit is contained in:
Torkel Ödegaard 2015-03-24 19:53:56 +01:00
commit e6918c4b99

View File

@ -86,14 +86,6 @@
<panel-loader type="panel.type" class="panel-margin"></panel-loader>
</div>
<div panel-ghost-panel class="panel ghost-panel panel-margin">
<div class="panel-container">
<div style="text-align: center">
<h2>Add panel</h2>
</div>
</div>
</div>
<div panel-drop-zone class="panel panel-drop-zone"
ui-on-drop="onDrop($data, row)"
data-drop="true">