mirror of
https://gitlab.com/gitlab-org/gitlab-foss.git
synced 2025-07-21 23:43:41 +00:00
Update from merge request
This commit is contained in:
@ -136,7 +136,7 @@ export default {
|
||||
return `@${this.user?.username}`;
|
||||
},
|
||||
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) {
|
||||
classList.push('user-popover-cannot-merge');
|
||||
|
@ -189,21 +189,6 @@ $avatar-sizes: (
|
||||
}
|
||||
|
||||
.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 {
|
||||
.popover-header {
|
||||
background-color: var(--gl-feedback-warning-background-color);
|
||||
|
Reference in New Issue
Block a user