From e2b59c0741b6338e3fa2604064a07037842c8031 Mon Sep 17 00:00:00 2001 From: Gunther Brunner Date: Mon, 14 Apr 2014 16:21:40 +0900 Subject: [PATCH] Fix the device screen height filling the parent. --- res/app/control-panes/control-panes.jade | 2 +- res/app/control-panes/device-control/device-control.jade | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/res/app/control-panes/control-panes.jade b/res/app/control-panes/control-panes.jade index 9c8ba1b5..3557a8c4 100644 --- a/res/app/control-panes/control-panes.jade +++ b/res/app/control-panes/control-panes.jade @@ -4,7 +4,7 @@ div catch-all-keys(keys-down='keysDown($event)', keys-up='keysUp($event)') .remote-control //include control-screen - div(ng-include='"control-panes/device-control/device-control.jade"') + div(ng-include='"control-panes/device-control/device-control.jade"').fill-height div(pane, pane-anchor='south', pane-size='30% + 2px', pane-handle='4').pane-bottom-p .widget-container.fluid-height diff --git a/res/app/control-panes/device-control/device-control.jade b/res/app/control-panes/device-control/device-control.jade index d9704f48..20cb05b7 100644 --- a/res/app/control-panes/device-control/device-control.jade +++ b/res/app/control-panes/device-control/device-control.jade @@ -38,8 +38,8 @@ i.fa.fa-times .as-row.fill-height(ng-file-drop='controll.install($files)') - div(ng-controller='DeviceScreenCtrl') - device-screen(style='width: 400px; height: 600px; background: gray') + div(ng-controller='DeviceScreenCtrl').fill-height + device-screen(style='width: 100%; height: 100%; background: gray') .stf-vnc-bottom.as-row .controls