Skip to content

Commit

Permalink
Merge pull request #42 from kelvinkamau/teamChanges
Browse files Browse the repository at this point in the history
Team card redesign fixes #38 #18
  • Loading branch information
kelvinkamau committed May 9, 2019
2 parents d7edb11 + bdecaf6 commit 66cb279
Show file tree
Hide file tree
Showing 2 changed files with 69 additions and 89 deletions.
28 changes: 21 additions & 7 deletions public/css/styles.css
Expand Up @@ -1235,8 +1235,8 @@ hr{

.card.hovercard .avatar {
position: relative;
top: -50px;
margin-left: auto;
margin-top: 20px;
margin-left: 10px;
margin-right: auto;
margin-bottom: -50px;
}
Expand All @@ -1249,8 +1249,19 @@ hr{
-webkit-border-radius: 50%;
-moz-border-radius: 50%;
border-radius: 50%;
border: 5px solid rgba(255,255,255,0.5);

}
/*different border colors for team avators*/
#bcol{
border: 2px solid rgba(47, 91, 231, 0.5);
}
#ycol{
border: 2px solid rgba(255, 255, 0, 0.5);
}
#rcol{
border: 2px solid rgba(255, 0, 0, 0.5);
}
/*end of border colors*/

.card.hovercard .info {
padding: 4px 8px 2px;
Expand All @@ -1259,13 +1270,15 @@ hr{
}

.card.hovercard .info .title h5 {
margin-bottom: 2px;
margin-top: -30px;
margin-left: 60px;
font-size: 18px;
line-height: 1;
color: #D7D7D7;
}
.card.hovercard .info .title p {
color: #D7D7D7;
margin-left: 100px;
}

.card.hovercard .info .title p {
Expand All @@ -1279,9 +1292,10 @@ hr{
text-overflow: ellipsis;
}
.card.hovercard .bottom{
padding: 0 20px;
margin-bottom: 10px;
margin-left: auto;
padding: 0 5px;
margin-top: -25px;
margin-bottom: 30px;
margin-left: 120px;
margin-right: auto;
}
.card.hovercard .bottom ul li a i{
Expand Down
130 changes: 48 additions & 82 deletions public/index.html
Expand Up @@ -636,28 +636,18 @@ <h2 class="section-title wow fadeInUp">Meet The Team</h2>
<div class="col-md-4 col-12">
<div class="card event-card">
<div class="card hovercard">
<div class="cardheader">

</div>

<div class="avatar">
<img src="images/assets/team/kev.jpg" alt="lead avatar">
<img id= "bcol" src="images/assets/team/kev.jpg" alt="lead avatar">
</div>
<div class="info">
<div class="title">
<h5>Kelvin Kamau</h5>
<p>Lead Organizer</p>
<p>Lead / Android Developer</p>
</div>
<div class="desc">Android Developer</div>
<div class="desc">Open source enthusiast</div>
<div class="desc">Enjoys travelling</div>
</div>
<div class="bottom">
<ul class="social-list__inline mt-10">
<li>
<a href="https://twitter.com/kamaucodes" target="_blank" rel="noopener">
<i class="fab fa-twitter"></i>
</a>
</li>
<li>
<a href="https://github.com/kelvinkamau" target="_blank" rel="noopener">
<i class="fab fa-github"></i>
Expand All @@ -669,6 +659,12 @@ <h5>Kelvin Kamau</h5>
<i class="fab fa-linkedin"></i>
</a>
</li>
<li>
<a href="https://google.com/kamaucodes" target="_blank" rel="noopener">
<i class="fas fa-link"></i>
</a>
</li>

</ul>
</div>
</div>
Expand All @@ -677,40 +673,34 @@ <h5>Kelvin Kamau</h5>
<div class="col-md-4 col-12">
<div class="card event-card">
<div class="card hovercard">
<div class="cardheader">

</div>
<div class="avatar">
<img src="images/assets/team/anne.jpeg" alt="lead avatar">
<img id="ycol" src="images/assets/team/anne.jpeg" alt="lead avatar">
</div>
<div class="info">
<div class="title">
<h5>Anne Mburu</h5>
<p>Co-organizer</p>
<p>Co-Lead / Web Developer</p>
</div>
<div class="desc">Web developer</div>
<div class="desc">Open source enthusiast</div>
<div class="desc">Community mentor</div>
</div>
<div class="bottom">
<ul class="social-list__inline mt-10">
<li>
<a href="https://twitter.com/wambuicodes" target="_blank" rel="noopener">
<i class="fab fa-twitter"></i>
</a>
</li>
<li>
<a href="https://github.com/anniemburu/" target="_blank" rel="noopener">
<i class="fab fa-github"></i>
</a>
</li>

<li>
<a href="https://www.linkedin.com/in/ProfileName" target="_blank"
rel="noopener">
<i class="fab fa-linkedin"></i>
</a>
</li>
<li>
<a href="https://google.com/wambuicodes" target="_blank" rel="noopener">
<i class="fas fa-link"></i>
</a>
</li>

</ul>
</div>
</div>
Expand All @@ -719,28 +709,17 @@ <h5>Anne Mburu</h5>
<div class="col-md-4 col-12">
<div class="card event-card">
<div class="card hovercard">
<div class="cardheader">

</div>
<div class="avatar">
<img src="images/assets/team/juma.jpeg" alt="lead avatar">
<img id="rcol" src="images/assets/team/juma.jpeg" alt="lead avatar">
</div>
<div class="info">
<div class="title">
<h5>Collins Juma</h5>
<p>Volunteer</p>
<p>Volunteer / Java Developer</p>
</div>
<div class="desc">Web developer</div>
<div class="desc">Open source enthusiast</div>
<div class="desc">Community mentor</div>
</div>
<div class="bottom">
<ul class="social-list__inline mt-10">
<li>
<a href="https://Twitter.com/JumahCollyne" target="_blank" rel="noopener">
<i class="fab fa-twitter"></i>
</a>
</li>
<li>
<a href="https://github.com/CollyneJumah" target="_blank" rel="noopener">
<i class="fab fa-github"></i>
Expand All @@ -752,6 +731,12 @@ <h5>Collins Juma</h5>
<i class="fab fa-linkedin"></i>
</a>
</li>
<li>
<a href="https://google.com/JumahCollyne" target="_blank" rel="noopener">
<i class="fas fa-link"></i>
</a>
</li>

</ul>
</div>
</div>
Expand All @@ -762,29 +747,18 @@ <h5>Collins Juma</h5>
<div class="col-md-4 col-12">
<div class="card event-card">
<div class="card hovercard">
<div class="cardheader">

</div>
<div class="avatar">
<img src="images/assets/team/joshua.jpeg" alt="lead avatar">
<img id="bcol" src="images/assets/team/joshua.jpeg" alt="lead avatar">
</div>
<div class="info">
<div class="title">
<h5>Joshua Waithira</h5>
<p>Volunteer</p>
<p>Volunteer / Community Mentor</p>
</div>
<div class="desc">Software Engineer</div>
<div class="desc">Community mentor</div>
<div class="desc">Enjoys hiking</div>
</div>
<div class="bottom">
<ul class="social-list__inline mt-10">
<li>
<a href="https://twitter.com/ProfileName" target="_blank" rel="noopener">
<i class="fab fa-twitter"></i>
</a>
</li>
<li>
<li>
<a href="https://github.com/ProfileName" target="_blank" rel="noopener">
<i class="fab fa-github"></i>
</a>
Expand All @@ -795,6 +769,11 @@ <h5>Joshua Waithira</h5>
<i class="fab fa-linkedin"></i>
</a>
</li>
<li>
<a href="https://google.com/ProfileName" target="_blank" rel="noopener">
<i class="fas fa-link"></i>
</a>
</li>
</ul>
</div>
</div>
Expand All @@ -803,29 +782,17 @@ <h5>Joshua Waithira</h5>
<div class="col-md-4 col-12">
<div class="card event-card">
<div class="card hovercard">
<div class="cardheader">

</div>
<div class="avatar">
<img src="images/assets/team/trice.jpeg" alt="lead avatar">
<img id="ycol" src="images/assets/team/trice.jpeg" alt="lead avatar">
</div>
<div class="info">
<div class="title">
<h5>Beatrice Masila</h5>
<p>GDG Lead</p>
<p>GDG Lead / Software Dev</p>
</div>
<div class="desc">Software Dev <a href="http://www.tovutigroup.com">@Tovuti</a>
</div>
<div class="desc">Community mentor</div>
<div class="desc">Enjoys reading</div>
</div>
<div class="bottom">
<ul class="social-list__inline mt-10">
<li>
<a href="https://twitter.com/ProfileName" target="_blank" rel="noopener">
<i class="fab fa-twitter"></i>
</a>
</li>
<li>
<a href="https://github.com/ProfileName" target="_blank" rel="noopener">
<i class="fab fa-github"></i>
Expand All @@ -837,6 +804,11 @@ <h5>Beatrice Masila</h5>
<i class="fab fa-linkedin"></i>
</a>
</li>
<li>
<a href="https://google.com/ProfileName" target="_blank" rel="noopener">
<i class="fas fa-link"></i>
</a>
</li>
</ul>
</div>
</div>
Expand All @@ -845,29 +817,18 @@ <h5>Beatrice Masila</h5>
<div class="col-md-4 col-15">
<div class="card event-card">
<div class="card hovercard">
<div class="cardheader">

</div>
<div class="avatar">
<img src="images/assets/team/teresa.jpeg" alt="lead avatar">
<img id="rcol" src="images/assets/team/teresa.jpeg" alt="lead avatar">
</div>
<div class="info">
<div class="title">
<h5>Teresa Abuya</h5>
<p>DSC Faculty Adviser</p>
<p>DSC Faculty Adviser / IOT</p>
</div>
<div class="desc">Con-currency control</div>
<div class="desc">Bio Informatics</div>
<div class="desc">Internet Of Things</div>
</div>
<div class="bottom">
<ul class="social-list__inline mt-10">
<li>
<a href="https://twitter.com/ProfileName" target="_blank" rel="noopener">
<i class="fab fa-twitter"></i>
</a>
</li>
<li>
<li>
<a href="https://github.com/ProfileName" target="_blank" rel="noopener">
<i class="fab fa-github"></i>
</a>
Expand All @@ -878,6 +839,11 @@ <h5>Teresa Abuya</h5>
<i class="fab fa-linkedin"></i>
</a>
</li>
<li>
<a href="https://google.com/ProfileName" target="_blank" rel="noopener">
<i class="fas fa-link"></i>
</a>
</li>
</ul>
</div>
</div>
Expand Down

0 comments on commit 66cb279

Please sign in to comment.