Skip to content
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

User list : User name and Display name visibility improvement #34163

Merged
merged 7 commits into from
Sep 26, 2022
Merged

User list : User name and Display name visibility improvement #34163

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
6c081bd
User list : Display name CSS change
Jerome-Herbinet Sep 20, 2022
1e9fd66
User list : Invert user name and display name
Jerome-Herbinet Sep 20, 2022
f233077
User list : Other user and display name inversion
Jerome-Herbinet Sep 20, 2022
f2ca65b
build front-end
Jerome-Herbinet Sep 21, 2022
8dd2ea7
build npm run sass
Jerome-Herbinet Sep 22, 2022
9e4fe9d
Fix : strong HTML end tag
Jerome-Herbinet Sep 22, 2022
e393e13
Fix : strong end tag
Jerome-Herbinet Sep 22, 2022
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
5 changes: 5 additions & 0 deletions apps/settings/css/settings.css
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion apps/settings/css/settings.css.map
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 4 additions & 0 deletions apps/settings/css/settings.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1564,6 +1564,10 @@ doesnotexist:-o-prefocus, .strengthify-wrapper {
-webkit-box-orient: vertical;
}

&.name .subtitle {
color: var(--color-main-text);
}

&.quota {
display: flex;;
justify-content: left;
Expand Down
7 changes: 4 additions & 3 deletions apps/settings/src/components/UserList.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,11 +156,12 @@
class="row">
<div id="headerAvatar" class="avatar" />
<div id="headerName" class="name">
{{ t('settings', 'Username') }}

<div class="subtitle">
{{ t('settings', 'Display name') }}
<strong>
{{ t('settings', 'Display name') }}
</strong>
</div>
{{ t('settings', 'Username') }}
</div>
<div id="headerPassword" class="password">
{{ t('settings', 'Password') }}
Expand Down
6 changes: 4 additions & 2 deletions apps/settings/src/components/UserList/UserRowSimple.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,14 @@
</div>
<!-- dirty hack to ellipsis on two lines -->
<div class="name">
{{ user.id }}
<div class="displayName subtitle">
<div v-tooltip="user.displayname.length > 20 ? user.displayname : ''" class="cellText">
{{ user.displayname }}
<strong>
{{ user.displayname }}
</strong>
</div>
</div>
{{ user.id }}
</div>
<div />
<div class="mailAddress">
Expand Down
4 changes: 2 additions & 2 deletions dist/settings-users-8351.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/settings-users-8351.js.map
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions dist/settings-vue-settings-apps-users-management.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/settings-vue-settings-apps-users-management.js.map
View file
Open in desktop

Large diffs are not rendered by default.