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

everything before js #1

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
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
3 changes: 2 additions & 1 deletion static/css/introHCI.css
Original file line number Diff line number Diff line change
Expand Up @@ -31,4 +31,5 @@ body {
right: 0;
position: absolute;
z-index: -1;
}
}

65 changes: 37 additions & 28 deletions static/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,17 @@
<title>HCI Project Portfolio</title>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">

<!-- Bootstrap -->
<link href="css/bootstrap.min.css" rel="stylesheet">
<link href="css/bootstrap-theme.min.css" rel="stylesheet">

<!-- this is a comment in HTML -->
<link href="css/introHCI.css" rel= "stylesheet">

<script src="https://code.jquery.com/jquery.js"></script>

<script src="js/bootstrap.min.js"></script>
<!-- HTML5 Shim and Respond.js IE8 support of HTML5 elements and media queries -->
<!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
<!--[if lt IE 9]>
Expand All @@ -16,64 +25,64 @@
</head>

<body>
<div>
<div class="container">
<!-- h1 through h6 are headers. The higher the number, the smaller the header -->
<!-- p means paragraph -->
<div>
<h1>Michael Bernstein</h1>
<p>human-computer interaction &middot; social computing &middot; crowdsourcing</p>
<div class="jumbotron">
<h1>Yuxiao Fang</h1>
<p>human-computer interaction &middot; natural computation &middot; machine learning</p>
</div>


<h4>Projects</h4>
<!-- divs are invisible structuring elements that stack vertically by default. Use them to organize your code -->
<!-- img tags are images. Lorem Pixel will deliver random images; handy! -->
<!-- a are anchors, also known as hyperlinks. Use the href attribute to tell the browser where to go when the user clicks -->
<div id="project1">
<a href="project.html">
<img src="images/lorempixel.people.1.jpeg" alt="Lorem Pixel image">
<div class= "project" id="project1">
<a href="project.html" class="thumbnail">
<img src="images/lorempixel.people.1.jpeg" alt="Lorem Pixel image" class="img">
<p>Waiting in Line</p>
</a>
</div>
<div id="project2">
<a href="project.html">
<img src="images/lorempixel.city.1.jpeg" alt="Lorem Pixel image">
<div class= "project" id="project2">
<a href="project.html" class="thumbnail">
<img src="images/lorempixel.city.1.jpeg" alt="Lorem Pixel image" class="img">
<p>Needfinding</p>
</a>
</div>
<div id="project3">
<a href="project.html">
<img src="images/lorempixel.technics.1.jpeg" alt="Lorem Pixel image">
<div class= "project" id="project3">
<a href="project.html" class="thumbnail">
<img src="images/lorempixel.technics.1.jpeg" alt="Lorem Pixel image" class="img">
<p>Prototyping</p>
</a>
</div>
<div id="project4">
<a href="project.html">
<img src="images/lorempixel.abstract.1.jpeg" alt="Lorem Pixel image">
<div class= "project" id="project4">
<a href="project.html" class="thumbnail">
<img src="images/lorempixel.abstract.1.jpeg" alt="Lorem Pixel image" class="img">
<p>Heuristic Evaluation</p>
</a>
</div>
<div id="project5">
<a href="project.html">
<img src="images/lorempixel.abstract.8.jpeg" alt="Lorem Pixel image">
<div class= "project" id="project5">
<a href="project.html" class="thumbnail">
<img src="images/lorempixel.abstract.8.jpeg" alt="Lorem Pixel image" class="img">
<p>Visualization</p>
</a>
</div>
<div id="project6">
<a href="project.html">
<img src="images/lorempixel.people.2.jpeg" alt="Lorem Pixel image">
<div class= "project" id="project6">
<a href="project.html" class="thumbnail">
<img src="images/lorempixel.people.2.jpeg" alt="Lorem Pixel image" class="img">
<p>Social design</p>
</a>
</div>
<div id="project7">
<a href="project.html">
<img src="images/lorempixel.technics.2.jpeg" alt="Lorem Pixel image">
<div class= "project" id="project7">
<a href="project.html" class="thumbnail">
<img src="images/lorempixel.technics.2.jpeg" alt="Lorem Pixel image" class="img">
<p>Gestural interaction</p>
</a>
</div>
<div id="project8">
<a href="project.html">
<img src="images/lorempixel.city.2.jpeg" alt="Lorem Pixel image">
<div class= "project" id="project8">
<a href="project.html" class="thumbnail">
<img src="images/lorempixel.city.2.jpeg" alt="Lorem Pixel image" class="img">
<p>Design tools</p>
</a>
</div>
Expand Down