From 2e612ac70b7b9747a798af005e5375b5331fcab0 Mon Sep 17 00:00:00 2001
From: Michael Jumper <mike.jumper@guac-dev.org>
Date: Wed, 18 Feb 2015 16:31:46 -0800
Subject: [PATCH] GUAC-1052: Migrate to flexbox layout for client view.

---
 .../main/webapp/app/client/styles/client.css  | 18 ++++++++--
 .../webapp/app/client/templates/client.html   | 34 ++++++++++---------
 2 files changed, 33 insertions(+), 19 deletions(-)

diff --git a/guacamole/src/main/webapp/app/client/styles/client.css b/guacamole/src/main/webapp/app/client/styles/client.css
index 04bd3af67..db405fff1 100644
--- a/guacamole/src/main/webapp/app/client/styles/client.css
+++ b/guacamole/src/main/webapp/app/client/styles/client.css
@@ -39,6 +39,19 @@ body.client {
 
 .client-view {
 
+    position: absolute;
+    top: 0;
+    left: 0;
+
+    width: 100%;
+    height: 100%;
+
+    font-size: 0px;
+
+}
+
+.client-view-content {
+
     /* IE10 */
     display: -ms-flexbox;
     -ms-flex-align: stretch;
@@ -69,12 +82,11 @@ body.client {
     flex-direction: column;
     flex-pack: end;
 
-    position: absolute;
-    top: 0;
-    left: 0;
     width: 100%;
     height: 100%;
 
+    font-size: 12pt;
+
 }
 
 .client-view .client-body {
diff --git a/guacamole/src/main/webapp/app/client/templates/client.html b/guacamole/src/main/webapp/app/client/templates/client.html
index 8505df0bf..9d8e2cb9b 100644
--- a/guacamole/src/main/webapp/app/client/templates/client.html
+++ b/guacamole/src/main/webapp/app/client/templates/client.html
@@ -24,30 +24,32 @@
 
     <!-- Client view -->
     <div class="client-view">
+        <div class="client-view-content">
 
-        <!-- Central portion of view -->
-        <div class="client-body" guac-touch-drag="clientDrag" guac-touch-pinch="clientPinch">
+            <!-- Central portion of view -->
+            <div class="client-body" guac-touch-drag="clientDrag" guac-touch-pinch="clientPinch">
 
-            <!-- Client -->
-            <guac-client client="client"></guac-client>
+                <!-- 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>
 
-            <!-- On-screen keyboard -->
-            <div class="keyboard-container" ng-show="showOSK">
-                <guac-osk layout="'CLIENT.URL_OSK_LAYOUT' | translate"></guac-osk>
+            <!-- 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>
+
+                <!-- On-screen keyboard -->
+                <div class="keyboard-container" ng-show="showOSK">
+                    <guac-osk layout="'CLIENT.URL_OSK_LAYOUT' | translate"></guac-osk>
+                </div>
+
             </div>
 
         </div>
-
     </div>
 
     <!-- Menu -->