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
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
*.swp
*~
24 changes: 0 additions & 24 deletions Directions.txt

This file was deleted.

56 changes: 54 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,57 @@
# Welcome to the Potato Head Game!
#Unit 7 Project 1: Mr. Potato Head

We can build a potato head together using Github
![Imgur](http://i.imgur.com/Vy06FW3.gif)

Together we can create a Mr. Potato Head using GitHub!


###Directions
1. Find your teacher on github.com and find the `Mr_Potato_Head` repository:
2. Fork the Repo
3. Create a new workspace for this repository using the clone from Git URL from your repository.
4. Add your assigned body part to `potatohead.html`. Body parts can be found in the `assets` folder
5. Add the necessary CSS to your body part in the `potato.css` file.
6. Push your changes to your GitHub repo
7. Create a Pull request to your teacher's repo


##Remember: **Fork, Change, Push, Pull**
In Cloud 9 terminal:

```
git status
```

You should see that potatohead.html and potato.css are modified, like this:

```
modified: potatohead.html
modified: potato.css
```

### Make a commit
Stage your changes in the index with `git add .`, then commit them. The string after `-m` in `git commit` is the commit message. Don't use "Commit message" as your message!
Instead, say what you did, for example "added body part [your assigned body part]"

```
git add .
git commit -m "Commit message" <<< but change the message!
```


### Send this commit up to github
Push your local commit up to github

```
git push origin master
```

look at your github: You should see the commit you just made! If you click "Commits" you can see the all of the work that has been put into Mr Potato Head, and you are at the top!

### Make a pull request

From your GitHub create a "New Pull Request" (the green button) to send your changes to the instructor. The instructor will merge all of the changes (everyone's body parts), and at the end hopefully we'll have a whole Mr. Potato Head.

### Bonus

1. Create a button that sits below Mr. Potato Head that when it is clicked your body part will show or hide.
File renamed without changes
Binary file added assets/body.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
40 changes: 40 additions & 0 deletions assets/potato.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
h1 {
text-align: center;
}


#potato {
position: relative;
width: 367px;
height: 428px;
border: 2px solid black;
margin-left: auto;
margin-right: auto;
background-color: white;
}

#potato img {
position: absolute;
}

#body { top: 28px; left: 68px; }

#arms { top: 177px; left: 26px;}

#ears { top: 104px; left: 58px; }

#eyes { top: 126px; left: 132px; z-index: 4; }

#mouth { top: 233px; left: 119px; z-index: 4; }

#nose { top: 170px; left: 131px; z-index: 6; }

#eyebrows { top: 102px; left: 109px; z-index: 5;}

#glasses { top: 121px; left: 97px; z-index: 7;}

#hat { top: 28px; left: 101px; z-index: 10;}

#moustache { top: 189px; left: 91px; z-index: 5;}

#shoes { top: 297px; left: 46px;}
File renamed without changes
102 changes: 102 additions & 0 deletions potato.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,102 @@
h1 {
text-align: center;
}


#potato {
position: relative;
width: 367px;
height: 500px;
border: 2px solid black;
margin-left: auto;
margin-right: auto;
background-color: white;
}

#potato img {
position: absolute;
}

/* Insert CSS for body below this line*/
#body {
top: 28px; left: 68px;
}
/* Insert CSS for arms below this line*/




/* Insert CSS for ears below this line*/




/* Insert CSS for eyes below this line*/




/* Insert CSS for mouth below this line*/




/* Insert CSS for nose below this line*/




/* Insert CSS for eyebrows below this line*/




/* Insert CSS for glasses below this line*/




/* Insert CSS for hat below this line*/




/* Insert CSS for arms below this line*/




/* Insert CSS for moustache below this line*/




/* Insert CSS for shoes below this line*/




/* Insert CSS for cane below this line*/




/* Insert CSS for earrings below this line*/




/* Insert CSS for arms below this line*/




/* Insert CSS for hatflower below this line*/




/* Insert CSS for boosters below this line*/



14 changes: 10 additions & 4 deletions potatohead.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,18 @@
<html>
<head>
<title>Mr. Potato Head</title>
<link href="./potatohead_files/potato.css" type="text/css" rel="stylesheet">
<link href="potato.css" type="text/css" rel="stylesheet">
<script src="https://code.jquery.com/jquery-1.11.3.min.js"></script>
<script src="script.js"></script>
</head>

<body>
<h1>Mr. Potato Head</h1>
<h2 id="status">He is wearing: </h2>

<div id="potato">
<img id="arms_image" src="potatohead_files/arms.png" alt="arms" style="top: 177px; left: 26px;">
<img id="ears_image" >
<img id="body" src="assets/body.png">
<img id="arms_image">
<img id="ears_image">
<img id="eyes_image" >
<img id="mouth_image" >
<img id="nose_image" >
Expand All @@ -21,6 +23,10 @@ <h2 id="status">He is wearing: </h2>
<img id="hat_image" >
<img id="moustache_image" >
<img id="shoes_image" >
<img id="cane">
<img id="earrings">
<img id="hatflower">
<img id="boosters">
</div>

</body>
Expand Down
Loading