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.

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

rm mike; change border; change icon; #5

Merged
merged 3 commits into from
Feb 24, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
7 changes: 0 additions & 7 deletions _config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -64,13 +64,6 @@ people:
- title: linkedin
url: https://www.linkedin.com/in/tedkoyan

- name: Mike Zhao
pic: mike
position: iOS Developer
social:
- title: github
url: https://github.com/DeRedBaron

- name: Yifei Teng
pic: yifei
position: Backend, DevOps
Expand Down
7 changes: 4 additions & 3 deletions _includes/css/agency.css
Original file line number Diff line number Diff line change
Expand Up @@ -273,10 +273,11 @@ header {
-moz-background-size: cover;
background-size: cover;
-o-background-size: cover;
min-height: 61.8vh;
}

header .intro-text {
padding-top: 100px;
padding-top: 20vh;
padding-bottom: 50px;
}

Expand Down Expand Up @@ -655,7 +656,7 @@ section h3.section-subheading {

.team-member img {
margin: 0 auto;
border: 7px solid #fff;
border: 8px solid #f7f7f7;
}

.team-member h4 {
Expand All @@ -676,7 +677,7 @@ section h3.section-subheading {
}
.team-member img {
margin: 0 auto;
border: 7px solid #fff;
border: 8px solid #f7f7f7;
width : 40%;
float: left;
position:relative!important;
Expand Down
7 changes: 5 additions & 2 deletions _includes/member.html
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,14 @@ <h4>{{ member.name }}</h4>
<p class="text-muted">{{ member.position }}</p>
<ul class="list-inline social-buttons">
{% for network in member.social %}
{% if network.title == 'email' %}
{% case network.title %}
{% when 'email' %}
{% assign icon_name = 'envelope-o' %}
{% when 'github' %}
{% assign icon_name = 'github-alt' %}
{% else %}
{% assign icon_name = network.title %}
{% endif %}
{% endcase %}
<li><a href="{{ network.url }}" target="_blank" ><i class="fa fa-{{ icon_name }}"></i></a>
{% endfor %}
</ul>
Expand Down
4 changes: 2 additions & 2 deletions css/font-awesome/css/font-awesome.css
Original file line number Diff line number Diff line change
Expand Up @@ -1512,6 +1512,6 @@ Customized
}

.fa-zhihu{
-webkit-transform: rotateX(180deg) translateY(0.0rem) translateX(0.1rem);
transform: rotateX(180deg) translateY(0.0rem) translateX(0.1rem);
-webkit-transform: rotateX(180deg) translateY(0.25rem) translateX(0.1rem);
transform: rotateX(180deg) translateY(0.25rem) translateX(0.1rem);
}
Binary file removed img/team/mike.jpg
Binary file not shown.