diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2017-06-07 11:43:02 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-07 11:43:02 -0500 |
| commit | e934e5104d386ebeb0768eaab8188c8af24093ea (patch) | |
| tree | 0e301f64b316f7d0392d722f502193672e9f1d5a | |
| parent | 3678be045ee03af574875952f071704a6a4c6000 (diff) | |
| parent | 3ad4a2839f83268f3e31bc7971c9432515628b4a (diff) | |
| download | nextcloud-server-e934e5104d386ebeb0768eaab8188c8af24093ea.tar.gz nextcloud-server-e934e5104d386ebeb0768eaab8188c8af24093ea.zip | |
Merge pull request #5277 from nextcloud/fix-personal-settings-regression
Allow to change avatar when groups are disables
| -rw-r--r-- | settings/css/settings.css | 7 | ||||
| -rw-r--r-- | settings/templates/personal.php | 4 |
2 files changed, 8 insertions, 3 deletions
diff --git a/settings/css/settings.css b/settings/css/settings.css index 1280f5237a4..5e97f1bb668 100644 --- a/settings/css/settings.css +++ b/settings/css/settings.css @@ -12,6 +12,10 @@ input#openid, input#webdav { /* PERSONAL */ +.clear { + clear: both; +} + /* icons for sidebar */ .nav-icon-personal-settings { background-image: url('../img/personal.svg?v=1'); @@ -226,8 +230,7 @@ input#openid, input#webdav { } #lostpassword, -#groups, -#passwordform { +#groups { display: inline-block; margin-bottom: 0; padding-bottom: 0; diff --git a/settings/templates/personal.php b/settings/templates/personal.php index 5dc6abf2b38..7a301e5e63f 100644 --- a/settings/templates/personal.php +++ b/settings/templates/personal.php @@ -239,6 +239,8 @@ </div> </div> +<div class="clear"></div> + <?php if ($_['showGroupMembership'] === true): ?> <div id="groups" class="section"> <h2><?php p($l->t('Groups')); ?></h2> @@ -353,7 +355,7 @@ if($_['passwordChangeSupported']) { <h3><?php p($l->t('App passwords'));?></h3> <p class="settings-hint"><?php p($l->t('Here you can generate individual passwords for apps so you don’t have to give out your password. You can revoke them individually too.'));?></p> - + <div id="app-password-form"> <input id="app-password-name" type="text" placeholder="<?php p($l->t('App name')); ?>"> <button id="add-app-password" class="button"><?php p($l->t('Create new app password')); ?></button> |