From 9931fbd2a0a7774b5e8badcfa86909407e6955b6 Mon Sep 17 00:00:00 2001 From: Li Ouyang Date: Fri, 27 Jan 2017 17:04:00 +0000 Subject: [PATCH 01/16] added arms --- potato.css | 4 ++++ potatohead.html | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/potato.css b/potato.css index 5c1d358..d7e4f48 100644 --- a/potato.css +++ b/potato.css @@ -23,6 +23,10 @@ h1 { } /* Insert CSS for arms below this line*/ +#arms_image { + top: 150px; + left: 42px; +} 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 f315dba9d983d1e679d92e04b309ff822c807e25 Mon Sep 17 00:00:00 2001 From: Li Ouyang Date: Tue, 31 Jan 2017 02:20:38 +0000 Subject: [PATCH 02/16] remove arms --- potato.css | 6 ------ potatohead.html | 2 +- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/potato.css b/potato.css index d7e4f48..b1215a6 100644 --- a/potato.css +++ b/potato.css @@ -23,12 +23,6 @@ h1 { } /* Insert CSS for arms below this line*/ -#arms_image { - top: 150px; - left: 42px; -} - - /* Insert CSS for ears below this line*/ diff --git a/potatohead.html b/potatohead.html index 6adb8d7..d039b2b 100755 --- a/potatohead.html +++ b/potatohead.html @@ -13,7 +13,7 @@

Mr. Potato Head

