Skip to content

Commit

Permalink
Merge branch 'master' of github.com:gitcoinco/web
Browse files Browse the repository at this point in the history
  • Loading branch information
@owocki
owocki committed Apr 20, 2018
2 parents d0b0125 + 63177b0 commit 07903ba
Show file tree
Hide file tree
Showing 4 changed files with 238 additions and 97 deletions.
136 changes: 136 additions & 0 deletions app/assets/v2/css/about.css
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,139 @@
.section {
border-top: 1px solid #EAEAEA;
margin: auto;
}

#team,
#jobs {
background-color: #FFFFFF;
}

#team .row {
margin: auto;
}

h4 {
letter-spacing: 0;
}

.caption {
font-weight: bold;
}

#team p,
#jobs p {
text-align: center;
font-family: "Muli", sans-serif;
}

#team .card {
box-shadow: 0px 3px 15px rgba(0,0,0,0.2);
border-radius: 0;
background:#FFFFFF;
padding: 1.5rem 1.5rem 0;
margin: auto;
margin-top: 1em;
margin-bottom: 1em;
width: 14em;
text-align: center;
}

#team .role,
#jobs .title,
#team .card .title {
color: #999;
}

#team .card .desc {
font-weight: bolder;
}

#team .avatar {
border: 0.1rem solid #1AB56D;
width: 77px;
height: 77px;
border-radius: 50%;
margin: auto;
margin-bottom: 10px;
}

#team .name {
color: #1AB56D;
margin-bottom: 5px;
}

#team .social-links {
margin-bottom: 10px;
}

#team .social-links a svg {
font-size: 1.25em;
transition: all 0.3s;
color: black;
}

#team .social-links a {
display: inline-block;
}

.gitcoin-svg {
background-size: cover !important;
background-image: url("/static/v2/images/ios/gitcoin.svg");
width: 2em;
height: 2em;
position: relative;
top: 4px;
}

#team .social-links a:hover svg {
color: #1AB56D;
transform: scale(1.5) rotate(360deg);
}

#jobs {
padding-bottom: 2em;
}

#jobs .caption {
margin-bottom: 2em;
}

#jobs .right p {
text-align: left;
}

#jobs .left p {
text-align: right;
}

#jobs .title.font-caption {
text-decoration: none;
font-weight: bold;
transition: all 0.3s;
}

#jobs .title:hover {
color: #1AB56D;
}

#jobs .right .font-heading,
#jobs .left .font-heading {
font-weight: bold;
}

@media (max-width: 767.98px) {
#jobs .left p,
#jobs .right p {
text-align: center;
}

#jobs .left {
margin-bottom: 2em;
}
}

/* TODO: Clean up CSS*/

