GUACAMOLE-152: Fix up new zoom control style.
Project: http://git-wip-us.apache.org/repos/asf/guacamole-client/repo Commit: http://git-wip-us.apache.org/repos/asf/guacamole-client/commit/b4c8bc80 Tree: http://git-wip-us.apache.org/repos/asf/guacamole-client/tree/b4c8bc80 Diff: http://git-wip-us.apache.org/repos/asf/guacamole-client/diff/b4c8bc80 Branch: refs/heads/master Commit: b4c8bc8058b9b367c3769a34ccfffdd5aa5458ea Parents: 10b0afe Author: Nick Couchman <[email protected]> Authored: Fri May 11 06:29:05 2018 -0400 Committer: Nick Couchman <[email protected]> Committed: Fri May 11 06:29:05 2018 -0400 ---------------------------------------------------------------------- guacamole/src/main/webapp/app/client/styles/menu.css | 15 +++++++++++++-- .../src/main/webapp/app/client/templates/client.html | 8 +++++--- 2 files changed, 18 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/guacamole-client/blob/b4c8bc80/guacamole/src/main/webapp/app/client/styles/menu.css ---------------------------------------------------------------------- diff --git a/guacamole/src/main/webapp/app/client/styles/menu.css b/guacamole/src/main/webapp/app/client/styles/menu.css index 3fb6f57..4021d3c 100644 --- a/guacamole/src/main/webapp/app/client/styles/menu.css +++ b/guacamole/src/main/webapp/app/client/styles/menu.css @@ -134,8 +134,19 @@ padding-top: 1em; } -.menu-section .zoom-ctrl { - width: 4em; +.menu-section input.zoom-ctrl { + width: 2em; + font-size: 1em; + padding: 0; + background: transparent; + border-color: rgba(0, 0, 0, 0.125); +} + +.menu-section div.zoom-ctrl { + font-size: 1.5em; + display: inline; + align-content: center; + vertical-align: middle; } .menu-section .zoom-ctrl::-webkit-inner-spin-button, http://git-wip-us.apache.org/repos/asf/guacamole-client/blob/b4c8bc80/guacamole/src/main/webapp/app/client/templates/client.html ---------------------------------------------------------------------- diff --git a/guacamole/src/main/webapp/app/client/templates/client.html b/guacamole/src/main/webapp/app/client/templates/client.html index f79163b..5abea64 100644 --- a/guacamole/src/main/webapp/app/client/templates/client.html +++ b/guacamole/src/main/webapp/app/client/templates/client.html @@ -151,9 +151,11 @@ <div class="content"> <div id="zoom-settings"> <div ng-click="zoomOut()" id="zoom-out"><img src="images/settings/zoom-out.png" alt="-"/></div> - <input type="number" class="zoom-ctrl" guac-zoom-ctrl - ng-model="client.clientProperties.scale" - ng-model-options="{ updateOn: 'blur submit' }" />% + <div class="zoom-ctrl"> + <input type="number" class="zoom-ctrl" guac-zoom-ctrl + ng-model="client.clientProperties.scale" + ng-model-options="{ updateOn: 'blur submit' }" />% + </div> <div ng-click="zoomIn()" id="zoom-in"><img src="images/settings/zoom-in.png" alt="+"/></div> </div> <div><label><input ng-model="menu.autoFit" ng-change="changeAutoFit()" ng-disabled="autoFitDisabled()" type="checkbox" id="auto-fit"/> {{'CLIENT.TEXT_ZOOM_AUTO_FIT' | translate}}</label></div>
