Skip to content

fix first instance context alignment and dropdown alignment #2768

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
emlimlf merged 3 commits into from
Jan 16, 2025
Merged

fix first instance context alignment and dropdown alignment #2768

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f4d4938
fix first instance context alignment and dropdown alignment
emlimlf Jan 16, 2025
348a840
lint fixes
emlimlf Jan 16, 2025
768dfac
Merge branch 'main' into bugfix/CM-1963-button-alignment
emlimlf Jan 16, 2025
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
3 changes: 2 additions & 1 deletion frontend/src/modules/contributor/components/details/contributor-details-work-history.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,11 +32,12 @@

<div class="flex flex-col gap-4">
<lf-timeline v-slot="{ group }" :groups="shownGroups" @on-group-hover="onGroupHover">
<lf-timeline-item v-for="item in group.items" :key="item.id" :data="item">
<lf-timeline-item v-for="(item, index) in group.items" :key="item.id" :data="item">
<lf-contributor-details-work-history-item
:contributor="props.contributor"
:organization="item"
:is-group-hover="hoveredGroup?.id === group.id"
:index="index"
@edit="isEditModalOpen = true; editOrganization = item"
/>
</lf-timeline-item>
Expand Down
12 changes: 10 additions & 2 deletions ...les/contributor/components/details/work-history/contributor-details-work-history-item.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
<template>
<article
:class="`${props.index === 0 ? 'first-item' : ''}`"
@mouseover="hovered = true"
@mouseleave="hovered = false"
>
<div class="flex min-h-7">
<div class="flex min-h-7 relative">
<div class="flex flex-auto flex-col overflow-hidden">
<div v-if="props.organization?.memberOrganizations?.title" class="text-small text-gray-900 mb-1.5 flex items-center gap-1.5">
<lf-svg name="id-card" class="h-4 w-4 text-gray-400" />
Expand All @@ -17,7 +18,7 @@
</p>
</div>

<lf-dropdown v-show="hovered || isGroupHover" placement="bottom-end" width="14.5rem">
<lf-dropdown v-show="hovered || isGroupHover" class="work-history-item-dropdown self-start" placement="bottom-end" width="14.5rem">
<template #trigger>
<lf-button type="secondary-ghost" size="small" :icon-only="true">
<lf-icon name="ellipsis" />
Expand Down Expand Up @@ -73,6 +74,7 @@ const props = defineProps<{
organization: Organization,
contributor: Contributor,
isGroupHover: boolean,
index: number,
}>();

const emit = defineEmits<{(e:'edit'): void}>();
Expand Down Expand Up @@ -131,3 +133,9 @@ export default {
name: 'LfContributorDetailsWorkHistoryItem',
};
</script>

<style scoped>
.first-item .work-history-item-dropdown {
margin-top: -28px;
}
</style>
Loading