VladPolskiy/gitlab-foss
1
0
Fork 0
mirror of https://gitlab.com/gitlab-org/gitlab-foss.git synced 2025-07-25 16:03:48 +00:00
Code Issues Packages Projects Releases 1 Wiki Activity

Update from merge request

Browse Source
This commit is contained in:
root
2025-07-18 06:58:40 +00:00
parent f50eb2487d
commit a3858cc315
2 changed files with 1 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/javascripts/vue_shared/components/user_popover/user_popover.vue
View File

@ -136,7 +136,7 @@ export default {
return `@${this.user?.username}`; return `@${this.user?.username}`;
}, },
cssClasses() { cssClasses() {
const classList = ['user-popover', 'gl-max-w-48', 'gl-overflow-hidden']; const classList = ['user-popover', 'gl-w-34', 'gl-overflow-hidden'];
if (this.userCannotMerge) { if (this.userCannotMerge) {
classList.push('user-popover-cannot-merge'); classList.push('user-popover-cannot-merge');

15
app/assets/stylesheets/components/avatar.scss
View File

@ -189,21 +189,6 @@ $avatar-sizes: (
} }
.user-popover { .user-popover {
// GlAvatarLabeled doesn't expose any prop to override internal classes
// Max width of popover container is set by gl-max-w-48
// so we need to ensure that name/username/status container doesn't overflow
// stylelint-disable-next-line gitlab/no-gl-class
.gl-avatar-labeled-labels {
max-width: px-to-rem(290px);
}
// stylelint-disable-next-line gitlab/no-gl-class
.gl-avatar-labeled-label,
.gl-avatar-labeled-sublabel {
@apply gl-truncate;
}
&.user-popover-cannot-merge { &.user-popover-cannot-merge {
.popover-header { .popover-header {
background-color: var(--gl-feedback-warning-background-color); background-color: var(--gl-feedback-warning-background-color);