From 43ced8c6c76eff0f258bf055ca7049e407043a33 Mon Sep 17 00:00:00 2001
From: raghunayyar <me@iraghu.com>
Date: Tue, 28 Jan 2014 12:29:04 +0530
Subject: [PATCH] Splits Controls overlap in files and users.

---
 core/css/styles.css          | 5 ++++-
 settings/css/settings.css    | 7 +++++++
 settings/templates/users.php | 2 +-
 3 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/core/css/styles.css b/core/css/styles.css
index fb14ad27acc..43ee9158355 100644
--- a/core/css/styles.css
+++ b/core/css/styles.css
@@ -309,7 +309,7 @@ input[type="submit"].enabled {
 	position: fixed;
 	top:45px;
 	right: 0;
-	left:380px;
+	left:0;
 	height: 44px;
 	width: 100%;
 	padding: 0;
@@ -320,6 +320,9 @@ input[type="submit"].enabled {
 }
 /* account for shift of controls bar due to app navigation */
 #body-user #controls,
+#body-settings #controls {
+	padding-left: 80px;
+}
 #controls .button,
 #controls button,
 #controls input[type='submit'],
diff --git a/settings/css/settings.css b/settings/css/settings.css
index 878ee555890..7d33d2afb92 100644
--- a/settings/css/settings.css
+++ b/settings/css/settings.css
@@ -5,6 +5,13 @@
 select#languageinput, select#timezone { width:15em; }
 input#openid, input#webdav { width:20em; }
 
+#user-controls {
+	-moz-box-sizing: border-box; -webkit-box-sizing: border-box; box-sizing: border-box;
+	position: fixed; right: 0; left:380px; height: 44px; width: 100%;
+	padding: 0; margin: 0;
+	background: #eee; border-bottom: 1px solid #e7e7e7;
+	z-index: 50;
+}
 
 /* PERSONAL */
 #rootcert_import {
diff --git a/settings/templates/users.php b/settings/templates/users.php
index 1dde76e5bd4..83b54543b02 100644
--- a/settings/templates/users.php
+++ b/settings/templates/users.php
@@ -75,7 +75,7 @@ $_['subadmingroups'] = array_flip($items);
 		</div>
 	</div>
 </div>
-<div id="controls">
+<div id="user-controls">
 	<form id="newuser" autocomplete="off">
 		<input id="newusername" type="text" placeholder="<?php p($l->t('Login Name'))?>" /> <input
 			type="password" id="newuserpassword"