safebox/guacamole-client
4
0
Fork 0
mirror of https://github.com/gyurix1968/guacamole-client.git synced 2025-09-08 06:01:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

GUAC-1052: Migrate to flexbox layout for client view.

Browse Source
This commit is contained in:
Michael Jumper
2015-02-18 16:31:46 -08:00
parent 7a4c606efd
commit 2e612ac70b
2 changed files with 33 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
guacamole/src/main/webapp/app/client/styles/client.css
View File

@@ -39,6 +39,19 @@ body.client {
.client-view { .client-view {
position: absolute;
top: 0;
left: 0;
width: 100%;
height: 100%;
font-size: 0px;
}
.client-view-content {
/* IE10 */ /* IE10 */
display: -ms-flexbox; display: -ms-flexbox;
-ms-flex-align: stretch; -ms-flex-align: stretch;
@@ -69,12 +82,11 @@ body.client {
flex-direction: column; flex-direction: column;
flex-pack: end; flex-pack: end;
position: absolute;
top: 0;
left: 0;
width: 100%; width: 100%;
height: 100%; height: 100%;
font-size: 12pt;
} }
.client-view .client-body { .client-view .client-body {

34
guacamole/src/main/webapp/app/client/templates/client.html
View File

@@ -24,30 +24,32 @@
<!-- Client view --> <!-- Client view -->
<div class="client-view"> <div class="client-view">
<div class="client-view-content">
<!-- Central portion of view --> <!-- Central portion of view -->
<div class="client-body" guac-touch-drag="clientDrag" guac-touch-pinch="clientPinch"> <div class="client-body" guac-touch-drag="clientDrag" guac-touch-pinch="clientPinch">
<!-- Client --> <!-- Client -->
<guac-client client="client"></guac-client> <guac-client client="client"></guac-client>
</div>
<!-- Bottom portion of view -->
<div class="client-bottom">
<!-- Text input -->
<div class="text-input-container" ng-show="showTextInput">
<guac-text-input needs-focus="showTextInput"></guac-text-input>
</div> </div>
<!-- On-screen keyboard --> <!-- Bottom portion of view -->
<div class="keyboard-container" ng-show="showOSK"> <div class="client-bottom">
<guac-osk layout="'CLIENT.URL_OSK_LAYOUT' | translate"></guac-osk>
<!-- Text input -->
<div class="text-input-container" ng-show="showTextInput">
<guac-text-input needs-focus="showTextInput"></guac-text-input>
</div>
<!-- On-screen keyboard -->
<div class="keyboard-container" ng-show="showOSK">
<guac-osk layout="'CLIENT.URL_OSK_LAYOUT' | translate"></guac-osk>
</div>
</div> </div>
</div> </div>
</div> </div>
<!-- Menu --> <!-- Menu -->