Skip to content

Team page organized and all cleaned up 🧼 #84

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
MZX102208 merged 2 commits into from
Jan 22, 2021
Merged

Team page organized and all cleaned up 🧼 #84

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2e62383
Team page organized and all cleaned up 🧼�
abdullah50053 Jan 19, 2021
cb02c96
Only add borders for officers with pictures
MZX102208 Jan 22, 2021
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
Binary file modified data/organizers.xlsx
View file
Open in desktop
Binary file not shown.
30 changes: 22 additions & 8 deletions src/components/OrganizerInfo.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
<article class="organizer-card">
<g-image
class="organizer-card--image"
v-bind:class="profilePicBorder"
:src="require(`!!assets-loader!@officers/${imageName}`)"
/>
<div class="organizer-card--contents">
Expand Down Expand Up @@ -69,6 +70,11 @@ export default {
* A URL to this officer's personal website, if any.
*/
website: String,
},
computed: {
profilePicBorder: function() {
return this.imageName.includes('officer_default') ? '' : 'profile-pic-border';
}
}
};
</script>
Expand All @@ -77,17 +83,25 @@ export default {
.organizer-card {
@apply flex;
@apply mt-2 p-5;
@apply bg-white;
@apply rounded-lg shadow-md;
}

/*
// Under organizer-card{} (^)
// @apply rounded-lg shadow-md;

.organizer-card:hover {
box-shadow: rgba(0, 0, 0, 0.5) 0px 10px 10px;
transform: translate3d(-1px, -1px, 0px);
}
*/

.profile-pic-border {
@apply border-2;
@apply border-white;
}

.organizer-card--image {
@apply h-16 w-16;
@apply h-20 w-20;
@apply rounded-full;
}

Expand All @@ -96,16 +110,16 @@ export default {
}

.organizer-card--name {
@apply text-xl text-left text-black;
@apply text-xl text-left text-white;
@apply font-display font-semibold;
}

.organizer-card--position {
@apply text-lg text-black mb-2;
@apply text-lg text-white mb-2;
}

.organizer-card--bio {
@apply text-black;
@apply text-white;
}

@screen md {
Expand All @@ -115,7 +129,7 @@ export default {

.organizer-card--image {
@apply block;
@apply h-32 w-32;
@apply h-56 w-56;
@apply mx-auto;
}

Expand Down Expand Up @@ -149,7 +163,7 @@ export default {
}

.organizer-card {
@apply bg-black;
@apply bg-transparent;
}

.organizer-card--name {
Expand Down