Include avatar placeholder in relevant places #2783
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
PVince81
added
Type:Bug
|
PVince81
changed the title
kulmann
approved these changes
Dec 20, 2019
PVince81
force-pushed
the
fix-avatar-top-bar
branch
from
a9354a4
to
6b72c4b
Compare
|
fixed test errors because the avatar placeholder had included itself in the places where the test code is trying to read the user name |
kulmann
reviewed
Dec 20, 2019
| @@ -2,13 +2,13 @@ | |||
| <div class="uk-flex uk-flex-middle"> | |||
| <oc-spinner v-if="loading" uk-spinner="ratio:1.6" class="uk-margin-small-right" :aria-label="$gettext('Loading avatar')" /> | |||
| <template v-else> | |||
| <oc-avatar v-if="avatar" :src="avatar" class="uk-margin-small-right" width=50 height=50 /> | |||
| <oc-avatar v-if="item.value.shareType === 0" :src="avatar" class="uk-margin-small-right" width=50 height=50 :userName="item.label" /> | |||
There was a problem hiding this comment.
still has the obsolete height param
kulmann
reviewed
Dec 20, 2019
| @@ -4,7 +4,7 @@ | |||
| <div class="files-collaborators-collaborator-information uk-flex uk-flex-wrap uk-flex-middle"> | |||
| <oc-spinner v-if="loading" key="collaborator-avatar-spinner" uk-spinner="ratio:1.6" class="uk-margin-small-right" :aria-label="$gettext('Loading')"/> | |||
| <div v-else key="collaborator-avatar-loaded"> | |||
| <oc-avatar v-if="avatar" :src="avatar" class="uk-margin-small-right" width=50 height=50 /> | |||
| <oc-avatar v-if="collaborator.info.share_type === '0'" :src="avatar" class="uk-margin-small-right" size=50 :userName="collaborator.displayName" /> | |||
There was a problem hiding this comment.
This should still be width instead of size, right?!
added 2 commits
January 7, 2020 10:40
Pass in the user display name for the fallback logic that displays letter. Quick fix for alignment of avatar in top bar. Update ODS for the fix for setting avatar size.
PVince81
force-pushed
the
fix-avatar-top-bar
branch
from
6b72c4b
to
a30c6f8
Compare
|
@kulmann fixed. Also I've fixed CI because now the avatar placeholder text was sneaking into the string that is read for assertions. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
Pass in the user display name for the fallback logic that displays
letter.
Quick fix for alignment of avatar in top bar.
Update ODS for the fix for setting avatar size.
Use avatar placeholder component also in collaborator autocomplete and list.
Related Issue
None raised
Motivation and Context
Top bar looking shitty without proper alignment.
Avatar placeholder had missing letters.
How Has This Been Tested?
Screenshots (if appropriate):
Types of changes
Checklist: