Splits Controls overlap in files and users.

diff --git a/core/css/styles.css b/core/css/styles.css
index fb14ad27acc1d5392bdedfe9e13b418018b720ae..43ee9158355a44f87a570e02c2e5bbea7b76c0f3 100644 (file)
--- 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 878ee55589006804feb597e3df7a59aaa8565d7e..7d33d2afb9216d7709337e01e72063a175cd4ce2 100644 (file)
--- 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 1dde76e5bd4404e1a0de4201cc2dea42e1221724..83b54543b02e405e092aa8f3cd36cfd75eef5325 100644 (file)
--- 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"