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.

Sign up for GitHub

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

Xinyi's Assignment #2 #16

Open
wants to merge 4 commits into
base: gh-pages
Choose a base branch
from
Open

Xinyi's Assignment #2 #16

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
81a520c
Xinyi's Assignment #2
Sep 18, 2014
c7af62d
newline
Sep 18, 2014
70c8666
Merge branch 'gh-pages' of https://github.com/DDrug/instructional int…
Sep 18, 2014
9976a58
Xinyi Deng's Assignment#2
Sep 18, 2014
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
15 changes: 2 additions & 13 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,2 @@
# Instructional Thing

## Part I

> Make a small tutorial or instructional "thing" that could be understood by someone who doesn't speak English. Use any medium/materials/style you want, *other* than a web page: crayon drawing, [aircraft safety card](https://www.google.com/search?q=aircraft+safety+card&tbm=isch), origami, Lego diorama, [IKEA-style manual](http://www.ikea.com/ms/en_US/customer_service/assembly_instructions.html), etc.

*Describe your project here*

## Part II

> Take the [first week's](https://github.com/bfl-itp/syllabus/blob/master/schedule.md#sep-4) offline Instructional Thing assignment online. Reimagine it for (and take advantage of) the new medium. For example: if Part I was a stop-frame animation, Part II might be a slideshow where the user can click between the steps.

*Describe your project here – explain the evolution, and what was gained and lost from using this new medium*
ColorMixture
============
27 changes: 27 additions & 0 deletions colorMixture.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
<!DOCTYPE html>
<html>
<head>
<meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>Color Mixture</title>

<script src="js/jquery-1.11.1.min.js"></script>
<script src="js/bootstrap.min.js"></script>
<script type="text/javascript" src="scripts/custom.js"></script>

<link rel="stylesheet" type="text/css" href="css/bootstrap.min.css">
<link rel="stylesheet" href="styles/custom.css" type="text/css" media="screen" />
</head>
<body>
<div class="container-fluid">
<h1>Color Mixture</h1>
<ul id="colormixture">
<li><a href="img/orange.png" title="Red + Yellow = Orange"><img src="img/red.png" /> + <img src="img/yellow.png" />=</a></li>
<li><a href="img/purple.png" title="Red + Blue = Purple"><img src="img/red.png" /> + <img src="img/blue.png" />=</a></li>
<li><a href="img/green.png" title="Yellow + Blue = Green"><img src="img/yellow.png" /> + <img src="img/blue.png" />=</a></li>

</ul>
<p id="description">Choose a color mixture.</p>
<img id="placeholder" src="img/placeholder.png" alt="color mixture" />
</div>
</body>
</html>
442 changes: 442 additions & 0 deletions css/bootstrap-theme.css
View file
Open in desktop

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions css/bootstrap-theme.css.map
View file
Open in desktop

Large diffs are not rendered by default.

5 changes: 5 additions & 0 deletions css/bootstrap-theme.min.css
View file
Open in desktop

Large diffs are not rendered by default.

Loading