diff --git a/res/app/components/stf/basic-mode/basic-mode.css b/res/app/components/stf/basic-mode/basic-mode.css index 2de0a7e1..e21d5d98 100644 --- a/res/app/components/stf/basic-mode/basic-mode.css +++ b/res/app/components/stf/basic-mode/basic-mode.css @@ -11,8 +11,8 @@ } .basic-mode .stf-vnc-bottom .btn-lg { - padding: 5px; - font-size: 12px; + /*padding: 5px;*/ + /*font-size: 12px;*/ } .basic-mode .stf-vnc-bottom .btn-primary:hover, diff --git a/res/app/components/stf/screen/screen-directive.js b/res/app/components/stf/screen/screen-directive.js index 93ed27d4..604e9cd9 100644 --- a/res/app/components/stf/screen/screen-directive.js +++ b/res/app/components/stf/screen/screen-directive.js @@ -7,7 +7,7 @@ module.exports = function DeviceScreenDirective($document, ScalingService, Vendo link: function (scope, element) { var canvas = element.find('canvas')[0] , imageRender = new FastImageRender(canvas, {render: 'canvas', timeout: 1000}) - , guestDisplayDensity = BrowserInfo.mobile && BrowserInfo.retina ? 1.5 : 1 + , guestDisplayDensity = setDisplayDensity(1.5) , guestDisplayRotation = 0 , finger = element.find('span') , input = element.find('textarea') @@ -26,6 +26,10 @@ module.exports = function DeviceScreenDirective($document, ScalingService, Vendo scope.$on('panelsResized', updateBounds) + function setDisplayDensity(forRetina) { + return guestDisplayDensity = BrowserInfo.mobile && BrowserInfo.retina ? forRetina : 1 + } + function sendTouch(type, e) { var x = e.offsetX || e.layerX || 0 var y = e.offsetY || e.layerY || 0 @@ -150,8 +154,8 @@ module.exports = function DeviceScreenDirective($document, ScalingService, Vendo if (!loading && scope.$parent.showScreen && scope.device) { loading = true imageRender.load(scope.device.display.url + - '?width=' + Math.floor(boundingWidth * guestDisplayDensity) + - '&height=' + Math.floor(boundingHeight * guestDisplayDensity) + + '?width=' + Math.ceil(boundingWidth * guestDisplayDensity) + + '&height=' + Math.ceil(boundingHeight * guestDisplayDensity) + '&time=' + Date.now() ) } @@ -309,6 +313,7 @@ module.exports = function DeviceScreenDirective($document, ScalingService, Vendo scope.$on('guest-landscape', function () { scope.control.rotate(90) + setDisplayDensity(2) updateBounds() }) diff --git a/res/app/device-list/device-list.css b/res/app/device-list/device-list.css index 8ae3a4ac..b8513b6b 100644 --- a/res/app/device-list/device-list.css +++ b/res/app/device-list/device-list.css @@ -35,6 +35,10 @@ margin-top: 4px; } +.stf-device-list .device-search { + width: 150px; +} + ul.devices-icon-view { margin: 0; display: inline-block; diff --git a/res/app/device-list/device-list.jade b/res/app/device-list/device-list.jade index 58004237..b98ede3b 100644 --- a/res/app/device-list/device-list.jade +++ b/res/app/device-list/device-list.jade @@ -14,7 +14,7 @@ div.stf-device-list .filtering-buttons.pull-right input(type='search',results='5', autosave='deviceSearch' name='deviceSearch', ng-model='deviceSearch', ng-change='deviceSearchChanged()', - autocorrect='off', autocapitalize='off', spellcheck='false').xform-control + autocorrect='off', autocapitalize='off', spellcheck='false').xform-control.device-search //.input-group input(type='text').form-control diff --git a/res/app/menu/menu.css b/res/app/menu/menu.css index 2d4d0612..4ac7f1d8 100644 --- a/res/app/menu/menu.css +++ b/res/app/menu/menu.css @@ -1,5 +1,5 @@ .stf-menu .stf-logo { - background: url(../../bower_components/stf-graphics/logo/exports/STF-128.png) no-repeat 0 0; + background: url(../../bower_components/stf-graphics/logo/exports/STF-512.png) no-repeat 0 0; width: 32px; height: 32px; float: left; diff --git a/res/auth-ldap/images/logo-128.png b/res/auth-ldap/images/logo-128.png deleted file mode 100644 index e360432e..00000000 Binary files a/res/auth-ldap/images/logo-128.png and /dev/null differ diff --git a/res/auth-ldap/views/partials/signin.jade b/res/auth-ldap/views/partials/signin.jade index c2c3782d..bef14f01 100644 --- a/res/auth-ldap/views/partials/signin.jade +++ b/res/auth-ldap/views/partials/signin.jade @@ -1,7 +1,7 @@ .login2 .login-wrapper a(href='./') - img(width='128', height='128', src='/static/bower_components/stf-graphics/logo/exports/STF-128.png', title='STF') + img(width='128', height='128', src='/static/bower_components/stf-graphics/logo/exports/STF-512.png', title='STF') form(name='signin', novalidate, ng-submit='submit()') .alert.alert-danger(ng-show='error') diff --git a/res/auth-mock/images/logo-128.png b/res/auth-mock/images/logo-128.png deleted file mode 100644 index e360432e..00000000 Binary files a/res/auth-mock/images/logo-128.png and /dev/null differ diff --git a/res/auth-mock/views/partials/signin.jade b/res/auth-mock/views/partials/signin.jade index 4f43b257..40ef6773 100644 --- a/res/auth-mock/views/partials/signin.jade +++ b/res/auth-mock/views/partials/signin.jade @@ -1,7 +1,7 @@ .login2 .login-wrapper a(href='./') - img(width='128', height='128', src='/static/bower_components/stf-graphics/logo/exports/STF-128.png', title='STF') + img(width='128', height='128', src='/static/bower_components/stf-graphics/logo/exports/STF-512.png', title='STF') form(name='signin', novalidate, ng-submit='submit()') .alert.alert-danger(ng-show='error')