Merge remote-tracking branch 'origin/open1344' into open-1348

This commit is contained in:
larkin
2015-06-29 14:58:27 -07:00
3 changed files with 29 additions and 78 deletions

View File

@@ -20,14 +20,13 @@
at runtime from the About dialog for additional information.
-->
<div class="t-fixed-position l-fixed-position"
ng-controller="FixedController as controller"
mct-resize="controller.setBounds(bounds)">
ng-controller="FixedController as controller">
<!-- Background grid -->
<div class="l-grid-holder" ng-click="controller.clearSelection()">
<div class="l-grid l-grid-x"
<div class="l-grid l-grid-x"
ng-style="{ 'background-size': controller.getGridSize() [0] + 'px 100%' }"></div>
<div class="l-grid l-grid-y"
<div class="l-grid l-grid-y"
ng-style="{ 'background-size': '100% ' + controller.getGridSize() [1] + 'px' }"></div>
</div>
@@ -60,4 +59,4 @@
</div>
</span>
</div>
</div>