yetangitu/OpenSTF
1
0
Fork 0
mirror of https://github.com/openstf/stf synced 2025-10-05 10:39:25 +02:00
Code Issues Releases Wiki Activity

Merge branch 'jlhonora-master'

Browse source
This commit is contained in:
Gunther Brunner 2015-11-18 19:16:42 +09:00
commit e9d1a46a6a
2 changed files with 6 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

5
res/app/control-panes/device-control/device-control.css
View file

@ -183,7 +183,6 @@ device-screen input {
.stf-device-control .kick-device {
color: #9c9c9c;
margin-left: 25px;
}
.stf-device-control .kick-device:hover {
@ -269,6 +268,10 @@ device-screen input {
width: 12px;
}
.stf-device-control > .device-name-menu-element {
margin-left: 7px;
}
.no-transition {
-webkit-transition: none !important;
-moz-transition: none !important;

4
res/app/control-panes/device-control/device-control.jade
View file

@ -15,7 +15,7 @@
i(ng-show='showScreen', tooltip-html-unsafe='{{"Hide Screen"|translate}}', tooltip-placement='bottom').fa.fa-eye
i(ng-show='!showScreen', tooltip-html-unsafe='{{"Show Screen"|translate}}', tooltip-placement='bottom').fa.fa-eye-slash
.device-name-container(dropdown)
.device-name-container.pull-left(dropdown)
a.stf-vnc-device-name.pointer.unselectable(dropdown-toggle)
p
.device-small-image
@ -25,7 +25,7 @@
ul.dropdown-menu(role='menu', data-toggle='dropdown', ng-show='groupDevices.length > 0').pointer.unselectable
li(ng-repeat='groupDevice in groupDevices')
a(ng-click='controlDevice(groupDevice); $event.stopPropagation()')
a.device-name-menu-element(ng-click='controlDevice(groupDevice); $event.stopPropagation()')
.pull-left
.device-small-image
img(ng-src='/static/app/devices/icon/x24/{{ groupDevice.image || "E30HT.jpg" }}')