summaryrefslogtreecommitdiffstats
path: root/settings
diff options
context:
space:
mode:
authorJan-Christoph Borchardt <hey@jancborchardt.net>2014-06-06 12:22:09 +0200
committerJan-Christoph Borchardt <hey@jancborchardt.net>2014-06-06 12:22:09 +0200
commit23c83c076cdb3de039de7d1eafa2764247faefa4 (patch)
tree1e6eda99a9acdf017cb4ab226842489746745ef6 /settings
parent289accc31bd2adb98833e470162483119924e2e9 (diff)
downloadnextcloud-server-23c83c076cdb3de039de7d1eafa2764247faefa4.tar.gz
nextcloud-server-23c83c076cdb3de039de7d1eafa2764247faefa4.zip
unify controls bar, remove duplicate from user management
Diffstat (limited to 'settings')
-rw-r--r--settings/css/settings.css11
-rw-r--r--settings/templates/users/part.createuser.php2
2 files changed, 1 insertions, 12 deletions
diff --git a/settings/css/settings.css b/settings/css/settings.css
index 638d2fc576b..5fd16b2da86 100644
--- a/settings/css/settings.css
+++ b/settings/css/settings.css
@@ -5,17 +5,6 @@
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: 250px;
- height: 44px;
- padding: 0; margin: 0;
- background: #eee; border-bottom: 1px solid #e7e7e7;
- z-index: 50;
-}
-
/* PERSONAL */
#rootcert_import {
margin: 0 0 10px 0;
diff --git a/settings/templates/users/part.createuser.php b/settings/templates/users/part.createuser.php
index 4d573168fc1..3dfd27ee52d 100644
--- a/settings/templates/users/part.createuser.php
+++ b/settings/templates/users/part.createuser.php
@@ -1,4 +1,4 @@
-<div id="user-controls">
+<div id="controls">
<form id="newuser" autocomplete="off">
<input id="newusername" type="text"
placeholder="<?php p($l->t('Login Name'))?>"