Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
c05b4d0
steven's changes
hernands16 Jan 31, 2017
5732f91
I added the mosutache and shoes to Mr. Potato
Henrywheels Jan 31, 2017
4c266ed
Sheylas changes
Sheylaarreaga11 Jan 31, 2017
9a638c2
I did the arms
FrancyCaceres20 Feb 1, 2017
0b10dd5
Merge pull request #2 from Henrywheels/master
A-Tawfik Feb 1, 2017
67b1254
Merge pull request #1 from slicksteve/master
A-Tawfik Feb 1, 2017
d52e8e8
sheylas changes
Sheylaarreaga11 Feb 2, 2017
3f45236
adjusted the nose
Henrywheels Feb 2, 2017
b77db03
mouth
hernands16 Feb 2, 2017
945c950
Merge branch 'master' into master
A-Tawfik Feb 2, 2017
dd11b67
Merge pull request #4 from Sheylaarreaga11/master
A-Tawfik Feb 2, 2017
7973976
My change
serg6705 Feb 2, 2017
c8bfffb
Merge branch 'master' into master
A-Tawfik Feb 2, 2017
da9c55a
Merge pull request #3 from FrancyCaceres20/master
A-Tawfik Feb 2, 2017
ba9b7a7
Merge pull request #5 from Henrywheels/master
A-Tawfik Feb 2, 2017
bdfb6d8
Merge pull request #6 from slicksteve/master
A-Tawfik Feb 2, 2017
44822fe
Merge branch 'master' into master
A-Tawfik Feb 2, 2017
d2f883e
Merge pull request #7 from serg6705/master
A-Tawfik Feb 2, 2017
38ee835
shoes redo
Henrywheels Feb 2, 2017
8459309
Merge pull request #8 from Henrywheels/master
A-Tawfik Feb 2, 2017
2439592
added eyebrows
hansell24 Feb 2, 2017
138fc8b
Update potatohead.html
A-Tawfik Feb 2, 2017
0e79fc4
Merge branch 'master' into master
A-Tawfik Feb 2, 2017
23101cf
Merge pull request #9 from hansell24/master
A-Tawfik Feb 2, 2017
ab04289
Revert "added eyebrows"
A-Tawfik Feb 2, 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
36 changes: 32 additions & 4 deletions potato.css
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,14 @@ h1 {
}
/* Insert CSS for arms below this line*/

#arms_image{
bottom:202px; right:27px;
}


#hat_image {
top: 10px; right:95px;
}



Expand All @@ -32,17 +40,28 @@ h1 {


/* Insert CSS for eyes below this line*/
#eyes_image{
top:100px;
right:142px;
}




/* Insert CSS for mouth below this line*/
#mouth_image{
top:220px;
right:128px;
}




/* Insert CSS for nose below this line*/

#nose_image{
top: 150px;
left: 135px
}



Expand All @@ -52,7 +71,10 @@ h1 {


/* Insert CSS for glasses below this line*/

#glasses_image{
top:85px;
right:111px;
}



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

/* Insert CSS for moustache below this line*/


#moustache_image {
top:160px;
left:90px;
}


/* Insert CSS for shoes below this line*/

#shoes_image {
top: 300px;
left: 46px;
}



Expand Down
18 changes: 9 additions & 9 deletions potatohead.html
Original file line number Diff line number Diff line change
Expand Up @@ -13,20 +13,20 @@ <h1>Mr. Potato Head</h1>

<div id="potato">
<img id="body" src="assets/body.png">
<img id="arms_image">
<img id="arms_image" src="assets/arms.png">
<img id="ears_image">
<img id="eyes_image" >
<img id="mouth_image" >
<img id="nose_image" >
<img id="nose_image" src="assets/nose.png" >
<img id="eyes_image" src="assets/eyes.png" >
<img id="mouth_image" src="assets/mouth.png">
<img id="eyebrows_image" >
<img id="glasses_image" >
<img id="hat_image" >
<img id="moustache_image" >
<img id="shoes_image" >
<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="hatflower">
<img id="boosters">
<img id="boosters" src="">
</div>

</body>
Expand Down