Skip to content

[stable12] Allow to change avatar when groups are disables #5278

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
MorrisJobke merged 1 commit into from
Jun 7, 2017
Merged

[stable12] Allow to change avatar when groups are disables #5278

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions settings/css/settings.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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');
Expand Down Expand Up @@ -226,8 +230,7 @@ input#openid, input#webdav {
}

#lostpassword,
#groups,
#passwordform {
#groups {
display: inline-block;
margin-bottom: 0;
padding-bottom: 0;
Expand Down
4 changes: 3 additions & 1 deletion settings/templates/personal.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -353,7 +355,7 @@

<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>
Expand Down