div.teamProfileLeft,
div.communityProfile {
background-color: #eff4ee;
Expand Down
2 changes: 1 addition & 1 deletion app/assets/v2/js/pages/bounty_details.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -212,7 +212,7 @@ var callbacks = {
} else {
$('#timer').hide();
}
} else if (result['status'] === 'done') {
} else if (result['status'] === 'done' || result['status'] === 'cancelled') {
$('#timer').hide();
} else {
response.shift();
Expand Down
131 changes: 47 additions & 84 deletions app/retail/templates/about.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -97,57 +97,42 @@ <h6 style="text-align: center;" >{% trans "Who, what, when, where, and most impo
</div>
</div>
</div>
<div class="container-fluid" id="team" style="background: white; position: relative; overflow: hidden;">
<div id="team" class="container-fluid section">
{% include 'shared/rain.html' with class="grey" %}
<div class="row">
<div class="col pb-4">
<h4>{% trans "Team" %}</h4>
<h6 style="text-align: center;" >{% trans "Built By &amp; For Open Source Software Developers" %}</h6>
<div class="col-12 mb-4">
<h4 class="font-heading">{% trans "Team" %}</h4>
<p class="font-subheader caption">{% trans "Built By &amp; For Open Source Software Developers" %}</p>
</div>
</div>
<div class="row animatedParent">
<div class="col pb-4 flex-column text-center animated fadeInLeftShort">
{% for avatar, name, role, handle, feature, food in team_members_left %}
<div class="teamProfileLeft">
<img class="teamProfileAvatar img-fluid" src="{{avatar}}">
<p>
<span class="font-bigger-1 font-weight-300"><strong>{{name}}</strong></span>
<br>
<span class="font-smaller-1"><em>{{role}}</em></span>
</p>
<a href="https://gitcoin.co/profile/{{handle}}"><img class="teamProfileSocialImg" src="{% static "v2/images/social/gitcoin.png" %}"></a>
<a href="https://github.com/{{handle}}"><img class="teamProfileSocialImg" src="{% static "v2/images/social/github.png" %}"></a>
<p>
<strong>Favorite Gitcoin Feature:</strong> {{feature}}
<br>
<strong>Favorite Food:</strong> {{food}}
</p>
</div>
{% endfor %}
</div>
<div class="col pb-4 animated text-center fadeInRightShort">
{% for avatar, name, role, handle, feature, food in team_members_right %}
<div class="teamProfileRight">
<img class="teamProfileAvatar img-fluid" src="{{avatar}}">
<p>
<span class="font-bigger-1 font-weight-300"><strong>{{name}}</strong></span>
<br>
<span class="font-smaller-1"><em>{{role}}</em></span>
</p>
<a href="https://gitcoin.co/profile/{{handle}}"><img class="teamProfileSocialImg" src="{% static "v2/images/social/gitcoin.png" %}"></a>
<a href="https://github.com/{{handle}}"><img class="teamProfileSocialImg" src="{% static "v2/images/social/github.png" %}"></a>
<p>
<strong>Favorite Gitcoin Feature:</strong> {{feature}}
<br>
<strong>Favorite Food:</strong> {{food}}
</p>
</div>
<div class="row">
<div class="col-12 offset-lg-2 col-lg-8 row">
{% for avatar, name, role, handle, linkedin, feature, food in core_team %}
<div class="col-12 col-md-6 col-lg-4">
<div class="card">
<img class="avatar" src="{{avatar}}">
<p class="name">{{name}}</p>
<p class="role font-caption">{{role}}</p>
<p class="font-caption">
<span class="title">Favorite Gitcoin Feature</span></br>
<span class="desc">{{feature}}</span>
</p>
<p class="font-caption">
<span class="title">Favorite Food</span></br>
<span class="desc">{{food}}</span>
</p>
<div class="social-links">
<a href="https://www.linkedin.com/in/{{linkedin}}"><i class="fab fa-linkedin"></i></a>
<a href="https://gitcoin.co/profile/{{handle}}"><div class="gitcoin-svg"></div></a>
<a href="https://github.com/{{handle}}"><i class="fab fa-github"></i></a>
</div>
</div>
</div>
{% endfor %}
</div>
</div>
<div class="row">
<div class="col pb-4">
<hr>
<h4>{% trans "Community" %}</h4>
<h6 style="text-align: center;" >{% trans "Gitcoin's Top Community Members" %}</h6>
</div>
Expand All @@ -166,68 +151,46 @@ <h6 style="text-align: center;" >{% trans "Gitcoin's Top Community Members" %}</
{% endfor %}
</div>
</div>
<div class="row" id="jobs">
<div class="col pb-4 " >
<hr>
<h4>{% trans "Join Us" %}</h4>
<h6 style="text-align: center;" >{% trans "Want to Grow Open Source? We want to hear from you." %}</h6>
</div>
<div class="row" id="jobs">
<div class="col-12 row section font-body">
<div class="col-12">
<h4 class="font-heading">{% trans "Join Us" %}</h4>
<p class="font-subheader caption" >{% trans "Want to Grow Open Source? We want to hear from you." %}</p>
</div>
</div>
<div class="row">
<div class="col pb-4 text-center align-items-center">
<p class="font-bigger-1">
<strong>{% trans "Open Gitcoin Roles" %}</strong>
</p>
<div class="col-12 col-md-6 left">
<p class="font-heading">{% trans "Open Gitcoin Roles" %}</p>
<p>
{% trans "Front End Developer" %} -- Gitcoin |
<a href="https://consensys.net/open-positions/?gh_jid=924578">
{% trans "Front End Developer" %}
<a class="title font-caption" href="https://consensys.net/open-positions/?gh_jid=924578">
{% trans "Learn More" %}
</a>
</p>
<p>
{% trans "Technical Business Development Lead" %} -- Gitcoin |
<a href="https://consensys.net/open-positions/?gh_jid=1025695">
{% trans "Technical Business Development Lead" %}
<a class="title font-caption" href="https://consensys.net/open-positions/?gh_jid=1025695">
{% trans "Learn More" %}
</a>
</p>
<p>
{% trans "Entrepreneur In Residence" %} -- Gitcoin |
<a href="https://new.consensys.net/careers/?gh_jid=1086781">
{% trans "Entrepreneur In Residence" %}
<a class="title font-caption" href="https://new.consensys.net/careers/?gh_jid=1086781">
{% trans "Learn More" %}
</a>
</p>

<p class="font-bigger-1">
<strong>{% trans "Open Bounties.Network Roles" %}</strong>
</p>
</div>
<div class="col-12 col-md-6 right">
<p class="font-heading">{% trans "Open Bounties.Network Roles" %}</p>
<p>
{% trans "Data Scientist" %} -- Bounties.Network |
<a href="https://consensys.net/open-positions/?gh_jid=945245">
{% trans "Data Scientist" %}
<a class="title font-caption" href="https://consensys.net/open-positions/?gh_jid=945245">
{% trans "Learn More" %}
</a>
</p>
<p class="font-bigger-1">
<strong>{% trans "Waitlisted Roles" %}</strong>
<p style="max-width: 600px; margin: 0px auto;"><i>{% blocktrans %}(These roles were recently filled, but may open up again in a couple months. You're welcome to <a href="https://gitcoin.co/slack">join the community</a>, that's likely where we'll source them when they re-open.){% endblocktrans %}</i></p>
</p>
<p>
{% trans "Developer" %} -- Gitcoin
</p>
<p>
{% trans "Content and Marketing Manager" %} -- Gitcoin
</p>
<p>
{% trans "Community Manager" %} -- Gitcoin
</p>
<p>
{% trans "Customer Experience Manager" %} -- Gitcoin
</p>
<p>
{% trans "Senior Product Designer" %} -- Gitcoin
</p>
</div>
</div>
</div>
</div>
<div id='note'>
&nbsp;
</div>
Expand Down
Loading

0 comments on commit 07903ba

Please sign in to comment.