From d616c9226cb06b82e68d1d8cbedcb7ea41b0fe2c Mon Sep 17 00:00:00 2001
From: Pierre Ossman <ossman@cendio.se>
Date: Thu, 25 Aug 2016 20:49:52 +0200
Subject: [PATCH] Merge control bar sections

There is no status information in the centre anymore, so merge
the left and right sections of the control bar.
---
 app/styles/base.css | 15 +++------------
 vnc.html            |  4 +---
 2 files changed, 4 insertions(+), 15 deletions(-)

diff --git a/app/styles/base.css b/app/styles/base.css
index 96f830bb..3edd2adc 100644
--- a/app/styles/base.css
+++ b/app/styles/base.css
@@ -265,21 +265,12 @@ input[type=button]:active, select:active {
   display: inline;
 }
 
-/* Left side buttons */
-.noVNC_buttons_left {
-  float: left;
+.noVNC_buttons {
+  float: right;
   z-index: 1;
   position: relative;
-  padding-left: 10px;
-}
-
-/* Right side buttons */
-.noVNC_buttons_right {
-  float: right;
-  right: 0px;
-  z-index: 2;
-  position: absolute;
   padding-right: 10px;
+  padding-left: 10px;
 }
 
 /* XVP Shutdown/Reboot */
diff --git a/vnc.html b/vnc.html
index 9c677eec..f20b00c3 100644
--- a/vnc.html
+++ b/vnc.html
@@ -52,7 +52,7 @@
     <!-- noVNC Control Bar -->
     <div id="noVNC_control_bar" class="noVNC_status_normal">
 
-        <div class="noVNC_buttons_left">
+        <div class="noVNC_buttons">
 
             <!-- Drag/Pan the viewport -->
             <input type="image" alt="viewport drag" src="app/images/drag.svg"
@@ -87,9 +87,7 @@
                     </div>
                 </div>
             </div>
-        </div>
 
-        <div class="noVNC_buttons_right">
             <!-- Send Ctrl+Alt+Delete -->
             <input type="image" alt="Ctrl+Alt+Del" src="app/images/ctrlaltdel.svg"
                 id="noVNC_send_ctrl_alt_del_button" class="noVNC_button"