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

Updating Avatars #34

Merged
merged 10 commits into from
Apr 5, 2017
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
2 changes: 1 addition & 1 deletion _includes/page_content.html
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
<section>
<section style="overflow: hidden">
{{ content }}
</section>
2 changes: 1 addition & 1 deletion about.html
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ <h3>PARTNER, DIRECTOR OF PRODUCT DEVELOPMENT</h3>
<p>
Karl knows software. Karl knows hardware. Most importantly, Karl knows execution.
He is responsible for Veux’s mobile software and systems architecture, Agile product
development process, and project management
development process, and project management.
<a style="cursor: pointer;" class="button" onclick="showMore(this)" >Read more..</a>
<span class="read-more-target-1 ">
He has deep expertise in connecting apps and hardware through Bluetooth and Wi-Fi
Expand Down
5 changes: 3 additions & 2 deletions contact.html
Original file line number Diff line number Diff line change
Expand Up @@ -26,14 +26,15 @@ <h1> Contact Us </h1>
<div class="col-lg-6 col-md-6 col-sm-6 col-xs-12 mid-column1">
<h2>Portland</h2>
<img src="../img/contactEmailIcon.svg" data-no-retina class="img-responsive icon"/>
<span> [email protected] </span> <br>
<a href="mailto:[email protected]"><span>[email protected] </span> </a>
<br>
<img src="../img/contactPhoneIcon.svg" data-no-retina class="img-responsive icon"/>
<span> +1 (503) 928-7731 </span> <br>
</div>
<div class="col-lg-6 col-md-6 col-sm-6 col-xs-12 mid-column2">
<h2>Boston</h2>
<img src="../img/contactEmailIcon.svg" data-no-retina class="img-responsive icon"/>
<span> [email protected] </span> <br>
<a href="mailto:[email protected]"><span> [email protected] </span></a> <br>
<img src="../img/contactPhoneIcon.svg" data-no-retina class="img-responsive icon"/>
<span> +1 (617) 863-0245 </span> <br>
</div>
Expand Down
19 changes: 16 additions & 3 deletions css/landing-page.css
Original file line number Diff line number Diff line change
Expand Up @@ -1574,10 +1574,9 @@ footer .copyright {
}

.content.contact h1 {
min-height: 80px;
margin: 30px 0px;
color: #4e4b4a;
padding-right: 20px
padding-right: 20px;
margin-top: 0;
}

.content.contact .description {
Expand Down Expand Up @@ -1627,6 +1626,20 @@ footer .copyright {
top: 2px;
}

.our-team.contact .office a {
font-family: 'Ubuntu';
font-size: 18px;
font-weight: 300;
line-height: 30px;
letter-spacing: 0.5px;
position: relative;
top: 2px;
color: white;
}
.our-team.contact .office a:hover {
cursor: pointer;
}

.our-team.contact .office span a {
color: white !important;
}
Expand Down
48 changes: 43 additions & 5 deletions img/andre.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
8 changes: 8 additions & 0 deletions img/avatar_man.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
8 changes: 8 additions & 0 deletions img/avatar_woman.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading