diff --git a/res/app/control-panes/dashboard/upload/upload.css b/res/app/control-panes/dashboard/upload/upload.css index e16e9784..f974e3b5 100644 --- a/res/app/control-panes/dashboard/upload/upload.css +++ b/res/app/control-panes/dashboard/upload/upload.css @@ -21,23 +21,18 @@ .stf-upload .drop-area { text-align: center; color: #b7b7b7; - - /*height: 100px;*/ padding: 10px; border: 3px #ccc dashed; - /*color: #aaa;*/ border-radius: 3px; background-color: #f6f6f6; cursor: pointer; } .stf-upload .drop-area .drop-area-text { - /*min-height: 130px;*/ font-size: 18px; } .stf-upload .dragover { - /*color: #157afb !important;*/ border-color: #157afb !important; } diff --git a/res/app/control-panes/device-control/device-control.css b/res/app/control-panes/device-control/device-control.css index 26b89808..d3833dd1 100644 --- a/res/app/control-panes/device-control/device-control.css +++ b/res/app/control-panes/device-control/device-control.css @@ -1,39 +1,43 @@ device-screen { - position: relative; - display: block; + position: relative; + display: block; } device-screen canvas { - position: absolute; - margin: auto; - top: 0; - right: 0; - bottom: 0; - left: 0; - pointer-events: none; /* MUST HAVE */ + position: absolute; + margin: auto; + top: 0; + right: 0; + bottom: 0; + left: 0; + pointer-events: none; /* MUST HAVE */ } device-screen .finger { - position: absolute; - border-radius: 50%; - background: lime; - opacity: 0.5; - width: 6mm; - height: 6mm; - top: -3mm; - left: -3mm; - pointer-events: none; - display: none; + position: absolute; + border-radius: 50%; + background: lime; + opacity: 0.5; + width: 6mm; + height: 6mm; + top: -3mm; + left: -3mm; + pointer-events: none; + display: none; } device-screen.fingering .finger { - display: block; + display: block; } device-screen textarea { - position: absolute; - z-index: 10; - outline: none; - pointer-events: none; - opacity: 0; + position: absolute; + z-index: 10; + outline: none; + pointer-events: none; + opacity: 0; +} + +.stf-device-control .dragover { + opacity: 0.7; } \ No newline at end of file diff --git a/res/app/control-panes/device-control/device-control.jade b/res/app/control-panes/device-control/device-control.jade index 82bfbb81..c7b208c7 100644 --- a/res/app/control-panes/device-control/device-control.jade +++ b/res/app/control-panes/device-control/device-control.jade @@ -1,4 +1,4 @@ -.interact-control.fill-height.as-table +.interact-control.fill-height.as-table.stf-device-control .as-cell.fill-height .as-table.fill-height @@ -16,8 +16,8 @@ - .as-row.fill-height - div(ng-controller='DeviceScreenCtrl', ng-file-drop='$root.install($files)') + .as-row.fill-height(ng-file-drop='$root.install($files)') + div(ng-controller='DeviceScreenCtrl') device-screen(style='width: 400px; height: 600px; background: gray') .stf-vnc-bottom.as-row