Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
41 commits
Select commit Hold shift + click to select a range
a272ec6
arms
charstarstars Mar 8, 2017
0c28c4f
ears added
Mar 8, 2017
6291cdd
blue glasses
Mar 8, 2017
130e9aa
I changed the hat
Mar 8, 2017
0cf74f0
blue glasses
Mar 8, 2017
5826895
Added Moustache
DeAngeloD Mar 8, 2017
34a290c
potato Head Hat Flower
SaltMeister Mar 8, 2017
d60fc2e
added earrings
henguyen Mar 8, 2017
60ff703
message:nose
Alittlefatsheep Mar 8, 2017
859566a
mouth
Chronowork1 Mar 8, 2017
6623d98
eyes
kadieee Mar 8, 2017
772bf0f
eyebrows
Janelle1208 Mar 8, 2017
61177dd
this potatoe man has very small shoes.
eeerrrf Mar 8, 2017
36f4b6d
message
Janelle1208 Mar 8, 2017
e0e8733
Merge pull request #1 from DeAngeloD/master
charstarstars Mar 8, 2017
a00530e
Merge pull request #2 from Dragon159f/master
charstarstars Mar 8, 2017
54aefbb
Merge pull request #3 from kadieee/master
charstarstars Mar 8, 2017
5dd66a0
message:nose
Alittlefatsheep Mar 8, 2017
aa1f340
Merge pull request #4 from henguyen/master
charstarstars Mar 8, 2017
7b4e72d
Revert "added earrings"
charstarstars Mar 8, 2017
354027f
Merge pull request #12 from charstarstars/revert-4-master
charstarstars Mar 8, 2017
4909c60
Revert "Revert "added earrings""
charstarstars Mar 8, 2017
0ddc67b
Merge pull request #13 from charstarstars/revert-12-revert-4-master
charstarstars Mar 8, 2017
b36f88b
Merge branch 'master' into master
charstarstars Mar 8, 2017
9a52f0b
Merge pull request #5 from LFChrome/master
charstarstars Mar 8, 2017
afe085f
nose
Alittlefatsheep Mar 8, 2017
4b82140
added back files
Alittlefatsheep Mar 8, 2017
4b17570
Merge branch 'master' into master
charstarstars Mar 8, 2017
adb1cde
Merge pull request #6 from Dezhang1999/master
charstarstars Mar 8, 2017
9979c88
removed spaces
Alittlefatsheep Mar 8, 2017
4944acc
Merge branch 'master' into master
charstarstars Mar 9, 2017
c4f5d11
Merge branch 'master' into master
charstarstars Mar 9, 2017
628d9f7
Merge pull request #7 from eeerrrf/master
charstarstars Mar 9, 2017
bab8177
Merge pull request #8 from SaltMeister/master
charstarstars Mar 9, 2017
6da995f
Merge pull request #9 from Alittlefatsheep/master
charstarstars Mar 9, 2017
0cc4473
Merge branch 'master' into master
charstarstars Mar 9, 2017
330e5de
Merge pull request #10 from Chronowork1/master
charstarstars Mar 9, 2017
a753813
Merge branch 'master' into master
charstarstars Mar 9, 2017
cfb0296
Merge pull request #11 from Janelle1208/master
charstarstars Mar 9, 2017
2ae6b7d
Add new arms page
charstarstars Mar 10, 2017
28fc41b
Merge branch 'master' of github.com:charstarstars/Mr_Potato_Head
charstarstars Mar 10, 2017
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
Binary file added assets/flower.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
10 changes: 10 additions & 0 deletions pages/arms.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
<html>
<head>
<title>Potato Arms</title>
</head>
<body>
<img id="arms" src="../assets/arms.png">
<h1>Potato Arms</h1>
<p>some arms huh</p>
</body>
</html>
50 changes: 40 additions & 10 deletions potato.css
Original file line number Diff line number Diff line change
Expand Up @@ -19,20 +19,29 @@ h1 {

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



#arms_image {
top: 200px; left: 24px;
}

/* Insert CSS for ears below this line*/

#hat_image {
top: 2px; left: 100px;
}

#ears_image {
top: 105px; left:56px;
}


/* Insert CSS for eyes below this line*/

#eyes_image{
top: 88px; left: 130px;
}



Expand All @@ -47,17 +56,24 @@ h1 {


/* Insert CSS for eyebrows below this line*/

#eyebrows_image{
top:81px; left:111px;
}



/* Insert CSS for glasses below this line*/
#glasses_image {
top: 123px; left: 102px;
}




/* Insert CSS for hat below this line*/

#nose_image{
top:180px;left: 130px;
}



Expand All @@ -68,11 +84,17 @@ h1 {

/* Insert CSS for moustache below this line*/


#moustache_image {
top: 190px; left: 93px;
transform: rotate(-3deg);
}


/* Insert CSS for shoes below this line*/

#shoes_image{
top:330px;left: 150px;
height:20px;
}



Expand All @@ -82,7 +104,10 @@ h1 {


/* Insert CSS for earrings below this line*/

#earrings {
width:200px;
height:500px;
}



Expand All @@ -92,7 +117,12 @@ h1 {


/* Insert CSS for hatflower below this line*/

#hatflower {
width: 70px;
height: 70px;
left: 110px;
top: 5px;
}



Expand Down
23 changes: 12 additions & 11 deletions potatohead.html
Original file line number Diff line number Diff line change
Expand Up @@ -13,21 +13,22 @@ <h1>Mr. Potato Head</h1>

<div id="potato">
<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" >
<img id="eyebrows_image" >
<img id="glasses_image" >
<img id="hat_image" >
<img id="moustache_image" >
<img id="shoes_image" >
<img id="arms_image" src="assets/arms.png">
<img id="ears_image" src="assets/ears.png">
<img id="eyes_image" src="assets/eyes.png">
<img id="mouth_image" src="assets/mouth.png">
<img id="nose_image"src="assets/nose.png">
<img id="eyebrows_image" src="assets/eyebrows.png">
<img id="glasses_image" src="assets/glasses.png" >
<img id="hat_image" src="assets/hat.png">
<img id="moustache_image" src="assets/moustache.png">
<img id="shoes_image" src="assets/shoes.png" >
<img id="cane">
<img id="earrings">
<img id="earrings" img src="http://www.venusbymariatash.com/media/catalog/product/cache/1/small_image/376x490/c762bd6c9a23a6f92a77ee829195f957/C/E/CETIV65D_B_1.png">
<img id="hatflower">
<img id="boosters">
</div>
<a href="pages/arms.html">CLICK MEEEE (arms)</a>

</body>
</html>
2 changes: 1 addition & 1 deletion script.js
Original file line number Diff line number Diff line change
@@ -1 +1 @@

$('#potato').append('hiiii');