Skip to content
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

Sort members & style fix #12

Merged
merged 1 commit into from
Sep 4, 2018
Merged

Sort members & style fix #12

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
6 changes: 3 additions & 3 deletions components/profile/ProfileCard/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,13 +31,13 @@ function ProfileCard({ name, bio, linkedInUrl, gitHubUrl, websiteUrl }) {

<ul className="profile-social-links">
<li>
{linkedInUrl && <a href={linkedInUrl}><FontAwesomeIcon icon={faLinkedIn} /></a>}
<a className={linkedInUrl === '#' ? 'nolink' : ''} href={linkedInUrl}><FontAwesomeIcon icon={faLinkedIn} /></a>
</li>
<li>
{gitHubUrl && <a href={gitHubUrl}><FontAwesomeIcon icon={faGithub} /></a>}
<a className={gitHubUrl === '#' ? 'nolink' : ''} href={gitHubUrl}><FontAwesomeIcon icon={faGithub} /></a>
</li>
<li>
{websiteUrl && <a href={websiteUrl}><FontAwesomeIcon icon={faGlobe} /></a>}
<a className={websiteUrl === '#' ? 'nolink' : ''} href={websiteUrl}><FontAwesomeIcon icon={faGlobe} /></a>
</li>
</ul>
</div>
Expand Down
16 changes: 10 additions & 6 deletions components/profile/ProfileCard/style.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,14 @@
}
.profile-card {
min-height: 150px; /* temp */
background: #FFFFFF;
background: #FFFFFF;
width: 200px;
z-index: 2;
overflow: hidden;
overflow: hidden;
opacity: 1;
margin: 15px 15px;
-webkit-box-shadow: 0px 3px 6px rgba(0, 0, 0, 0.16), 0px 3px 6px rgba(0, 0, 0, 0.23);
box-shadow: 0px 3px 6px rgba(0 ,0, 0, 0.16), 0px 3px 6px rgba(0, 0, 0, 0.23);
-webkit-box-shadow: 0px 3px 6px rgba(0, 0, 0, 0.16), 0px 3px 6px rgba(0, 0, 0, 0.23);
box-shadow: 0px 3px 6px rgba(0 ,0, 0, 0.16), 0px 3px 6px rgba(0, 0, 0, 0.23);
}
.profile-card .card-header {
width: auto;
Expand Down Expand Up @@ -68,7 +68,7 @@
display: block;
float: none;
padding: 15px 0px 30px 0px;
background: #FFFFFF;
background: #FFFFFF;
color: #333333;
margin-top: -20px;
text-align: center;
Expand All @@ -80,7 +80,7 @@
float: none;
margin: 0px;
padding: 15px 20px;
background: #FFFFFF;
background: #FFFFFF;
margin-top: -20px;
text-align: center;
opacity: 1;
Expand Down Expand Up @@ -133,6 +133,10 @@
width: 24px !important;
}

.profile-social-links li a.nolink {
color: #95a5a6;
}

@-webkit-keyframes ripple {
0% {
transform: scale3d(0, 0, 0);
Expand Down
63 changes: 7 additions & 56 deletions members.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,48 +27,20 @@
"gitHubUrl": "#",
"websiteUrl": "#"
},
{
"name": "Dustin Cai",
"bio": "Student",
"linkedInUrl": "#",
"gitHubUrl": "#",
"websiteUrl": "#"
},
{
"name": "Brandon Lau",
"bio": "Student",
"linkedInUrl": "#",
"gitHubUrl": "#",
"websiteUrl": "#"
},
{
"name": "Alicia Siu",
"bio": "Student",
"linkedInUrl": "#",
"gitHubUrl": "#",
"websiteUrl": "#"
},
{
"name": "Elias Heffan",
"bio": "Student",
"linkedInUrl": "#",
"gitHubUrl": "#",
"websiteUrl": "#"
},
{
"name": "Vivienne Zing",
"bio": "Student",
"linkedInUrl": "#",
"gitHubUrl": "#",
"websiteUrl": "#"
},
{
"name": "Katie Kwak",
"bio": "Student",
"linkedInUrl": "#",
"gitHubUrl": "#",
"websiteUrl": "#"
},
{
"name": "Raja Vyshnavi Sriramoju",
"bio": "Student",
Expand Down Expand Up @@ -209,27 +181,13 @@
"gitHubUrl": "#",
"websiteUrl": "#"
},
{
"name": "Maxim Chiao",
"bio": "Student",
"linkedInUrl": "#",
"gitHubUrl": "#",
"websiteUrl": "#"
},
{
"name": "Jessica Ma",
"bio": "Student",
"linkedInUrl": "#",
"gitHubUrl": "#",
"websiteUrl": "#"
},
{
"name": "Kevin Lee",
"bio": "Student",
"linkedInUrl": "#",
"gitHubUrl": "#",
"websiteUrl": "#"
},
{
"name": "Travis Garcia",
"bio": "Student",
Expand Down Expand Up @@ -258,13 +216,6 @@
"gitHubUrl": "#",
"websiteUrl": "#"
},
{
"name": "Brandon Lau",
"bio": "Student",
"linkedInUrl": "#",
"gitHubUrl": "#",
"websiteUrl": "#"
},
{
"name": "Songwen Su",
"bio": "Student",
Expand Down Expand Up @@ -363,18 +314,18 @@
"gitHubUrl": "#",
"websiteUrl": "#"
},
{
"name": "Kimberly Lee",
"bio": "Student",
"linkedInUrl": "#",
"gitHubUrl": "#",
"websiteUrl": "#"
},
{
"name": "Nikhita Battula",
"bio": "Student",
"linkedInUrl": "#",
"gitHubUrl": "#",
"websiteUrl": "#"
},
{
"name": "Corey Mason",
"bio": "Former Officer & Webmaster",
"linkedInUrl": "https://linkedin.com/in/corey-mason",
"gitHubUrl": "https://github.com/coreymason",
"websiteUrl": "https://coreysmason.com"
}
]
1 change: 1 addition & 0 deletions pages/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ export default class HomePage extends React.Component {
static async getInitialProps() {
// This data may be moved online at a future date
const membersData = require('../members.json') || false; // eslint-disable-line global-require
membersData.sort((a, b) => a.name < b.name ? -1 : 1);
return { membersData };
}

Expand Down