Merge branch 'master' of github.com:grafana/grafana

This commit is contained in:
Torkel Ödegaard 2016-02-11 13:42:33 +01:00
commit 39bb9ce118

View File

@ -181,7 +181,7 @@
<li class="tight-form-item">
<editor-checkbox text="Right side" model="ctrl.panel.legend.rightSide" change="ctrl.render()"></editor-checkbox>
</li>
<li ng-if="panel.legend.rightSide" class="tight-form-item">
<li ng-if="ctrl.panel.legend.rightSide" class="tight-form-item">
Side width
</li>
<li ng-if="ctrl.panel.legend.rightSide" style="width: 105px">