- + From 4c8fb59468edce73cff45a9cd7706fcc532feb31 Mon Sep 17 00:00:00 2001 From: Lissette Date: Tue, 31 Jan 2017 14:46:05 +0000 Subject: [PATCH 03/16] put the glasses --- potato.css | 7 ++++--- potatohead.html | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/potato.css b/potato.css index b1215a6..8d53e5f 100644 --- a/potato.css +++ b/potato.css @@ -50,9 +50,10 @@ h1 { /* Insert CSS for glasses below this line*/ - - - +#glasses_image{ + position:relative; + margin:100px; +} /* Insert CSS for hat below this line*/ diff --git a/potatohead.html b/potatohead.html index d039b2b..e6b64c9 100755 --- a/potatohead.html +++ b/potatohead.html @@ -19,7 +19,7 @@

Mr. Potato Head

- + From b5b08e8fd836332c5c84782d13da31d59f555806 Mon Sep 17 00:00:00 2001 From: xman2120 Date: Tue, 31 Jan 2017 14:46:31 +0000 Subject: [PATCH 04/16] added arms and eyebrows --- potato.css | 8 ++++++-- potatohead.html | 4 ++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/potato.css b/potato.css index b1215a6..493ea35 100644 --- a/potato.css +++ b/potato.css @@ -22,7 +22,9 @@ h1 { top: 28px; left: 68px; } /* Insert CSS for arms below this line*/ - +#arms_image { + top: 178px; left: 25px; +} /* Insert CSS for ears below this line*/ @@ -45,7 +47,9 @@ h1 { /* Insert CSS for eyebrows below this line*/ - +#eyebrows_image { + top: 70px; left: 112px; +} diff --git a/potatohead.html b/potatohead.html index d039b2b..d2761c6 100755 --- a/potatohead.html +++ b/potatohead.html @@ -13,12 +13,12 @@

Mr. Potato Head

- + - + From 75a498ded4d3c4885450c2242423a65a7822ab01 Mon Sep 17 00:00:00 2001 From: Jennifer Perez Date: Tue, 31 Jan 2017 14:46:55 +0000 Subject: [PATCH 05/16] I changened the width and height of the hat and the postion on the page --- potato.css | 5 +++++ potatohead.html | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/potato.css b/potato.css index b1215a6..518ecbe 100644 --- a/potato.css +++ b/potato.css @@ -22,6 +22,11 @@ h1 { top: 28px; left: 68px; } /* Insert CSS for arms below this line*/ +#hat_image{ + height:100px; + width:200px; + left:68; +} /* Insert CSS for ears below this line*/ diff --git a/potatohead.html b/potatohead.html index d039b2b..efac67d 100755 --- a/potatohead.html +++ b/potatohead.html @@ -13,14 +13,14 @@

Mr. Potato Head

- + - + From 1969c1f17703ca623c0bb34796f861feab72815d Mon Sep 17 00:00:00 2001 From: Dante Ferguson Date: Tue, 31 Jan 2017 14:47:24 +0000 Subject: [PATCH 06/16] hat flower --- potato.css | 5 ++++- potatohead.html | 8 ++++---- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/potato.css b/potato.css index b1215a6..c6fec2e 100644 --- a/potato.css +++ b/potato.css @@ -23,7 +23,10 @@ h1 { } /* Insert CSS for arms below this line*/ - +#hatflower{ height:100px ; + width:100px ; + left:175px; + ;} /* Insert CSS for ears below this line*/ diff --git a/potatohead.html b/potatohead.html index d039b2b..46c06f4 100755 --- a/potatohead.html +++ b/potatohead.html @@ -13,9 +13,9 @@

Mr. Potato Head

- - - + + + @@ -25,7 +25,7 @@

Mr. Potato Head

- +
From 6d6dfc29e3a47bbd695b68593f571415c4d5646a Mon Sep 17 00:00:00 2001 From: kushi johnson Date: Tue, 31 Jan 2017 14:48:04 +0000 Subject: [PATCH 07/16] added src for mustache image --- potatohead.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 67b264ebf151ad2a4f05cc8cd0ffce941cf16630 Mon Sep 17 00:00:00 2001 From: Sanai Black Date: Tue, 31 Jan 2017 14:48:42 +0000 Subject: [PATCH 08/16] added arms --- potato.css | 4 ++-- potatohead.html | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/potato.css b/potato.css index b1215a6..2f714e1 100644 --- a/potato.css +++ b/potato.css @@ -22,8 +22,8 @@ h1 { top: 28px; left: 68px; } /* Insert CSS for arms below this line*/ - - +#arms_image{ +top: 175px; left:25px; /* Insert CSS for ears below this line*/ 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 46b8dc0922dabfddf084942cdd9b1c5faff7ab8b Mon Sep 17 00:00:00 2001 From: Eridannia Martinez Date: Wed, 1 Feb 2017 14:13:47 +0000 Subject: [PATCH 09/16] I added ears --- potato.css | 8 +++++--- potatohead.html | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/potato.css b/potato.css index b1215a6..e78babe 100644 --- a/potato.css +++ b/potato.css @@ -25,9 +25,11 @@ h1 { /* Insert CSS for ears below this line*/ - - - +#ears_image { + top: 100px; + left: 59px; + +} /* Insert CSS for eyes below this line*/ diff --git a/potatohead.html b/potatohead.html index d039b2b..1e05965 100755 --- a/potatohead.html +++ b/potatohead.html @@ -14,7 +14,7 @@

Mr. Potato Head

- + From 606df16531a1946c8a1a4521fce2c49215d8b8d3 Mon Sep 17 00:00:00 2001 From: Jaevon Date: Wed, 1 Feb 2017 14:17:32 +0000 Subject: [PATCH 10/16] added eyes --- potato.css | 4 +++- potatohead.html | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/potato.css b/potato.css index b1215a6..c4b576c 100644 --- a/potato.css +++ b/potato.css @@ -30,7 +30,9 @@ h1 { /* Insert CSS for eyes below this line*/ - +#eyes_image{ + height: 100px; width: 100px; right:130px; + top:75px } diff --git a/potatohead.html b/potatohead.html index d039b2b..dacb4b5 100755 --- a/potatohead.html +++ b/potatohead.html @@ -15,7 +15,7 @@

Mr. Potato Head

- + From 0b95d70187aaccbd14457b77e58465156999f2b9 Mon Sep 17 00:00:00 2001 From: Dante Ferguson Date: Wed, 1 Feb 2017 14:22:33 +0000 Subject: [PATCH 11/16] hat flower --- git push orgin master | 230 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 230 insertions(+) create mode 100644 git push orgin master diff --git a/git push orgin master b/git push orgin master new file mode 100644 index 0000000..45a7fe5 --- /dev/null +++ b/git push orgin master @@ -0,0 +1,230 @@ + + SSUUMMMMAARRYY OOFF LLEESSSS CCOOMMMMAANNDDSS + + Commands marked with * may be preceded by a number, _N. + Notes in parentheses indicate the behavior if _N is given. + A key preceded by a caret indicates the Ctrl key; thus ^K is ctrl-K. + + h H Display this help. + q :q Q :Q ZZ Exit. + --------------------------------------------------------------------------- + + MMOOVVIINNGG + + e ^E j ^N CR * Forward one line (or _N lines). + y ^Y k ^K ^P * Backward one line (or _N lines). + f ^F ^V SPACE * Forward one window (or _N lines). + b ^B ESC-v * Backward one window (or _N lines). + z * Forward one window (and set window to _N). + w * Backward one window (and set window to _N). + ESC-SPACE * Forward one window, but don't stop at end-of-file. + d ^D * Forward one half-window (and set half-window to _N). + u ^U * Backward one half-window (and set half-window to _N). + ESC-) RightArrow * Left one half screen width (or _N positions). + ESC-( LeftArrow * Right one half screen width (or _N positions). + F Forward forever; like "tail -f". + r ^R ^L Repaint screen. + R Repaint screen, discarding buffered input. + --------------------------------------------------- + Default "window" is the screen height. + Default "half-window" is half of the screen height. + --------------------------------------------------------------------------- + + SSEEAARRCCHHIINNGG + + /_p_a_t_t_e_r_n * Search forward for (_N-th) matching line. + ?_p_a_t_t_e_r_n * Search backward for (_N-th) matching line. + n * Repeat previous search (for _N-th occurrence). + N * Repeat previous search in reverse direction. + ESC-n * Repeat previous search, spanning files. + ESC-N * Repeat previous search, reverse dir. & spanning files. + ESC-u Undo (toggle) search highlighting. + &_p_a_t_t_e_r_n * Display only matching lines + --------------------------------------------------- + A search pattern may be preceded by one or more of: + ^N or ! Search for NON-matching lines. + ^E or * Search multiple files (pass thru END OF FILE). + ^F or @ Start search at FIRST file (for /) or last file (for ?). + ^K Highlight matches, but don't move (KEEP position). + ^R Don't use REGULAR EXPRESSIONS. + --------------------------------------------------------------------------- + + JJUUMMPPIINNGG + + g < ESC-< * Go to first line in file (or line _N). + G > ESC-> * Go to last line in file (or line _N). + p % * Go to beginning of file (or _N percent into file). + t * Go to the (_N-th) next tag. + T * Go to the (_N-th) previous tag. + { ( [ * Find close bracket } ) ]. + } ) ] * Find open bracket { ( [. + ESC-^F _<_c_1_> _<_c_2_> * Find close bracket _<_c_2_>. + ESC-^B _<_c_1_> _<_c_2_> * Find open bracket _<_c_1_> + --------------------------------------------------- + Each "find close bracket" command goes forward to the close bracket + matching the (_N-th) open bracket in the top line. + Each "find open bracket" command goes backward to the open bracket + matching the (_N-th) close bracket in the bottom line. + + m_<_l_e_t_t_e_r_> Mark the current position with . + '_<_l_e_t_t_e_r_> Go to a previously marked position. + '' Go to the previous position. + ^X^X Same as '. + --------------------------------------------------- + A mark is any upper-case or lower-case letter. + Certain marks are predefined: + ^ means beginning of the file + $ means end of the file + --------------------------------------------------------------------------- + + CCHHAANNGGIINNGG FFIILLEESS + + :e [_f_i_l_e] Examine a new file. + ^X^V Same as :e. + :n * Examine the (_N-th) next file from the command line. + :p * Examine the (_N-th) previous file from the command line. + :x * Examine the first (or _N-th) file from the command line. + :d Delete the current file from the command line list. + = ^G :f Print current file name. + --------------------------------------------------------------------------- + + MMIISSCCEELLLLAANNEEOOUUSS CCOOMMMMAANNDDSS + + -_<_f_l_a_g_> Toggle a command line option [see OPTIONS below]. + --_<_n_a_m_e_> Toggle a command line option, by name. + __<_f_l_a_g_> Display the setting of a command line option. + ___<_n_a_m_e_> Display the setting of an option, by name. + +_c_m_d Execute the less cmd each time a new file is examined. + + !_c_o_m_m_a_n_d Execute the shell command with $SHELL. + |XX_c_o_m_m_a_n_d Pipe file between current pos & mark XX to shell command. + v Edit the current file with $VISUAL or $EDITOR. + V Print version number of "less". + --------------------------------------------------------------------------- + + OOPPTTIIOONNSS + + Most options may be changed either on the command line, + or from within less by using the - or -- command. + Options may be given in one of two forms: either a single + character preceded by a -, or a name preceded by --. + + -? ........ --help + Display help (from command line). + -a ........ --search-skip-screen + Search skips current screen. + -A ........ --SEARCH-SKIP-SCREEN + Search starts just after target line. + -b [_N] .... --buffers=[_N] + Number of buffers. + -B ........ --auto-buffers + Don't automatically allocate buffers for pipes. + -c ........ --clear-screen + Repaint by clearing rather than scrolling. + -d ........ --dumb + Dumb terminal. + -D [_x_n_._n] . --color=_x_n_._n + Set screen colors. (MS-DOS only) + -e -E .... --quit-at-eof --QUIT-AT-EOF + Quit at end of file. + -f ........ --force + Force open non-regular files. + -F ........ --quit-if-one-screen + Quit if entire file fits on first screen. + -g ........ --hilite-search + Highlight only last match for searches. + -G ........ --HILITE-SEARCH + Don't highlight any matches for searches. + -h [_N] .... --max-back-scroll=[_N] + Backward scroll limit. + -i ........ --ignore-case + Ignore case in searches that do not contain uppercase. + -I ........ --IGNORE-CASE + Ignore case in all searches. + -j [_N] .... --jump-target=[_N] + Screen position of target lines. + -J ........ --status-column + Display a status column at left edge of screen. + -k [_f_i_l_e] . --lesskey-file=[_f_i_l_e] + Use a lesskey file. + -K --quit-on-intr + Exit less in response to ctrl-C. + -L ........ --no-lessopen + Ignore the LESSOPEN environment variable. + -m -M .... --long-prompt --LONG-PROMPT + Set prompt style. + -n -N .... --line-numbers --LINE-NUMBERS + Don't use line numbers. + -o [_f_i_l_e] . --log-file=[_f_i_l_e] + Copy to log file (standard input only). + -O [_f_i_l_e] . --LOG-FILE=[_f_i_l_e] + Copy to log file (unconditionally overwrite). + -p [_p_a_t_t_e_r_n] --pattern=[_p_a_t_t_e_r_n] + Start at pattern (from command line). + -P [_p_r_o_m_p_t] --prompt=[_p_r_o_m_p_t] + Define new prompt. + -q -Q .... --quiet --QUIET --silent --SILENT + Quiet the terminal bell. + -r -R .... --raw-control-chars --RAW-CONTROL-CHARS + Output "raw" control characters. + -s ........ --squeeze-blank-lines + Squeeze multiple blank lines. + -S ........ --chop-long-lines + Chop (truncate) long lines rather than wrapping. + -t [_t_a_g] .. --tag=[_t_a_g] + Find a tag. + -T [_t_a_g_s_f_i_l_e] --tag-file=[_t_a_g_s_f_i_l_e] + Use an alternate tags file. + -u -U .... --underline-special --UNDERLINE-SPECIAL + Change handling of backspaces. + -V ........ --version + Display the version number of "less". + -w ........ --hilite-unread + Highlight first new line after forward-screen. + -W ........ --HILITE-UNREAD + Highlight first new line after any forward movement. + -x [_N[,...]] --tabs=[_N[,...]] + Set tab stops. + -X ........ --no-init + Don't use termcap init/deinit strings. + -y [_N] .... --max-forw-scroll=[_N] + Forward scroll limit. + -z [_N] .... --window=[_N] + Set size of window. + -" [_c[_c]] . --quotes=[_c[_c]] + Set shell quote characters. + -~ ........ --tilde + Don't display tildes after end of file. + -# [_N] .... --shift=[_N] + Horizontal scroll amount (0 = one half screen width) + ........ --no-keypad + Don't send termcap keypad init/deinit strings. + ........ --follow-name + The F command changes files if the input file is renamed. + + + --------------------------------------------------------------------------- + + LLIINNEE EEDDIITTIINNGG + + These keys can be used to edit text being entered + on the "command line" at the bottom of the screen. + + RightArrow ESC-l Move cursor right one character. + LeftArrow ESC-h Move cursor left one character. + ctrl-RightArrow ESC-RightArrow ESC-w Move cursor right one word. + ctrl-LeftArrow ESC-LeftArrow ESC-b Move cursor left one word. + HOME ESC-0 Move cursor to start of line. + END ESC-$ Move cursor to end of line. + BACKSPACE Delete char to left of cursor. + DELETE ESC-x Delete char under cursor. + ctrl-BACKSPACE ESC-BACKSPACE Delete word to left of cursor. + ctrl-DELETE ESC-DELETE ESC-X Delete word under cursor. + ctrl-U ESC (MS-DOS only) Delete entire line. + UpArrow ESC-k Retrieve previous command line. + DownArrow ESC-j Retrieve next command line. + TAB Complete filename & cycle. + SHIFT-TAB ESC-TAB Complete filename & reverse cycle. + ctrl-L Complete filename, list all. + + From 20c72e46b4044786317c3973438fe2bfaf3eb345 Mon Sep 17 00:00:00 2001 From: kushi johnson Date: Wed, 1 Feb 2017 14:23:05 +0000 Subject: [PATCH 12/16] css --- potato.css | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/potato.css b/potato.css index b1215a6..5b550b4 100644 --- a/potato.css +++ b/potato.css @@ -66,7 +66,10 @@ h1 { /* Insert CSS for moustache below this line*/ - +#moustache_image { + left: 94px; + top:149px; +} /* Insert CSS for shoes below this line*/ From 7bc1fd2978a05ede8be1293c232eabb27ea0e463 Mon Sep 17 00:00:00 2001 From: Lissette Date: Wed, 1 Feb 2017 14:23:54 +0000 Subject: [PATCH 13/16] font --- potato.css | 7 +++++-- potatohead.html | 1 + 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/potato.css b/potato.css index 8d53e5f..bfe8e4c 100644 --- a/potato.css +++ b/potato.css @@ -1,17 +1,20 @@ h1 { text-align: center; + color:hotpink; + font-family: 'Sansita One', cursive; } - #potato { position: relative; width: 367px; height: 500px; - border: 2px solid black; + border: 3px inset hotpink; margin-left: auto; margin-right: auto; background-color: white; } +#potato:hover{box-shadow: 0px 0px 100px hotpink; +color:hotpink;} #potato img { position: absolute; diff --git a/potatohead.html b/potatohead.html index e6b64c9..2869194 100755 --- a/potatohead.html +++ b/potatohead.html @@ -6,6 +6,7 @@ + From 42a12d2b4d64388179d959d45a19a8bf503eb4a5 Mon Sep 17 00:00:00 2001 From: Layla Flight Date: Wed, 1 Feb 2017 14:25:57 +0000 Subject: [PATCH 14/16] i changed the nose --- potato.css | 5 +++++ potatohead.html | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/potato.css b/potato.css index b1215a6..9bd0a91 100644 --- a/potato.css +++ b/potato.css @@ -40,6 +40,11 @@ h1 { /* Insert CSS for nose below this line*/ +#nose_image { + top: 120px; + left: 130px; + +} 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 265c08aaec4a02787c28205062bff045335ae37d Mon Sep 17 00:00:00 2001 From: Jaraya Wright Date: Wed, 1 Feb 2017 14:26:55 +0000 Subject: [PATCH 15/16] I added the mouth to Mr_Potato_head --- potato.css | 4 +++- potatohead.html | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/potato.css b/potato.css index b1215a6..4a2b708 100644 --- a/potato.css +++ b/potato.css @@ -35,7 +35,9 @@ h1 { /* Insert CSS for mouth below this line*/ - +#mouth_image {top:185px; + left:120px; +} diff --git a/potatohead.html b/potatohead.html index d039b2b..712ce67 100755 --- a/potatohead.html +++ b/potatohead.html @@ -15,8 +15,8 @@

Mr. Potato Head

- - + + From ab651dd92b5b2afdc2fd8561ad0e91f5dbb39716 Mon Sep 17 00:00:00 2001 From: Jytia Wright Date: Wed, 1 Feb 2017 14:27:03 +0000 Subject: [PATCH 16/16] shoes --- potato.css | 6 ++++-- potatohead.html | 6 +++--- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/potato.css b/potato.css index b1215a6..7084637 100644 --- a/potato.css +++ b/potato.css @@ -28,7 +28,6 @@ h1 { - /* Insert CSS for eyes below this line*/ @@ -71,7 +70,10 @@ h1 { /* Insert CSS for shoes below this line*/ - +#shoes_image{ + top: 300px; + left:48px; +} /* Insert CSS for cane below this line*/ diff --git a/potatohead.html b/potatohead.html index d039b2b..775b16c 100755 --- a/potatohead.html +++ b/potatohead.html @@ -13,8 +13,8 @@

Mr. Potato Head

- - + + @@ -22,7 +22,7 @@

Mr. Potato Head

- +