Skip to content

Commit 37956c3

Browse files
committedFeb 21, 2024
Minor fixes
1 parent dc5ff52 commit 37956c3

File tree

3 files changed

+8
-4
lines changed

3 files changed

+8
-4
lines changed
 

Diff for: ‎frontend/src/assets/scss/form/select.scss

+4
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,10 @@
1212
@apply cursor-pointer;
1313
}
1414

15+
.el-select .el-select__wrapper{
16+
min-height: 40px;
17+
}
18+
1519
// Select input
1620
.el-select {
1721
--el-select-border-color-hover: unset;

Diff for: ‎frontend/src/modules/member/components/list/member-list-table.vue

+1-1
Original file line numberDiff line numberDiff line change
@@ -703,10 +703,10 @@
703703
<app-member-dropdown-content
704704
v-if="selectedActionMember"
705705
:member="selectedActionMember"
706+
:hide-unmerge="true"
706707
@find-github="isFindGithubDrawerOpen = selectedActionMember"
707708
@merge="isMergeDialogOpen = selectedActionMember"
708709
@close-dropdown="closeDropdown"
709-
:hide-unmerge="true"
710710
/>
711711
</div>
712712
</el-popover>

Diff for: ‎frontend/src/modules/member/components/member-dropdown-content.vue

+3-3
Original file line numberDiff line numberDiff line change
@@ -232,9 +232,9 @@ enum Actions {
232232
const emit = defineEmits<{(e: 'merge'): void, (e: 'unmerge'): void, (e: 'closeDropdown'): void, (e: 'findGithub'): void }>();
233233
const props = defineProps<{
234234
member: Member;
235-
hideMerge: boolean;
236-
hideEdit: boolean;
237-
hideUnmerge: boolean;
235+
hideMerge?: boolean;
236+
hideEdit?: boolean;
237+
hideUnmerge?: boolean;
238238
}>();
239239
240240
const store = useStore();

0 commit comments

Comments
 (0)