summaryrefslogtreecommitdiffstats
path: root/settings/css
diff options
context:
space:
mode:
authorJan-Christoph Borchardt <hey@jancborchardt.net>2013-10-04 17:08:34 +0300
committerJan-Christoph Borchardt <hey@jancborchardt.net>2013-10-04 17:08:34 +0300
commit041837de2c85d79a05d29933d87e9077dd31530c (patch)
treeb8e2f469f7ff22996928dea4c147dc162ad07230 /settings/css
parent3c13afee9837db9ba11f98ec8688f8a1163b81f1 (diff)
parent7337b341106b6ae093b8d56c4d885b497db6e5aa (diff)
downloadnextcloud-server-041837de2c85d79a05d29933d87e9077dd31530c.tar.gz
nextcloud-server-041837de2c85d79a05d29933d87e9077dd31530c.zip
merge master into input-simplify
Diffstat (limited to 'settings/css')
-rw-r--r--settings/css/settings.css27
1 files changed, 23 insertions, 4 deletions
diff --git a/settings/css/settings.css b/settings/css/settings.css
index 5f3e9c97dd5..40106072f89 100644
--- a/settings/css/settings.css
+++ b/settings/css/settings.css
@@ -55,18 +55,37 @@ tr:hover>td.remove>a { float:right; }
li.selected { background-color:#ddd; }
table:not(.nostyle) { width:100%; }
#rightcontent { padding-left: 1em; }
-div.quota { float:right; display:block; position:absolute; right:25em; top:-1px; }
+div.quota {
+ float: right;
+ display: block;
+ position: absolute;
+ right: 216px;
+ top: 0;
+}
div.quota-select-wrapper { position: relative; }
div.recoveryPassword { left:50em; display:block; position:absolute; top:-1px; }
input#recoveryPassword {width:15em;}
select.quota { position:absolute; left:0; top:0; width:10em; }
select.quota-user { position:relative; left:0; top:0; width:10em; }
-div.quota>span { position:absolute; right:0; white-space:nowrap; top:.7em; color:#888; text-shadow:0 1px 0 #fff; }
+div.quota>span {
+ position: absolute;
+ right: 0;
+ white-space: nowrap;
+ top: 12px;
+ color: #888;
+ text-shadow: 0 1px 0 #fff;
+}
select.quota.active { background: #fff; }
/* positioning fixes */
-#newuser { position:relative; top:-3px; }
-#newuser .multiselect { top:1px; }
+#newuser .multiselect {
+ min-width: 150px !important;
+}
+#newuser .multiselect,
+#newusergroups + input[type='submit'] {
+ position: relative;
+ top: 1px;
+}
#headerGroups, #headerSubAdmins, #headerQuota { padding-left:18px; }
.ie8 table.hascontrols{border-collapse:collapse;width: 100%;}