Compare commits

...

13 Commits

Author SHA1 Message Date
tim
425fc7d2b1 fix: 移动端头像显示问题 #1023 2025-09-24 16:57:42 +08:00
Tim
2b5f6f2208 Merge pull request #1022 from nagisa77/feature/user_list_and_avatar
Feature/user list and avatar
2025-09-24 01:51:51 +08:00
tim
bda377336d fix: 优化一些头像属性 2025-09-24 01:51:02 +08:00
tim
77507f7b18 Revert "style: enhance BaseUserAvatar presentation"
This reverts commit 229439aa05.
2025-09-24 01:38:41 +08:00
Tim
a39f2f7c00 Merge pull request #1021 from nagisa77/codex/improve-baseuseravatar-styling-ok22do
style: enhance BaseUserAvatar presentation
2025-09-24 01:31:46 +08:00
Tim
229439aa05 style: enhance BaseUserAvatar presentation 2025-09-24 01:31:31 +08:00
tim
612881f1b1 Revert "refine BaseUserAvatar styling"
This reverts commit c68c5985f6.
2025-09-24 01:31:05 +08:00
Tim
05c7bc18d7 Merge pull request #1020 from nagisa77/codex/improve-baseuseravatar-styling-z7f617
Enhance BaseUserAvatar aesthetics
2025-09-24 01:23:25 +08:00
tim
7d44791011 Revert "feat: refresh base user avatar styling"
This reverts commit 4b8229b0a1.
2025-09-24 01:22:50 +08:00
Tim
15b992b949 Merge pull request #1019 from nagisa77/codex/improve-baseuseravatar-styling
feat: refresh base user avatar styling
2025-09-24 01:21:29 +08:00
Tim
4b8229b0a1 feat: refresh base user avatar styling 2025-09-24 01:21:12 +08:00
Tim
dc13b2941f Merge pull request #1016 from nagisa77/feature/vditor_layout
fix: 移动端--频道--表情无法显示完全 #994
2025-09-23 23:48:59 +08:00
tim
13c250d392 fix: 移动端--频道--表情无法显示完全 #994 2025-09-23 23:48:31 +08:00
4 changed files with 22 additions and 230 deletions

View File

