Skip to content
Open
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
4 changes: 2 additions & 2 deletions css/screen.min.css
Original file line number Diff line number Diff line change
Expand Up @@ -382,7 +382,7 @@ a:hover {
}

.first-nav__languages a.is-selected, .first-nav__languages a:hover, .first-nav__links a.is-selected, .first-nav__links a:hover {
color: #2c3e50;
color: #fafafa;
border:0
}

Expand Down Expand Up @@ -410,7 +410,7 @@ a:hover {
.first-nav__navcontrol:before {
display: inline-block;
margin-right: 10px;
color: #ecf0f1;
color: #2f5e4c;
font-size: 20px;
-webkit-transition: color .5s;
-o-transition: color .5s;
Expand Down
Binary file modified images/logos/.DS_Store
Binary file not shown.
27 changes: 13 additions & 14 deletions index.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width,initial-scale=1">
<title>HCI Lab @ California State University</title>
<title>HCI Lab @ California Polytechnic State University</title>
<link href="https://fonts.googleapis.com/css?family=Open+Sans:300italic,400italic,600italic,700italic,800italic,300,400,600,700,800%7COpen+Sans+Condensed:300&amp;subset=latin,cyrillic"
rel="stylesheet" type="text/css">
<link rel="stylesheet" href="css/screen.min.css">
Expand Down Expand Up @@ -42,11 +42,9 @@
<nav class="first-nav__links">
<ul>
<li>
<a class="is-selected">english</a>
</li>
<li>
<a href="#">spanish</a>
<a class="is-selected">HCI Lab</a>
</li>

</ul>
</nav>
<a class="first-nav__navcontrol icon icon_menu js-navcontrol" href="#">Menu</a>
Expand All @@ -55,7 +53,7 @@
<div class="second-nav js-nav">
<div class="container">
<a class="second-nav__logo">
<span>PHP</span>
<span>HCI</span>
</a>
<nav class="menu">
<ul>
Expand Down Expand Up @@ -88,8 +86,8 @@
<div class="home-section__overlay">
<div class="container">
<header class="home-section__header">
<h1>Poly Hanoi Project</h1>
<h2>A Cal Poly SLO Project</h2>
<h1>Human-Computer Interaction Lab</h1>
<h2>California Polytechnic State University</h2>
</header>
</div>
</div>
Expand All @@ -103,7 +101,7 @@ <h2>About our Project</h2>
<h4>Started in 20XX and Led by Javier Gonzalez Sanchez & Rafael Antonio Guerra Silva</h4>
</header>
<div class="about-card__info">
<p>The Poly Hanoi Project focuses on the integration of advanced robotics
<p>The Human-Computer Interaction Lab focuses on the integration of advanced robotics
with human workforces to create seamless and efficient collaboration between
humans and robots. Our project aims to enhance productivity and safety in various
industries by leveraging the strengths of both human intelligence and robotic precision.</p>
Expand Down Expand Up @@ -280,7 +278,7 @@ <h2>Team</h2>
</figcaption>
<blockquote>
<p class=>Joseph Perez is fourth-year Cal Poly Computer science major that is about to graduate. He has been working through the BEACoN Research Program with several research projects including
a groundwater assessment in Paso Robles and the Cal Poly Hanoi Project.</p>
a groundwater assessment in Paso Robles and the HCI Lab.</p>
</blockquote>
</li>
<li class="team__item">
Expand Down Expand Up @@ -346,7 +344,8 @@ <h2>Contact information</h2>
<h4>For more information about our porject or any questions</h4>
</header>
<div class="contact-info">
<div class="contact-info__logo">PHP</div>
<div class="contact-info__logo">HCI</div>

<div class="contact-info__group">
<div class="contact-info__additional">
<p>"Learn by Doing"</p>
Expand All @@ -355,8 +354,8 @@ <h4>For more information about our porject or any questions</h4>

</div>
<div class="contact-info__vcard vcard">
<h4 class="fn org">Project Team</h4>
<p class="role title">Cal Poly Hanoi Project</p>
<h4 class="fn org">Human-Computer Interaction Lab</h4>
<p class="role title">California Polytechnic State University</p>
<p class="icon icon_location">
<a class="adr js-anchor" href="#gmap">
<span class="country-name">United States</span>
Expand All @@ -365,7 +364,7 @@ <h4 class="fn org">Project Team</h4>
</a>
</p>
<p class="icon icon_mail">
<a class="email" href="[email protected]">PHPTeam@PHPteam.com</a>
<a class="email" href="[email protected]">HCITeam@HCIteam.com</a>
</p>

</div>
Expand Down