Browse Source

Merge pull request #45245 from nextcloud/feat/split-user-columns

feat: Split display name and username columns
pull/45227/head
Pytal 1 year ago
committed by GitHub
parent
commit
28564f975f
No known key found for this signature in database GPG Key ID: B5690EEEBB952194
  1. 6
      apps/settings/src/components/Users/UserListHeader.vue
  2. 15
      apps/settings/src/components/Users/UserRow.vue
  3. 4
      apps/settings/src/components/Users/shared/styles.scss
  4. 6
      dist/settings-users-3239.js
  5. 2
      dist/settings-users-3239.js.map
  6. 6
      dist/settings-vue-settings-apps-users-management.js
  7. 2
      dist/settings-vue-settings-apps-users-management.js.map

6
apps/settings/src/components/Users/UserListHeader.vue

@ -35,7 +35,11 @@
<strong>
{{ t('settings', 'Display name') }}
</strong>
<span class="header__subtitle">
</th>
<th class="header__cell header__cell--username"
data-cy-user-list-header-username
scope="col">
<span>
{{ t('settings', 'Username') }}
</span>
</th>

15
apps/settings/src/components/Users/UserRow.vue

@ -54,13 +54,14 @@
spellcheck="false"
@trailing-button-click="updateDisplayName" />
</template>
<template v-else>
<strong v-if="!isObfuscated"
:title="user.displayname?.length > 20 ? user.displayname : null">
{{ user.displayname }}
</strong>
<span class="row__subtitle">{{ user.id }}</span>
</template>
<strong v-else-if="!isObfuscated"
:title="user.displayname?.length > 20 ? user.displayname : null">
{{ user.displayname }}
</strong>
</td>
<td class="row__cell row__cell--username" data-cy-user-list-cell-username>
<span class="row__subtitle">{{ user.id }}</span>
</td>
<td data-cy-user-list-cell-password

4
apps/settings/src/components/Users/shared/styles.scss

@ -66,6 +66,10 @@
}
}
&--username {
padding-left: calc(var(--default-grid-baseline) * 3);
}
&--avatar {
min-width: var(--avatar-cell-width);
width: var(--avatar-cell-width);

6
dist/settings-users-3239.js
File diff suppressed because it is too large
View File

2
dist/settings-users-3239.js.map
File diff suppressed because it is too large
View File

6
dist/settings-vue-settings-apps-users-management.js
File diff suppressed because it is too large
View File

2
dist/settings-vue-settings-apps-users-management.js.map
File diff suppressed because it is too large
View File

Loading…
Cancel
Save