Skip to content

Fix copy and colors for open source filter #777

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
gaspergrom merged 1 commit into from
Apr 18, 2023
Merged

Fix copy and colors for open source filter #777

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 frontend/src/assets/scss/table.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
bottom: -4px;
}
.el-table .ascending .sort-caret.ascending {
@apply border-b-gray-900;
@apply border-b-gray-900 #{!important};
}
.el-table .descending .sort-caret.descending {
@apply border-t-gray-900 #{!important};
Expand Down
7 changes: 3 additions & 4 deletions frontend/src/modules/member/components/list/member-list-table.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -256,19 +256,18 @@

<!-- # of Open Source Contributions -->
<el-table-column
label="# OSS Contributions"
label="# of open source contributions"
width="200"
prop="numberOfOpenSourceContributions"
sortable
>
<template #header>
<el-tooltip placement="top">
<template #content>
The total # of open-source code contributions a member did
on GitHub.<br />
This refers to the total # of open source contributions a member did on GitHub.<br />
To receive this attribute you have to enrich your members.
</template>
OSS Contributions
# of open source contributions
</el-tooltip>
</template>
<template #default="scope">
Expand Down
22 changes: 14 additions & 8 deletions frontend/src/modules/member/components/view/member-view-contributions.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,20 @@
<template>
<div v-click-away="turnOff" class="panel contributions-panel relative h-80">
<div class="pt-4 px-6 flex justify-between text-center">
<p class="flex align-center">
<img
alt="Github"
src="https://cdn-icons-png.flaticon.com/512/25/25231.png"
class="h-5 w-5 mr-2"
/>
<span class="font-medium text-black"> OSS contributions </span>
</p>
<el-tooltip placement="top-start">
<template #content>
This refers to the total # of open source contributions a member did on GitHub.<br />
To receive this attribute you have to enrich your members.
</template>
<div class="flex align-center">
<img
alt="Github"
src="https://cdn-icons-png.flaticon.com/512/25/25231.png"
class="h-5 w-5 mr-2"
/>
<span class="font-medium text-black"> Open source contributions </span>
</div>
</el-tooltip>
<div class="text-gray-500 flex align-center italic text-2xs h-5">
<el-tooltip
placement="top"
Expand Down