Skip to content

Fix: revert two line avatar size to default #12869

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Antreesy merged 1 commit into from
Aug 6, 2024
Merged

Fix: revert two line avatar size to default #12869

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/components/ConversationIcon.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ export default {

size: {
type: Number,
default: AVATAR.SIZE.TWO_LINES,
default: AVATAR.SIZE.DEFAULT,
},
},

Expand Down
6 changes: 3 additions & 3 deletions src/components/LeftSidebar/ConversationsList/ConversationsListVirtual.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,11 @@ import LoadingPlaceholder from '../../UIShared/LoadingPlaceholder.vue'
import 'vue-virtual-scroller/dist/vue-virtual-scroller.css'

/* Consider:
* 48 = 2 * var(--default-line-height) - 2 lines of text
* 45 = 2lh - 2 lines of text
* 8 = 2 * var(--default-grid-baseline) - item padding
* 8 = 2 * var(--default-grid-baseline) - focus offset
* 4 = var(--default-grid-baseline) - item outline (collapsed)
*/
const CONVERSATION_ITEM_SIZE = 64
const CONVERSATION_ITEM_SIZE = 61

export default {
name: 'ConversationsListVirtual',
Expand Down
9 changes: 4 additions & 5 deletions src/components/LeftSidebar/LeftSidebar.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,7 @@
data-nav-id="conversation_create_new"
@click="createConversation(searchText)">
<template #icon>
<ChatPlus :size="AVATAR.SIZE.TWO_LINES" />
<ChatPlus :size="44" />
</template>
<template #subname>
{{ t('spreed', 'New group conversation') }}
Expand All @@ -206,7 +206,7 @@
:name="item.label"
@click="createAndJoinConversation(item)">
<template #icon>
<AvatarWrapper v-bind="iconData(item)" :size="AVATAR.SIZE.TWO_LINES" />
<AvatarWrapper v-bind="iconData(item)" />
</template>
<template #subname>
{{ t('spreed', 'New private conversation') }}
Expand Down Expand Up @@ -259,7 +259,7 @@
:name="item.label"
@click="createAndJoinConversation(item)">
<template #icon>
<AvatarWrapper v-bind="iconData(item)" :size="AVATAR.SIZE.TWO_LINES" />
<AvatarWrapper v-bind="iconData(item)" />
</template>
<template #subname>
{{ t('spreed', 'New group conversation') }}
Expand Down Expand Up @@ -336,7 +336,7 @@ import SearchBox from '../UIShared/SearchBox.vue'
import TransitionWrapper from '../UIShared/TransitionWrapper.vue'

import { useArrowNavigation } from '../../composables/useArrowNavigation.js'
import { ATTENDEE, AVATAR, CONVERSATION } from '../../constants.js'
import { ATTENDEE, CONVERSATION } from '../../constants.js'
import BrowserStorage from '../../services/BrowserStorage.js'
import { getTalkConfig, hasTalkFeature } from '../../services/CapabilitiesManager.ts'
import {
Expand Down Expand Up @@ -410,7 +410,6 @@ export default {
const isMobile = useIsMobile()

return {
AVATAR,
initializeNavigation,
resetNavigation,
leftSidebar,
Expand Down
1 change: 0 additions & 1 deletion src/constants.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -274,7 +274,6 @@ export const AVATAR = {
EXTRA_SMALL: 22,
SMALL: 32,
DEFAULT: 44,
TWO_LINES: 48, // 2 * var(--default-line-height)
MEDIUM: 64,
LARGE: 128,
EXTRA_LARGE: 180,
Expand Down