Resolve merge conflicts by accepting PR #6131 changes

Co-authored-by: xet7 <15545+xet7@users.noreply.github.com>
This commit is contained in:
copilot-swe-agent[bot] 2026-02-07 16:30:08 +00:00
parent dc0b68ee80
commit 97dd5d2064
257 changed files with 9483 additions and 14103 deletions

View file

@ -1,47 +1,40 @@
.member {
border-radius: 3px;
display: block;
position: relative;
float: left;
height: clamp(24px, 3.5vw, 36px);
width: clamp(24px, 3.5vw, 36px);
margin: .3vh;
cursor: pointer;
user-select: none;
z-index: 1;
text-decoration: none;
border-radius: 50%;
}
.member .avatar {
overflow: hidden;
border-radius: 50%;
}
.member .avatar.avatar-initials {
height: 70%;
width: 70%;
padding: 15%;
display: flex;
background-color: #dbdbdb;
color: #444;
position: absolute;
aspect-ratio: 1 / 1;
border-radius: 50%;
padding: 0.2em;
font-size: 0.9em;
height: var(--label-height);
align-items: center;
justify-content: center;
align-self: flex-start;
color: #111;
margin: 0 0.2ch;
}
.js-select-initials {
justify-content: start;
p {
margin: 0;
}
display: flex;
align-items: center;
justify-content: center;
}
.member .avatar.avatar-image {
object-fit: cover;
object-position: center;
height: 100%;
width: 100%;
}
.member .member-presence-status {
background-color: #b3b3b3;
border: 1px solid #fff;
border-radius: 50%;
height: 7px;
width: 7px;
height: 1.2ch;
width: 1.2ch;
position: absolute;
right: -1px;
bottom: -1px;
transform: translate(1.6ch, 1.6ch);
border: 1px solid #fff;
z-index: 15;
}
@ -61,18 +54,6 @@
background: #e44242;
border-color: #f1dada;
}
.member .edit-avatar {
position: absolute;
top: 0;
height: 100%;
width: 100%;
border-radius: 50%;
background: #000;
display: flex;
align-items: center;
justify-content: center;
opacity: 0;
}
.member .edit-avatar:hover {
opacity: 0.6;
}
@ -112,9 +93,4 @@
}
.mini-profile-info .info p {
padding-top: 0;
}
.mini-profile-info .member {
width: clamp(40px, 5vw, 60px);
height: clamp(40px, 5vw, 60px);
margin-right: 10px;
}
}