@@ -108,7 +108,6 @@ body {
.vditor-toolbar--pin {
top: calc(var(--header-height) + 1px) !important;
z-index: 20;
}
.vditor-panel {
@@ -134,26 +133,6 @@ body {
animation: spin 1s linear infinite;
}
/* .vditor {
--textarea-background-color: transparent;
border: none !important;
box-shadow: none !important;
}
.vditor-reset {
color: var(--text-color);
}
.vditor-toolbar {
background: transparent !important;
border: none !important;
box-shadow: none !important;
} */
/* .vditor-toolbar {
position: relative !important;
} */
/*************************
* Markdown 渲染样式
*************************/
@@ -333,10 +312,6 @@ body {
min-height: 100px;
}
.vditor-toolbar {
overflow-x: auto;
}
.about-content h1,
.info-content-text h1 {
font-size: 20px;
@@ -354,8 +329,8 @@ body {
margin-bottom: 3px;
}
.vditor-toolbar--pin {
top: 0 !important;
.vditor-panel {
min-width: 330px;
}
.about-content li,
@@ -367,11 +342,6 @@ body {
line-height: 1.5;
}
.vditor-panel {
position: relative;
min-width: 0;
}
.d2h-file-name {
font-size: 14px !important;
}

View File

@@ -6,8 +6,7 @@
:style="wrapperStyle"
v-bind="wrapperAttrs"
>
<BaseImage :src="currentSrc" :alt="altText" :class="imageClass" @error="onError" />
<span v-if="showInitial" class="base-user-avatar-initial">{{ userInitial }}</span>
<BaseImage :src="currentSrc" :alt="altText" class="base-user-avatar-img" @error="onError" />
</NuxtLink>
</template>
@@ -70,121 +69,19 @@ const resolvedLink = computed(() => {
const altText = computed(() => props.alt || '用户头像')
const identifier = computed(() => {
if (props.userId !== null && props.userId !== undefined && props.userId !== '') {
return String(props.userId)
}
if (props.alt && props.alt.trim()) {
return props.alt.trim()
}
return altText.value
})
const initialSource = computed(() => {
if (props.alt && props.alt.trim() && props.alt.trim() !== '用户头像') {
return props.alt.trim()
}
if (attrs.title && typeof attrs.title === 'string' && attrs.title.trim()) {
return attrs.title.trim()
}
if (props.userId !== null && props.userId !== undefined && props.userId !== '') {
return String(props.userId)
}
return ''
})
const isDefaultAvatar = computed(() => currentSrc.value === DEFAULT_AVATAR)
function parseCssSize(value) {
if (typeof value === 'number' && Number.isFinite(value)) {
return { numeric: value, unit: 'px' }
}
if (typeof value !== 'string') return null
const trimmed = value.trim()
if (!trimmed) return null
const directNumber = Number(trimmed)
if (!Number.isNaN(directNumber)) {
return { numeric: directNumber, unit: 'px' }
}
const match = trimmed.match(/^(-?\d*\.?\d+)([a-z%]+)$/i)
if (!match) return null
return { numeric: Number(match[1]), unit: match[2] }
}
const sizeStyle = computed(() => {
if (!props.width && props.width !== 0) return null
const value = typeof props.width === 'number' ? `${props.width}px` : props.width
if (!value) return null
const parsed = parseCssSize(value)
const style = { width: value, height: value, '--avatar-size': value }
if (parsed && Number.isFinite(parsed.numeric)) {
const computedFont = (parsed.numeric * 0.42).toFixed(2)
const normalized = computedFont.replace(/\.00$/, '')
style['--avatar-font-size'] = `${normalized}${parsed.unit}`
}
return style
})
function stringToColorSeed(value) {
if (!value) return 0
let hash = 0
for (let i = 0; i < value.length; i += 1) {
hash = (hash << 5) - hash + value.charCodeAt(i)
hash |= 0
}
return Math.abs(hash)
}
const accentStyle = computed(() => {
if (!isDefaultAvatar.value) return null
const seed = stringToColorSeed(identifier.value)
const hue = seed % 360
const altHue = (hue + 37) % 360
const saturation = 72
const lightness = 78
const start = `hsl(${hue}, ${saturation}%, ${Math.min(lightness + 8, 95)}%)`
const end = `hsl(${altHue}, ${Math.max(saturation - 12, 45)}%, ${Math.max(lightness - 12, 48)}%)`
return {
'--avatar-background': `linear-gradient(135deg, ${start}, ${end})`,
'--avatar-border-color': `hsla(${hue}, ${Math.max(saturation - 24, 32)}%, ${Math.max(
lightness - 35,
28,
)}%, 0.55)`,
'--avatar-text-color': '#ffffff',
}
return { width: value, height: value }
})
const wrapperStyle = computed(() => {
const attrStyle = attrs.style
return [
{ '--avatar-font-size': 'clamp(0.75rem, 0.6rem + 0.4vw, 1.75rem)' },
sizeStyle.value,
accentStyle.value,
attrStyle,
]
return [sizeStyle.value, attrStyle]
})
const wrapperClass = computed(() => [
attrs.class,
{
'is-rounded': props.rounded,
'has-default': isDefaultAvatar.value,
'is-interactive': !props.disableLink && Boolean(resolvedLink.value),
},
])
const imageClass = computed(() => ['base-user-avatar-img', { 'is-default': isDefaultAvatar.value }])
const userInitial = computed(() => {
const source = initialSource.value || ''
const trimmed = source.trim()
if (!trimmed) return ''
const match = trimmed.match(/[\p{L}\p{N}]/u)
if (match && match[0]) return match[0].toUpperCase()
return trimmed.charAt(0).toUpperCase()
})
const showInitial = computed(() => isDefaultAvatar.value && Boolean(userInitial.value))
const wrapperClass = computed(() => [attrs.class, { 'is-rounded': props.rounded }])
const wrapperAttrs = computed(() => {
const { class: _class, style: _style, ...rest } = attrs
@@ -200,28 +97,24 @@ function onError() {
<style scoped>
.base-user-avatar {
--avatar-background: var(--avatar-placeholder-color, #f0f0f0);
--avatar-border-color: rgba(15, 23, 42, 0.08);
--avatar-text-color: rgba(255, 255, 255, 0.86);
--avatar-shadow: 0 6px 18px rgba(15, 23, 42, 0.12);
--avatar-shadow-hover: 0 10px 24px rgba(15, 23, 42, 0.16);
--avatar-size: 3rem;
display: inline-flex;
align-items: center;
justify-content: center;
overflow: hidden;
position: relative;
background: var(--avatar-background);
border: 1px solid var(--avatar-border-color);
border-radius: var(--avatar-border-radius, 16px);
box-shadow: var(--avatar-shadow);
color: var(--avatar-text-color);
transition:
transform 0.28s ease,
box-shadow 0.32s ease,
border-color 0.32s ease,
filter 0.28s ease;
isolation: isolate;
background-color: var(--avatar-placeholder-color, #f0f0f0);
/* 先用box-sizing: border-box保证加border后宽高不变圆形不变形 */
box-sizing: border-box;
border: 1.5px solid var(--normal-border-color);
transition: all 0.6s ease;
}
.base-user-avatar:hover {
box-shadow: 0 4px 24px rgba(0, 0, 0, 0.1);
transform: scale(1.05);
}
.base-user-avatar:active {
box-shadow: 0 4px 24px rgba(0, 0, 0, 0.1);
}
.base-user-avatar.is-rounded {
@@ -229,35 +122,7 @@ function onError() {
}
.base-user-avatar:not(.is-rounded) {
border-radius: var(--avatar-border-radius, 16px);
}
.base-user-avatar.is-interactive {
cursor: pointer;
}
.base-user-avatar.is-interactive:hover,
.base-user-avatar.is-interactive:focus-visible {
transform: translateY(-1px) scale(1.01);
box-shadow: var(--avatar-shadow-hover);
border-color: rgba(59, 130, 246, 0.4);
}
.base-user-avatar.has-default::after {
content: '';
position: absolute;
inset: 1px;
border-radius: inherit;
background: rgba(15, 23, 42, 0.12);
mix-blend-mode: soft-light;
opacity: 0.25;
pointer-events: none;
transition: opacity 0.28s ease;
}
.base-user-avatar.has-default:hover::after,
.base-user-avatar.has-default:focus-visible::after {
opacity: 0.18;
border-radius: 0;
}
.base-user-avatar-img {
@@ -265,42 +130,5 @@ function onError() {
height: 100%;
object-fit: cover;
display: block;
filter: saturate(108%);
transition:
opacity 0.35s ease,
transform 0.35s ease,
filter 0.35s ease;
}
.base-user-avatar-img.is-default {
opacity: 0.32;
filter: saturate(90%) brightness(1.05);
mix-blend-mode: multiply;
}
.base-user-avatar-initial {
position: absolute;
inset: 0;
display: flex;
align-items: center;
justify-content: center;
font-weight: 600;
font-size: var(--avatar-font-size, calc(var(--avatar-size) * 0.42));
text-transform: uppercase;
letter-spacing: 0.04em;
pointer-events: none;
user-select: none;
color: inherit;
text-shadow: 0 1px 4px rgba(15, 23, 42, 0.4);
}
@media (prefers-reduced-motion: reduce) {
.base-user-avatar {
transition: none;
}
.base-user-avatar-img {
transition: none;
}
}
</style>

View File

@@ -159,12 +159,6 @@ export default {
border: 1px solid var(--border-color);
border-radius: 8px;
}
.vditor {
min-height: 50px;
max-height: 150px;
}
.message-bottom-container {
display: flex;
flex-direction: row;

View File

@@ -85,7 +85,7 @@
</div>
<div class="article-member-avatars-container">
<div v-for="member in article.members">
<div v-for="member in article.members" class="article-member-avatar-item">
<BaseUserAvatar
class="article-member-avatar-item-img"
:src="member.avatar"