From 975bf4b1748ce3a4a45829329a8c979c22878aac Mon Sep 17 00:00:00 2001 From: Abi Peterson Date: Wed, 11 Jan 2017 22:54:06 +0000 Subject: [PATCH 01/12] I put the moustache on --- potato.css | 5 ++++- potatohead.html | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/potato.css b/potato.css index 5c1d358..2e7ae40 100644 --- a/potato.css +++ b/potato.css @@ -67,7 +67,10 @@ h1 { /* Insert CSS for moustache below this line*/ - +#moustache{ + margin-top: 50%; + margin-left: 50%; +} diff --git a/potatohead.html b/potatohead.html index d039b2b..c3cc292 100755 --- a/potatohead.html +++ b/potatohead.html @@ -21,7 +21,7 @@

Mr. Potato Head

- + From 91968aab837183041edc005c6428c1964d1ce39d Mon Sep 17 00:00:00 2001 From: Samuel Taylor Date: Wed, 11 Jan 2017 22:54:39 +0000 Subject: [PATCH 02/12] Add arms --- potato.css | 5 ++++- potatohead.html | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/potato.css b/potato.css index 5c1d358..857e07a 100644 --- a/potato.css +++ b/potato.css @@ -22,7 +22,10 @@ h1 { top: 28px; left: 68px; } /* Insert CSS for arms below this line*/ - +#arms_image { + top: 178px; + left: 30px; +} diff --git a/potatohead.html b/potatohead.html index d039b2b..6adb8d7 100755 --- a/potatohead.html +++ b/potatohead.html @@ -13,7 +13,7 @@

Mr. Potato Head

- + From a009244c54353e2047309f171cfe05f5fcda92f3 Mon Sep 17 00:00:00 2001 From: Abi Peterson Date: Wed, 11 Jan 2017 23:04:49 +0000 Subject: [PATCH 03/12] moustache and ears --- potato.css | 13 +++++++++---- potatohead.html | 3 ++- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/potato.css b/potato.css index 2e7ae40..f6a11a2 100644 --- a/potato.css +++ b/potato.css @@ -27,7 +27,12 @@ h1 { /* Insert CSS for ears below this line*/ - +#ears_image{ + width: 200px; + margin-top: 70px; + margin-left: 87px; + +} @@ -67,9 +72,9 @@ h1 { /* Insert CSS for moustache below this line*/ -#moustache{ - margin-top: 50%; - margin-left: 50%; +#moustache_image{ + margin-top: 160px; + margin-left: 92px; } diff --git a/potatohead.html b/potatohead.html index c3cc292..25ee499 100755 --- a/potatohead.html +++ b/potatohead.html @@ -14,7 +14,8 @@

Mr. Potato Head

- + + From 550a9d67b2c40f78ecff36333beee1cbcc9cb7e9 Mon Sep 17 00:00:00 2001 From: Isaac Castaneda Date: Wed, 11 Jan 2017 23:05:18 +0000 Subject: [PATCH 04/12] eyebrows / mouth --- potato.css | 6 ++++-- potatohead.html | 16 ++++++++-------- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/potato.css b/potato.css index 5c1d358..c4a665b 100644 --- a/potato.css +++ b/potato.css @@ -47,8 +47,10 @@ h1 { /* Insert CSS for eyebrows below this line*/ - - +#eyebrows_image{ + top: 102px; left: 109px; + +} /* Insert CSS for glasses below this line*/ diff --git a/potatohead.html b/potatohead.html index d039b2b..4abf8c0 100755 --- a/potatohead.html +++ b/potatohead.html @@ -15,14 +15,14 @@

Mr. Potato Head

- - - - - - - - + + + + + + + + From 22b2efe54d6201d5950c99b70c4e6e499b66c847 Mon Sep 17 00:00:00 2001 From: Richard Cole Tumolac Date: Wed, 11 Jan 2017 23:05:57 +0000 Subject: [PATCH 05/12] Added shoes --- potato.css | 6 ++++-- potatohead.html | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/potato.css b/potato.css index 5c1d358..78b823b 100644 --- a/potato.css +++ b/potato.css @@ -40,7 +40,6 @@ h1 { - /* Insert CSS for nose below this line*/ @@ -72,7 +71,10 @@ h1 { /* Insert CSS for shoes below this line*/ - +#shoes_image{ + top: 60%; + left: 13%; +} diff --git a/potatohead.html b/potatohead.html index d039b2b..e7a8f82 100755 --- a/potatohead.html +++ b/potatohead.html @@ -22,7 +22,7 @@

Mr. Potato Head

- + From 77b706dd571a4f1d2cfbad568ec103403379c486 Mon Sep 17 00:00:00 2001 From: Spencer Michalke Date: Wed, 11 Jan 2017 23:06:46 +0000 Subject: [PATCH 06/12] Add Nose --- potato.css | 5 +++-- potatohead.html | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/potato.css b/potato.css index 5c1d358..1571f19 100644 --- a/potato.css +++ b/potato.css @@ -42,8 +42,9 @@ h1 { /* Insert CSS for nose below this line*/ - - +#nose_image { + margin-top: 120px; + margin-left: 130px; /* Insert CSS for eyebrows below this line*/ diff --git a/potatohead.html b/potatohead.html index d039b2b..a0c3b00 100755 --- a/potatohead.html +++ b/potatohead.html @@ -17,7 +17,7 @@

Mr. Potato Head

- + From 86b2755fc664885f838d5251063d24b23776f07d Mon Sep 17 00:00:00 2001 From: Jorge Moreno Date: Wed, 11 Jan 2017 23:10:20 +0000 Subject: [PATCH 07/12] My Eyes --- potatohead.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/potatohead.html b/potatohead.html index d039b2b..903c421 100755 --- a/potatohead.html +++ b/potatohead.html @@ -15,7 +15,7 @@

Mr. Potato Head

- + From cebd6c953a0deaa812e0eb59f5a0c68b279b6ccd Mon Sep 17 00:00:00 2001 From: Samuel Taylor Date: Wed, 11 Jan 2017 23:11:55 +0000 Subject: [PATCH 08/12] Fix missing rbrace --- potato.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/potato.css b/potato.css index 658d67b..4eddd50 100644 --- a/potato.css +++ b/potato.css @@ -49,7 +49,7 @@ h1 { #nose_image { margin-top: 120px; margin-left: 130px; - +} /* Insert CSS for eyebrows below this line*/ #eyebrows_image{ From 8e89fab8815dfa71284333e8f4cf85695fa9bfeb Mon Sep 17 00:00:00 2001 From: Timothy Date: Wed, 11 Jan 2017 23:16:43 +0000 Subject: [PATCH 09/12] add hat --- potato.css | 8 +++++++- potatohead.html | 2 +- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/potato.css b/potato.css index 5c1d358..220f851 100644 --- a/potato.css +++ b/potato.css @@ -57,7 +57,13 @@ h1 { /* Insert CSS for hat below this line*/ - +#hat_image{ + margin-top:.5%; + margin-right:20%; + margin-left: 20%; + + +} diff --git a/potatohead.html b/potatohead.html index d039b2b..b6e5285 100755 --- a/potatohead.html +++ b/potatohead.html @@ -20,7 +20,7 @@

Mr. Potato Head

- + From 3d65b3b4e60ac136cf4f39c310bf485d711a0c00 Mon Sep 17 00:00:00 2001 From: Jorge Moreno Date: Wed, 11 Jan 2017 23:19:40 +0000 Subject: [PATCH 10/12] Fixed Eyes --- potato.css | 4 +++- potatohead.html | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/potato.css b/potato.css index 5c1d358..8910a8d 100644 --- a/potato.css +++ b/potato.css @@ -22,7 +22,9 @@ h1 { top: 28px; left: 68px; } /* Insert CSS for arms below this line*/ - +#eyes_image { + top: 13%; left: 35%; +} diff --git a/potatohead.html b/potatohead.html index 903c421..dacb4b5 100755 --- a/potatohead.html +++ b/potatohead.html @@ -15,7 +15,7 @@

Mr. Potato Head

- + From 59a09365d8401c3e2078513d9634ad2f3c998625 Mon Sep 17 00:00:00 2001 From: Evila Santos Date: Wed, 11 Jan 2017 23:28:11 +0000 Subject: [PATCH 11/12] I made change --- potato.css | 14 ++++++++------ potatohead.html | 4 ++-- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/potato.css b/potato.css index 5c1d358..5b48806 100644 --- a/potato.css +++ b/potato.css @@ -10,16 +10,16 @@ h1 { border: 2px solid black; margin-left: auto; margin-right: auto; - background-color: white; + background-color: yellow; } -#potato img { +#potato img { position: absolute; } /* Insert CSS for body below this line*/ #body { - top: 28px; left: 68px; + top: 30px; left: 68px; } /* Insert CSS for arms below this line*/ @@ -41,17 +41,19 @@ h1 { -/* Insert CSS for nose below this line*/ -/* Insert CSS for eyebrows below this line*/ +/* Insert CSS for eyebrows below this line*/ +#glasses_image { + top: 60px; left: 100px; +} -/* Insert CSS for glasses below this line*/ + diff --git a/potatohead.html b/potatohead.html index d039b2b..6895e68 100755 --- a/potatohead.html +++ b/potatohead.html @@ -18,8 +18,8 @@

Mr. Potato Head

- - + + > From 6667ee5a115906deefaefe62534532ae81ed5e54 Mon Sep 17 00:00:00 2001 From: Jorge Moreno Date: Wed, 11 Jan 2017 23:30:34 +0000 Subject: [PATCH 12/12] Lower eyes --- potato.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/potato.css b/potato.css index 8910a8d..0576a79 100644 --- a/potato.css +++ b/potato.css @@ -23,7 +23,7 @@ h1 { } /* Insert CSS for arms below this line*/ #eyes_image { - top: 13%; left: 35%; + top: 20%; left: 36%; }