diff options
| author | Bjoern Schiessle <schiessle@owncloud.com> | 2013-10-04 12:30:49 +0200 |
|---|---|---|
| committer | Bjoern Schiessle <schiessle@owncloud.com> | 2013-10-04 12:30:49 +0200 |
| commit | 51295e9a6b9cd8e351132e988858b5d4bd223968 (patch) | |
| tree | 7d2da02957552a8ac49eb6f2f3bd6b08e1049406 /settings | |
| parent | a223cf769a670c1c8926baf4ded445af300d056d (diff) | |
| parent | 514d7a884a5211fe246487421ea8103202d004d7 (diff) | |
| download | nextcloud-server-51295e9a6b9cd8e351132e988858b5d4bd223968.tar.gz nextcloud-server-51295e9a6b9cd8e351132e988858b5d4bd223968.zip | |
Merge branch 'master' into sharing_mail_notification_master
Conflicts:
apps/files/index.php
apps/files/templates/index.php
Diffstat (limited to 'settings')
| -rw-r--r-- | settings/css/settings.css | 27 | ||||
| -rw-r--r-- | settings/js/personal.js | 12 |
2 files changed, 31 insertions, 8 deletions
diff --git a/settings/css/settings.css b/settings/css/settings.css index 57a43180a43..0afdd9edbfa 100644 --- a/settings/css/settings.css +++ b/settings/css/settings.css @@ -47,18 +47,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%;} diff --git a/settings/js/personal.js b/settings/js/personal.js index a923b475731..3fdc2907c46 100644 --- a/settings/js/personal.js +++ b/settings/js/personal.js @@ -45,12 +45,16 @@ function changeDisplayName(){ } } -function updateAvatar () { +function updateAvatar (hidedefault) { $headerdiv = $('#header .avatardiv'); $displaydiv = $('#displayavatar .avatardiv'); - $headerdiv.css({'background-color': ''}); - $headerdiv.avatar(OC.currentUser, 32, true); + if(hidedefault) { + $headerdiv.hide(); + } else { + $headerdiv.css({'background-color': ''}); + $headerdiv.avatar(OC.currentUser, 32, true); + } $displaydiv.css({'background-color': ''}); $displaydiv.avatar(OC.currentUser, 128, true); } @@ -232,7 +236,7 @@ $(document).ready(function(){ type: 'DELETE', url: OC.Router.generate('core_avatar_delete'), success: function(msg) { - updateAvatar(); + updateAvatar(true); } }); }); |