Created
November 17, 2017 00:12
-
-
Save tomatohammado/290bb48b99a1ea072d5413059ed483b5 to your computer and use it in GitHub Desktop.
Week 1, Vestibule, Day 4 Lab: CSS & HTML iPhone
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| GAs-MacBook-Air:~ ga$ cd ga-wdi/ | |
| GAs-MacBook-Air:ga-wdi ga$ ls | |
| World github_resume thinking_like_a_programmer | |
| fundamentals sandbox | |
| GAs-MacBook-Air:ga-wdi ga$ fundamentals/ | |
| -bash: fundamentals/: is a directory | |
| GAs-MacBook-Air:ga-wdi ga$ ls fundamentals/ | |
| wdi-fundamentals-memorygame | |
| GAs-MacBook-Air:ga-wdi ga$ mv World/ fundamentals/ | |
| GAs-MacBook-Air:ga-wdi ga$ ls | |
| fundamentals sandbox | |
| github_resume thinking_like_a_programmer | |
| GAs-MacBook-Air:ga-wdi ga$ mv github_resume/ fundamentals/ | |
| GAs-MacBook-Air:ga-wdi ga$ ls | |
| fundamentals sandbox thinking_like_a_programmer | |
| GAs-MacBook-Air:ga-wdi ga$ mv thinking_like_a_programmer/ fundamentals/ | |
| GAs-MacBook-Air:ga-wdi ga$ cd fundamentals/ | |
| GAs-MacBook-Air:fundamentals ga$ mkdir css_html_iphone && cd $_ | |
| GAs-MacBook-Air:css_html_iphone ga$ ls .. | |
| World github_resume wdi-fundamentals-memorygame | |
| css_html_iphone thinking_like_a_programmer | |
| GAs-MacBook-Air:css_html_iphone ga$ touch index.html style.cssy | |
| GAs-MacBook-Air:css_html_iphone ga$ ls | |
| index.html style.cssy | |
| GAs-MacBook-Air:css_html_iphone ga$ code . | |
| GAs-MacBook-Air:css_html_iphone ga$ rm index.html style.cssy | |
| GAs-MacBook-Air:css_html_iphone ga$ ls | |
| GAs-MacBook-Air:css_html_iphone ga$ git clone https://git.generalassemb.ly/tomatohammado/cell_phone_html_css.git | |
| Cloning into 'cell_phone_html_css'... | |
| remote: Counting objects: 20, done. | |
| remote: Compressing objects: 100% (13/13), done. | |
| remote: Total 20 (delta 6), reused 20 (delta 6), pack-reused 0 | |
| Unpacking objects: 100% (20/20), done. | |
| GAs-MacBook-Air:css_html_iphone ga$ ls | |
| cell_phone_html_css | |
| GAs-MacBook-Air:css_html_iphone ga$ mv cell_phone_html_css/ .. | |
| GAs-MacBook-Air:css_html_iphone ga$ ls | |
| GAs-MacBook-Air:css_html_iphone ga$ cd .. | |
| GAs-MacBook-Air:fundamentals ga$ ls | |
| World css_html_iphone thinking_like_a_programmer | |
| cell_phone_html_css github_resume wdi-fundamentals-memorygame | |
| GAs-MacBook-Air:fundamentals ga$ rmdir css_html_iphone/ | |
| GAs-MacBook-Air:fundamentals ga$ ls | |
| World github_resume wdi-fundamentals-memorygame | |
| cell_phone_html_css thinking_like_a_programmer | |
| GAs-MacBook-Air:fundamentals ga$ cd cell_phone_html_css/ | |
| GAs-MacBook-Air:cell_phone_html_css ga$ ls | |
| mock.png readme.md | |
| GAs-MacBook-Air:cell_phone_html_css ga$ touch index.html style.css | |
| GAs-MacBook-Air:cell_phone_html_css ga$ ls | |
| index.html mock.png readme.md style.css | |
| GAs-MacBook-Air:cell_phone_html_css ga$ code . | |
| GAs-MacBook-Air:cell_phone_html_css ga$ git add index.html style.css | |
| GAs-MacBook-Air:cell_phone_html_css ga$ git commit -m "created blank index.html and style.css files" | |
| [master 9f929e1] created blank index.html and style.css files | |
| 2 files changed, 0 insertions(+), 0 deletions(-) | |
| create mode 100644 index.html | |
| create mode 100644 style.css | |
| GAs-MacBook-Air:cell_phone_html_css ga$ git add index.html | |
| GAs-MacBook-Air:cell_phone_html_css ga$ git commit -m "boilerplate for HTML, including link to style.css" | |
| [master 4f171cb] boilerplate for HTML, including link to style.css | |
| 1 file changed, 13 insertions(+) | |
| GAs-MacBook-Air:cell_phone_html_css ga$ open . | |
| GAs-MacBook-Air:cell_phone_html_css ga$ git add . | |
| GAs-MacBook-Air:cell_phone_html_css ga$ git commit -m "added div for .phone-body, and added styles to give it a grey border and a border-radius. Dimensions are roughtly that of a real iPhone. Used color picker to determine border color, turns out the mock is a gradient too." | |
| [master 5d686f1] added div for .phone-body, and added styles to give it a grey border and a border-radius. Dimensions are roughtly that of a real iPhone. Used color picker to determine border color, turns out the mock is a gradient too. | |
| 2 files changed, 9 insertions(+), 1 deletion(-) | |
| GAs-MacBook-Air:cell_phone_html_css ga$ git push | |
| Counting objects: 10, done. | |
| Delta compression using up to 4 threads. | |
| Compressing objects: 100% (9/9), done. | |
| Writing objects: 100% (10/10), 1.38 KiB | 706.00 KiB/s, done. | |
| Total 10 (delta 2), reused 0 (delta 0) | |
| remote: Resolving deltas: 100% (2/2), done. | |
| To https://git.generalassemb.ly/tomatohammado/cell_phone_html_css.git | |
| e733960..5d686f1 master -> master | |
| GAs-MacBook-Air:cell_phone_html_css ga$ mv ~/Desktop/brandon-wong-412008.jpg . | |
| GAs-MacBook-Air:cell_phone_html_css ga$ git add brandon-wong-412008.jpg | |
| GAs-MacBook-Air:cell_phone_html_css ga$ git commit -m "added background image for screen" | |
| [master 9086b9b] added background image for screen | |
| 1 file changed, 0 insertions(+), 0 deletions(-) | |
| create mode 100644 brandon-wong-412008.jpg | |
| GAs-MacBook-Air:cell_phone_html_css ga$ git add index.html | |
| GAs-MacBook-Air:cell_phone_html_css ga$ git commit -m | |
| error: switch `m' requires a value | |
| usage: git commit [<options>] [--] <pathspec>... | |
| -q, --quiet suppress summary after successful commit | |
| -v, --verbose show diff in commit message template | |
| Commit message options | |
| -F, --file <file> read message from file | |
| --author <author> override author for commit | |
| --date <date> override date for commit | |
| -m, --message <message> | |
| commit message | |
| -c, --reedit-message <commit> | |
| reuse and edit message from specified commit | |
| -C, --reuse-message <commit> | |
| reuse message from specified commit | |
| --fixup <commit> use autosquash formatted message to fixup specified commit | |
| --squash <commit> use autosquash formatted message to squash specified commit | |
| --reset-author the commit is authored by me now (used with -C/-c/--amend) | |
| -s, --signoff add Signed-off-by: | |
| -t, --template <file> | |
| use specified template file | |
| -e, --edit force edit of commit | |
| --cleanup <default> how to strip spaces and #comments from message | |
| --status include status in commit message template | |
| -S, --gpg-sign[=<key-id>] | |
| GPG sign commit | |
| Commit contents options | |
| -a, --all commit all changed files | |
| -i, --include add specified files to index for commit | |
| --interactive interactively add files | |
| -p, --patch interactively add changes | |
| -o, --only commit only specified files | |
| -n, --no-verify bypass pre-commit and commit-msg hooks | |
| --dry-run show what would be committed | |
| --short show status concisely | |
| --branch show branch information | |
| --porcelain machine-readable output | |
| --long show status in long format (default) | |
| -z, --null terminate entries with NUL | |
| --amend amend previous commit | |
| --no-post-rewrite bypass post-rewrite hook | |
| -u, --untracked-files[=<mode>] | |
| show untracked files, optional modes: all, normal, no. (Default: all) | |
| GAs-MacBook-Air:cell_phone_html_css ga$ git commit -m "added div for phone screen" | |
| [master 77f1cd8] added div for phone screen | |
| 1 file changed, 3 insertions(+), 1 deletion(-) | |
| GAs-MacBook-Air:cell_phone_html_css ga$ git add style.css | |
| GAs-MacBook-Air:cell_phone_html_css ga$ git commit -m "added styles for phone screen, including background image. Will definately have to reassess the margins especially when I add the speaker and camera icons." | |
| [master 605fc65] added styles for phone screen, including background image. Will definately have to reassess the margins especially when I add the speaker and camera icons. | |
| 1 file changed, 11 insertions(+), 1 deletion(-) | |
| GAs-MacBook-Air:cell_phone_html_css ga$ git push | |
| Counting objects: 9, done. | |
| Delta compression using up to 4 threads. | |
| Compressing objects: 100% (9/9), done. | |
| Writing objects: 100% (9/9), 1.99 MiB | 1.30 MiB/s, done. | |
| Total 9 (delta 3), reused 0 (delta 0) | |
| remote: Resolving deltas: 100% (3/3), completed with 1 local object. | |
| To https://git.generalassemb.ly/tomatohammado/cell_phone_html_css.git | |
| 5d686f1..605fc65 master -> master | |
| GAs-MacBook-Air:cell_phone_html_css ga$ git add index.html | |
| GAs-MacBook-Air:cell_phone_html_css ga$ git commit -m "added div for .home-button" | |
| [master 66ed13e] added div for .home-button | |
| 1 file changed, 3 insertions(+), 1 deletion(-) | |
| GAs-MacBook-Air:cell_phone_html_css ga$ git add style.css | |
| GAs-MacBook-Air:cell_phone_html_css ga$ git commit -m "added styles for .home-button, and added more margin-top to the .phone-screen so it looks more like the mock image." | |
| [master 3172f4f] added styles for .home-button, and added more margin-top to the .phone-screen so it looks more like the mock image. | |
| 1 file changed, 9 insertions(+), 1 deletion(-) | |
| GAs-MacBook-Air:cell_phone_html_css ga$ git push | |
| Counting objects: 6, done. | |
| Delta compression using up to 4 threads. | |
| Compressing objects: 100% (6/6), done. | |
| Writing objects: 100% (6/6), 767 bytes | 767.00 KiB/s, done. | |
| Total 6 (delta 4), reused 0 (delta 0) | |
| remote: Resolving deltas: 100% (4/4), completed with 3 local objects. | |
| To https://git.generalassemb.ly/tomatohammado/cell_phone_html_css.git | |
| 605fc65..3172f4f master -> master | |
| GAs-MacBook-Air:cell_phone_html_css ga$ mv ~/Downloads/nathan-dumlao-293480.jpg . | |
| GAs-MacBook-Air:cell_phone_html_css ga$ git status | |
| On branch master | |
| Your branch is up to date with 'origin/master'. | |
| Changes not staged for commit: | |
| (use "git add <file>..." to update what will be committed) | |
| (use "git checkout -- <file>..." to discard changes in working directory) | |
| modified: style.css | |
| Untracked files: | |
| (use "git add <file>..." to include in what will be committed) | |
| nathan-dumlao-293480.jpg | |
| no changes added to commit (use "git add" and/or "git commit -a") | |
| GAs-MacBook-Air:cell_phone_html_css ga$ git add nathan-dumlao-293480.jpg | |
| GAs-MacBook-Air:cell_phone_html_css ga$ git commit -m "added another background image, because it is hard to see the black border around the screen on the first one." | |
| [master 2a2f638] added another background image, because it is hard to see the black border around the screen on the first one. | |
| 1 file changed, 0 insertions(+), 0 deletions(-) | |
| create mode 100644 nathan-dumlao-293480.jpg | |
| GAs-MacBook-Air:cell_phone_html_css ga$ git add style.css | |
| GAs-MacBook-Air:cell_phone_html_css ga$ git commit -m "changed background image on screen, change background property to background-image, and adjusted borders and border-radius on .phone-body, .phone-screen, and .home-button. Maybe should have broken those last changes into different commits." | |
| [master e86fd4b] changed background image on screen, change background property to background-image, and adjusted borders and border-radius on .phone-body, .phone-screen, and .home-button. Maybe should have broken those last changes into different commits. | |
| 1 file changed, 6 insertions(+), 6 deletions(-) | |
| GAs-MacBook-Air:cell_phone_html_css ga$ git push | |
| Counting objects: 6, done. | |
| Delta compression using up to 4 threads. | |
| Compressing objects: 100% (6/6), done. | |
| Writing objects: 100% (6/6), 286.40 KiB | 6.51 MiB/s, done. | |
| Total 6 (delta 3), reused 0 (delta 0) | |
| remote: Resolving deltas: 100% (3/3), completed with 2 local objects. | |
| To https://git.generalassemb.ly/tomatohammado/cell_phone_html_css.git | |
| 3172f4f..e86fd4b master -> master | |
| GAs-MacBook-Air:cell_phone_html_css ga$ git status | |
| On branch master | |
| Your branch is up to date with 'origin/master'. | |
| nothing to commit, working tree clean | |
| GAs-MacBook-Air:cell_phone_html_css ga$ git add index.html | |
| GAs-MacBook-Air:cell_phone_html_css ga$ git commit -m "added markup for cameras and speaker above the screen." | |
| [master 40a0585] added markup for cameras and speaker above the screen. | |
| 1 file changed, 9 insertions(+) | |
| GAs-MacBook-Air:cell_phone_html_css ga$ git add style.css | |
| GAs-MacBook-Air:cell_phone_html_css ga$ git commit -m "added margin to .main-camera-speaker-container, and basic styles to .top-camera. Now to figure out how to center the speaker while having the bottom camera sit to the left." | |
| [master e71a588] added margin to .main-camera-speaker-container, and basic styles to .top-camera. Now to figure out how to center the speaker while having the bottom camera sit to the left. | |
| 1 file changed, 13 insertions(+), 1 deletion(-) | |
| GAs-MacBook-Air:cell_phone_html_css ga$ git push | |
| Counting objects: 6, done. | |
| Delta compression using up to 4 threads. | |
| Compressing objects: 100% (6/6), done. | |
| Writing objects: 100% (6/6), 896 bytes | 448.00 KiB/s, done. | |
| Total 6 (delta 4), reused 0 (delta 0) | |
| remote: Resolving deltas: 100% (4/4), completed with 3 local objects. | |
| To https://git.generalassemb.ly/tomatohammado/cell_phone_html_css.git | |
| e86fd4b..e71a588 master -> master | |
| GAs-MacBook-Air:cell_phone_html_css ga$ git status | |
| On branch master | |
| Your branch is up to date with 'origin/master'. | |
| Changes not staged for commit: | |
| (use "git add <file>..." to update what will be committed) | |
| (use "git checkout -- <file>..." to discard changes in working directory) | |
| modified: index.html | |
| modified: style.css | |
| no changes added to commit (use "git add" and/or "git commit -a") | |
| GAs-MacBook-Air:cell_phone_html_css ga$ git add style.css | |
| GAs-MacBook-Air:cell_phone_html_css ga$ git commit -m "added styles to camera and speaker above the phone screen." | |
| [master 07fde9d] added styles to camera and speaker above the phone screen. | |
| 1 file changed, 26 insertions(+), 1 deletion(-) | |
| GAs-MacBook-Air:cell_phone_html_css ga$ git add index.html | |
| GAs-MacBook-Air:cell_phone_html_css ga$ git commit -m "added some whitespace. that's it :D" | |
| [master 28acabb] added some whitespace. that's it :D | |
| 1 file changed, 1 insertion(+) | |
| GAs-MacBook-Air:cell_phone_html_css ga$ git push | |
| Counting objects: 6, done. | |
| Delta compression using up to 4 threads. | |
| Compressing objects: 100% (6/6), done. | |
| Writing objects: 100% (6/6), 830 bytes | 830.00 KiB/s, done. | |
| Total 6 (delta 4), reused 0 (delta 0) | |
| remote: Resolving deltas: 100% (4/4), completed with 3 local objects. | |
| To https://git.generalassemb.ly/tomatohammado/cell_phone_html_css.git | |
| e71a588..28acabb master -> master | |
| GAs-MacBook-Air:cell_phone_html_css ga$ git add style.css | |
| GAs-MacBook-Air:cell_phone_html_css ga$ git commit -m "centered .phone-body so the whole thing is centered. .phone-body is wrapping everything so I think that's why it works." | |
| [master fce98fb] centered .phone-body so the whole thing is centered. .phone-body is wrapping everything so I think that's why it works. | |
| 1 file changed, 1 insertion(+) | |
| GAs-MacBook-Air:cell_phone_html_css ga$ git status | |
| On branch master | |
| Your branch is ahead of 'origin/master' by 1 commit. | |
| (use "git push" to publish your local commits) | |
| Changes not staged for commit: | |
| (use "git add <file>..." to update what will be committed) | |
| (use "git checkout -- <file>..." to discard changes in working directory) | |
| modified: style.css | |
| no changes added to commit (use "git add" and/or "git commit -a") | |
| GAs-MacBook-Air:cell_phone_html_css ga$ git add style.css | |
| GAs-MacBook-Air:cell_phone_html_css ga$ git commit -m "so...the absolutely postioned .bottom-camera did not indeed position correctly. So I added position: relative to the wrapper and changed the left value. Now it's good!" | |
| -bash: !": event not found | |
| GAs-MacBook-Air:cell_phone_html_css ga$ git push | |
| Counting objects: 3, done. | |
| Delta compression using up to 4 threads. | |
| Compressing objects: 100% (3/3), done. | |
| Writing objects: 100% (3/3), 368 bytes | 368.00 KiB/s, done. | |
| Total 3 (delta 2), reused 0 (delta 0) | |
| remote: Resolving deltas: 100% (2/2), completed with 2 local objects. | |
| To https://git.generalassemb.ly/tomatohammado/cell_phone_html_css.git | |
| 28acabb..fce98fb master -> master | |
| GAs-MacBook-Air:cell_phone_html_css ga$ git status | |
| On branch master | |
| Your branch is up to date with 'origin/master'. | |
| Changes to be committed: | |
| (use "git reset HEAD <file>..." to unstage) | |
| modified: style.css | |
| Changes not staged for commit: | |
| (use "git add <file>..." to update what will be committed) | |
| (use "git checkout -- <file>..." to discard changes in working directory) | |
| modified: style.css | |
| GAs-MacBook-Air:cell_phone_html_css ga$ git commit -m "so...the absolutely positioned .bottom-camera did not indeed position correctly. So I added position: relative to the wrapper and adjusted the left value. Now it's good exclaimation point, because you can't use exclaimation marks in git commit messages in bash without single quotes and a flag. laaaaame" | |
| [master 5b28d1b] so...the absolutely positioned .bottom-camera did not indeed position correctly. So I added position: relative to the wrapper and adjusted the left value. Now it's good exclaimation point, because you can't use exclaimation marks in git commit messages in bash without single quotes and a flag. laaaaame | |
| 1 file changed, 2 insertions(+), 1 deletion(-) | |
| GAs-MacBook-Air:cell_phone_html_css ga$ git status | |
| On branch master | |
| Your branch is ahead of 'origin/master' by 1 commit. | |
| (use "git push" to publish your local commits) | |
| Changes not staged for commit: | |
| (use "git add <file>..." to update what will be committed) | |
| (use "git checkout -- <file>..." to discard changes in working directory) | |
| modified: style.css | |
| no changes added to commit (use "git add" and/or "git commit -a") | |
| GAs-MacBook-Air:cell_phone_html_css ga$ git add style.css | |
| GAs-MacBook-Air:cell_phone_html_css ga$ git commit -m "tried doing a linear-gradient for the border(using border-image) for the home button, but it didn't work. Might need vendor prefixes, might be incorrect syntax. I'll look at it later, for now I'll move on to Bonus #2 where you add icons to the screen." | |
| [master e8e8a44] tried doing a linear-gradient for the border(using border-image) for the home button, but it didn't work. Might need vendor prefixes, might be incorrect syntax. I'll look at it later, for now I'll move on to Bonus #2 where you add icons to the screen. | |
| 1 file changed, 1 insertion(+) | |
| GAs-MacBook-Air:cell_phone_html_css ga$ git push | |
| Counting objects: 6, done. | |
| Delta compression using up to 4 threads. | |
| Compressing objects: 100% (6/6), done. | |
| Writing objects: 100% (6/6), 955 bytes | 955.00 KiB/s, done. | |
| Total 6 (delta 4), reused 0 (delta 0) | |
| remote: Resolving deltas: 100% (4/4), completed with 2 local objects. | |
| To https://git.generalassemb.ly/tomatohammado/cell_phone_html_css.git | |
| fce98fb..e8e8a44 master -> master | |
| GAs-MacBook-Air:cell_phone_html_css ga$ git status | |
| On branch master | |
| Your branch is up to date with 'origin/master'. | |
| nothing to commit, working tree clean | |
| GAs-MacBook-Air:cell_phone_html_css ga$ ls ~/Desktop/ | |
| pict--messages-app-icons---vector-stencils-library.png--diagram-flowchart-example.png | |
| pict--music-app-icons---vector-stencils-library.png--diagram-flowchart-example.png | |
| pict--phone-app-icons---vector-stencils-library.png--diagram-flowchart-example.png | |
| pict--safari-app-icons---vector-stencils-library.png--diagram-flowchart-example.png | |
| GAs-MacBook-Air:cell_phone_html_css ga$ mv ~/Desktop/pict--messages-app-icons---vector-stencils-library.png--diagram-flowchart-example.png ~/Desktop/pict--music-app-icons---vector-stencils-library.png--diagram-flowchart-example.png ~/Desktop/pict--phone-app-icons---vector-stencils-library.png--diagram-flowchart-example.png ~/Desktop/pict--safari-app-icons---vector-stencils-library.png--diagram-flowchart-example.png . | |
| GAs-MacBook-Air:cell_phone_html_css ga$ git status | |
| On branch master | |
| Your branch is up to date with 'origin/master'. | |
| Untracked files: | |
| (use "git add <file>..." to include in what will be committed) | |
| pict--messages-app-icons---vector-stencils-library.png--diagram-flowchart-example.png | |
| pict--music-app-icons---vector-stencils-library.png--diagram-flowchart-example.png | |
| pict--phone-app-icons---vector-stencils-library.png--diagram-flowchart-example.png | |
| pict--safari-app-icons---vector-stencils-library.png--diagram-flowchart-example.png | |
| nothing added to commit but untracked files present (use "git add" to track) | |
| GAs-MacBook-Air:cell_phone_html_css ga$ git add . | |
| GAs-MacBook-Air:cell_phone_html_css ga$ git commit -m "added app icons for home row." | |
| [master 641bdd9] added app icons for home row. | |
| 4 files changed, 0 insertions(+), 0 deletions(-) | |
| create mode 100644 pict--messages-app-icons---vector-stencils-library.png--diagram-flowchart-example.png | |
| create mode 100644 pict--music-app-icons---vector-stencils-library.png--diagram-flowchart-example.png | |
| create mode 100644 pict--phone-app-icons---vector-stencils-library.png--diagram-flowchart-example.png | |
| create mode 100644 pict--safari-app-icons---vector-stencils-library.png--diagram-flowchart-example.png | |
| GAs-MacBook-Air:cell_phone_html_css ga$ git push | |
| Counting objects: 6, done. | |
| Delta compression using up to 4 threads. | |
| Compressing objects: 100% (6/6), done. | |
| Writing objects: 100% (6/6), 81.24 KiB | 9.03 MiB/s, done. | |
| Total 6 (delta 0), reused 0 (delta 0) | |
| To https://git.generalassemb.ly/tomatohammado/cell_phone_html_css.git | |
| e8e8a44..641bdd9 master -> master | |
| GAs-MacBook-Air:cell_phone_html_css ga$ git status | |
| On branch master | |
| Your branch is up to date with 'origin/master'. | |
| nothing to commit, working tree clean | |
| GAs-MacBook-Air:cell_phone_html_css ga$ git status | |
| On branch master | |
| Your branch is up to date with 'origin/master'. | |
| Changes not staged for commit: | |
| (use "git add/rm <file>..." to update what will be committed) | |
| (use "git checkout -- <file>..." to discard changes in working directory) | |
| deleted: pict--messages-app-icons---vector-stencils-library.png--diagram-flowchart-example.png | |
| deleted: pict--music-app-icons---vector-stencils-library.png--diagram-flowchart-example.png | |
| deleted: pict--phone-app-icons---vector-stencils-library.png--diagram-flowchart-example.png | |
| deleted: pict--safari-app-icons---vector-stencils-library.png--diagram-flowchart-example.png | |
| Untracked files: | |
| (use "git add <file>..." to include in what will be committed) | |
| messages.png | |
| music.png | |
| phone.png | |
| safari.png | |
| no changes added to commit (use "git add" and/or "git commit -a") | |
| GAs-MacBook-Air:cell_phone_html_css ga$ git add . | |
| GAs-MacBook-Air:cell_phone_html_css ga$ git status | |
| On branch master | |
| Your branch is up to date with 'origin/master'. | |
| Changes to be committed: | |
| (use "git reset HEAD <file>..." to unstage) | |
| renamed: pict--messages-app-icons---vector-stencils-library.png--diagram-flowchart-example.png -> messages.png | |
| renamed: pict--music-app-icons---vector-stencils-library.png--diagram-flowchart-example.png -> music.png | |
| renamed: pict--phone-app-icons---vector-stencils-library.png--diagram-flowchart-example.png -> phone.png | |
| renamed: pict--safari-app-icons---vector-stencils-library.png--diagram-flowchart-example.png -> safari.png | |
| GAs-MacBook-Air:cell_phone_html_css ga$ git commit -m "renamed those images, because their original names were ridiculous" | |
| [master 2823925] renamed those images, because their original names were ridiculous | |
| 4 files changed, 0 insertions(+), 0 deletions(-) | |
| rename pict--messages-app-icons---vector-stencils-library.png--diagram-flowchart-example.png => messages.png (100%) | |
| rename pict--music-app-icons---vector-stencils-library.png--diagram-flowchart-example.png => music.png (100%) | |
| rename pict--phone-app-icons---vector-stencils-library.png--diagram-flowchart-example.png => phone.png (100%) | |
| rename pict--safari-app-icons---vector-stencils-library.png--diagram-flowchart-example.png => safari.png (100%) | |
| GAs-MacBook-Air:cell_phone_html_css ga$ git push | |
| Counting objects: 2, done. | |
| Delta compression using up to 4 threads. | |
| Compressing objects: 100% (2/2), done. | |
| Writing objects: 100% (2/2), 314 bytes | 314.00 KiB/s, done. | |
| Total 2 (delta 1), reused 0 (delta 0) | |
| remote: Resolving deltas: 100% (1/1), completed with 1 local object. | |
| To https://git.generalassemb.ly/tomatohammado/cell_phone_html_css.git | |
| 641bdd9..2823925 master -> master | |
| GAs-MacBook-Air:cell_phone_html_css ga$ git status | |
| On branch master | |
| Your branch is up to date with 'origin/master'. | |
| Changes not staged for commit: | |
| (use "git add <file>..." to update what will be committed) | |
| (use "git checkout -- <file>..." to discard changes in working directory) | |
| modified: index.html | |
| modified: style.css | |
| no changes added to commit (use "git add" and/or "git commit -a") | |
| GAs-MacBook-Air:cell_phone_html_css ga$ git add index.html | |
| GAs-MacBook-Air:cell_phone_html_css ga$ git commit -m "added home row images and wrapper to html. Little did I know, the images do not have transparent edges, even though they are .png files that support alphas. So it looks ugly, but it works." | |
| [master f38cb9a] added home row images and wrapper to html. Little did I know, the images do not have transparent edges, even though they are .png files that support alphas. So it looks ugly, but it works. | |
| 1 file changed, 8 insertions(+), 1 deletion(-) | |
| GAs-MacBook-Air:cell_phone_html_css ga$ git add style.css | |
| GAs-MacBook-Air:cell_phone_html_css ga$ git commit -m "added styles to the home row. For whatever reason, there is a phantom 2px margin around the images and I can't find a rule for it. I can float:left to get rid of it, but then I can't center the images. So I'll take it for now." | |
| [master 087e129] added styles to the home row. For whatever reason, there is a phantom 2px margin around the images and I can't find a rule for it. I can float:left to get rid of it, but then I can't center the images. So I'll take it for now. | |
| 1 file changed, 15 insertions(+), 3 deletions(-) | |
| GAs-MacBook-Air:cell_phone_html_css ga$ git push | |
| Counting objects: 6, done. | |
| Delta compression using up to 4 threads. | |
| Compressing objects: 100% (6/6), done. | |
| Writing objects: 100% (6/6), 1.04 KiB | 267.00 KiB/s, done. | |
| Total 6 (delta 4), reused 0 (delta 0) | |
| remote: Resolving deltas: 100% (4/4), completed with 3 local objects. | |
| To https://git.generalassemb.ly/tomatohammado/cell_phone_html_css.git | |
| 2823925..087e129 master -> master | |
| GAs-MacBook-Air:cell_phone_html_css ga$ git add images/ | |
| GAs-MacBook-Air:cell_phone_html_css ga$ git commit -m "moved images to their own directory, added a bunch of them that should have transparency around the edges." | |
| [master 5f4caaf] moved images to their own directory, added a bunch of them that should have transparency around the edges. | |
| 19 files changed, 0 insertions(+), 0 deletions(-) | |
| create mode 100644 images/Appstore-icon.png | |
| create mode 100644 images/Calculator-icon.png | |
| create mode 100644 images/Calendar-icon.png | |
| create mode 100644 images/Compass-icon.png | |
| create mode 100644 images/Mail-icon.png | |
| create mode 100644 images/Maps-icon.png | |
| create mode 100644 images/Messages-icon.png | |
| create mode 100644 images/MetroUI-Other-Phone-icon.png | |
| create mode 100644 images/Music-icon.png | |
| create mode 100644 images/Pictures-icon.png | |
| create mode 100644 images/Safari-icon.png | |
| create mode 100644 images/Sample-icon.png | |
| create mode 100644 images/Weather-icon.png | |
| create mode 100644 images/brandon-wong-412008.jpg | |
| create mode 100644 images/messages.png | |
| create mode 100644 images/music.png | |
| create mode 100644 images/nathan-dumlao-293480.jpg | |
| create mode 100644 images/phone.png | |
| create mode 100644 images/safari.png | |
| GAs-MacBook-Air:cell_phone_html_css ga$ git status | |
| On branch master | |
| Your branch is ahead of 'origin/master' by 1 commit. | |
| (use "git push" to publish your local commits) | |
| Changes not staged for commit: | |
| (use "git add/rm <file>..." to update what will be committed) | |
| (use "git checkout -- <file>..." to discard changes in working directory) | |
| deleted: brandon-wong-412008.jpg | |
| modified: index.html | |
| deleted: messages.png | |
| deleted: music.png | |
| deleted: nathan-dumlao-293480.jpg | |
| deleted: phone.png | |
| deleted: safari.png | |
| modified: style.css | |
| no changes added to commit (use "git add" and/or "git commit -a") | |
| GAs-MacBook-Air:cell_phone_html_css ga$ git add index.html | |
| GAs-MacBook-Air:cell_phone_html_css ga$ git commit -m "replaced images in home row" | |
| [master 00e7cac] replaced images in home row | |
| 1 file changed, 10 insertions(+), 4 deletions(-) | |
| GAs-MacBook-Air:cell_phone_html_css ga$ git push | |
| Counting objects: 19, done. | |
| Delta compression using up to 4 threads. | |
| Compressing objects: 100% (19/19), done. | |
| Writing objects: 100% (19/19), 55.54 KiB | 2.22 MiB/s, done. | |
| Total 19 (delta 3), reused 0 (delta 0) | |
| remote: Resolving deltas: 100% (3/3), completed with 2 local objects. | |
| To https://git.generalassemb.ly/tomatohammado/cell_phone_html_css.git | |
| 087e129..00e7cac master -> master | |
| GAs-MacBook-Air:cell_phone_html_css ga$ git add style.css | |
| GAs-MacBook-Air:cell_phone_html_css ga$ git commit -m "changed screen background image url to match new relative address" | |
| [master f2c0079] changed screen background image url to match new relative address | |
| 1 file changed, 1 insertion(+), 1 deletion(-) | |
| GAs-MacBook-Air:cell_phone_html_css ga$ git status | |
| On branch master | |
| Your branch is ahead of 'origin/master' by 1 commit. | |
| (use "git push" to publish your local commits) | |
| Changes not staged for commit: | |
| (use "git add/rm <file>..." to update what will be committed) | |
| (use "git checkout -- <file>..." to discard changes in working directory) | |
| deleted: brandon-wong-412008.jpg | |
| deleted: messages.png | |
| deleted: music.png | |
| deleted: nathan-dumlao-293480.jpg | |
| deleted: phone.png | |
| deleted: safari.png | |
| no changes added to commit (use "git add" and/or "git commit -a") | |
| GAs-MacBook-Air:cell_phone_html_css ga$ git add . | |
| GAs-MacBook-Air:cell_phone_html_css ga$ git status | |
| On branch master | |
| Your branch is ahead of 'origin/master' by 1 commit. | |
| (use "git push" to publish your local commits) | |
| Changes to be committed: | |
| (use "git reset HEAD <file>..." to unstage) | |
| deleted: brandon-wong-412008.jpg | |
| deleted: messages.png | |
| deleted: music.png | |
| deleted: nathan-dumlao-293480.jpg | |
| deleted: phone.png | |
| deleted: safari.png | |
| GAs-MacBook-Air:cell_phone_html_css ga$ git commit -m "commit to track deletion of old images, even though I just moved them to a new directory." | |
| [master 0450cc4] commit to track deletion of old images, even though I just moved them to a new directory. | |
| 6 files changed, 0 insertions(+), 0 deletions(-) | |
| delete mode 100644 brandon-wong-412008.jpg | |
| delete mode 100644 messages.png | |
| delete mode 100644 music.png | |
| delete mode 100644 nathan-dumlao-293480.jpg | |
| delete mode 100644 phone.png | |
| delete mode 100644 safari.png | |
| GAs-MacBook-Air:cell_phone_html_css ga$ git push | |
| Counting objects: 5, done. | |
| Delta compression using up to 4 threads. | |
| Compressing objects: 100% (5/5), done. | |
| Writing objects: 100% (5/5), 569 bytes | 569.00 KiB/s, done. | |
| Total 5 (delta 3), reused 0 (delta 0) | |
| remote: Resolving deltas: 100% (3/3), completed with 2 local objects. | |
| To https://git.generalassemb.ly/tomatohammado/cell_phone_html_css.git | |
| 00e7cac..0450cc4 master -> master | |
| GAs-MacBook-Air:cell_phone_html_css ga$ git status | |
| On branch master | |
| Your branch is up to date with 'origin/master'. | |
| Changes not staged for commit: | |
| (use "git add <file>..." to update what will be committed) | |
| (use "git checkout -- <file>..." to discard changes in working directory) | |
| modified: index.html | |
| no changes added to commit (use "git add" and/or "git commit -a") | |
| GAs-MacBook-Air:cell_phone_html_css ga$ git add index.html | |
| GAs-MacBook-Air:cell_phone_html_css ga$ git commit -m "added new images to screen. They're not positioned very well, but that's the next step :)" | |
| [master bd8dc79] added new images to screen. They're not positioned very well, but that's the next step :) | |
| 1 file changed, 8 insertions(+) | |
| GAs-MacBook-Air:cell_phone_html_css ga$ git push | |
| Counting objects: 3, done. | |
| Delta compression using up to 4 threads. | |
| Compressing objects: 100% (3/3), done. | |
| Writing objects: 100% (3/3), 444 bytes | 222.00 KiB/s, done. | |
| Total 3 (delta 2), reused 0 (delta 0) | |
| remote: Resolving deltas: 100% (2/2), completed with 2 local objects. | |
| To https://git.generalassemb.ly/tomatohammado/cell_phone_html_css.git | |
| 0450cc4..bd8dc79 master -> master | |
| GAs-MacBook-Air:cell_phone_html_css ga$ git status | |
| On branch master | |
| Your branch is up to date with 'origin/master'. | |
| nothing to commit, working tree clean | |
| GAs-MacBook-Air:cell_phone_html_css ga$ git status | |
| On branch master | |
| Your branch is up to date with 'origin/master'. | |
| Changes not staged for commit: | |
| (use "git add <file>..." to update what will be committed) | |
| (use "git checkout -- <file>..." to discard changes in working directory) | |
| modified: index.html | |
| modified: style.css | |
| no changes added to commit (use "git add" and/or "git commit -a") | |
| GAs-MacBook-Air:cell_phone_html_css ga$ git add index.html | |
| GAs-MacBook-Air:cell_phone_html_css ga$ git commit -m "added container around screen icons to help with positioning." | |
| [master c8fc754] added container around screen icons to help with positioning. | |
| 1 file changed, 10 insertions(+), 7 deletions(-) | |
| GAs-MacBook-Air:cell_phone_html_css ga$ git add style.css | |
| GAs-MacBook-Air:cell_phone_html_css ga$ git commit -m "styles to icons, including opacity behind home row." | |
| [master 64f60f0] styles to icons, including opacity behind home row. | |
| 1 file changed, 15 insertions(+), 2 deletions(-) | |
| GAs-MacBook-Air:cell_phone_html_css ga$ git push | |
| Counting objects: 6, done. | |
| Delta compression using up to 4 threads. | |
| Compressing objects: 100% (6/6), done. | |
| Writing objects: 100% (6/6), 831 bytes | 415.00 KiB/s, done. | |
| Total 6 (delta 4), reused 0 (delta 0) | |
| remote: Resolving deltas: 100% (4/4), completed with 3 local objects. | |
| To https://git.generalassemb.ly/tomatohammado/cell_phone_html_css.git | |
| bd8dc79..64f60f0 master -> master | |
| GAs-MacBook-Air:cell_phone_html_css ga$ git status | |
| On branch master | |
| Your branch is up to date with 'origin/master'. | |
| Changes not staged for commit: | |
| (use "git add <file>..." to update what will be committed) | |
| (use "git checkout -- <file>..." to discard changes in working directory) | |
| modified: index.html | |
| modified: style.css | |
| no changes added to commit (use "git add" and/or "git commit -a") | |
| GAs-MacBook-Air:cell_phone_html_css ga$ git add . | |
| GAs-MacBook-Air:cell_phone_html_css ga$ git commit -m "added image credit, and centering style." | |
| [master 1901d58] added image credit, and centering style. | |
| 2 files changed, 9 insertions(+) | |
| GAs-MacBook-Air:cell_phone_html_css ga$ git push | |
| Counting objects: 4, done. | |
| Delta compression using up to 4 threads. | |
| Compressing objects: 100% (4/4), done. | |
| Writing objects: 100% (4/4), 1.18 KiB | 301.00 KiB/s, done. | |
| Total 4 (delta 3), reused 0 (delta 0) | |
| remote: Resolving deltas: 100% (3/3), completed with 3 local objects. | |
| To https://git.generalassemb.ly/tomatohammado/cell_phone_html_css.git | |
| 64f60f0..1901d58 master -> master | |
| GAs-MacBook-Air:cell_phone_html_css ga$ git status | |
| On branch master | |
| Your branch is up to date with 'origin/master'. | |
| Changes not staged for commit: | |
| (use "git add <file>..." to update what will be committed) | |
| (use "git checkout -- <file>..." to discard changes in working directory) | |
| modified: style.css | |
| no changes added to commit (use "git add" and/or "git commit -a") | |
| GAs-MacBook-Air:cell_phone_html_css ga$ git add style.css | |
| GAs-MacBook-Air:cell_phone_html_css ga$ git commit -m "added gradient border to the home button, found some code online as a guide so I saved the source and wrote down some comments about what I didn't understand about that code." | |
| [master 8a59623] added gradient border to the home button, found some code online as a guide so I saved the source and wrote down some comments about what I didn't understand about that code. | |
| 1 file changed, 14 insertions(+), 2 deletions(-) | |
| GAs-MacBook-Air:cell_phone_html_css ga$ git push | |
| Counting objects: 3, done. | |
| Delta compression using up to 4 threads. | |
| Compressing objects: 100% (3/3), done. | |
| Writing objects: 100% (3/3), 781 bytes | 781.00 KiB/s, done. | |
| Total 3 (delta 2), reused 0 (delta 0) | |
| remote: Resolving deltas: 100% (2/2), completed with 2 local objects. | |
| To https://git.generalassemb.ly/tomatohammado/cell_phone_html_css.git | |
| 1901d58..8a59623 master -> master | |
| GAs-MacBook-Air:cell_phone_html_css ga$ git status | |
| On branch master | |
| Your branch is up to date with 'origin/master'. | |
| nothing to commit, working tree clean | |
| GAs-MacBook-Air:cell_phone_html_css ga$ git status | |
| On branch master | |
| Your branch is up to date with 'origin/master'. | |
| Changes not staged for commit: | |
| (use "git add <file>..." to update what will be committed) | |
| (use "git checkout -- <file>..." to discard changes in working directory) | |
| modified: index.html | |
| modified: style.css | |
| no changes added to commit (use "git add" and/or "git commit -a") | |
| GAs-MacBook-Air:cell_phone_html_css ga$ git add . | |
| GAs-MacBook-Air:cell_phone_html_css ga$ git commit -m "adding status bar to screen. I might want to add icons later." | |
| [master e16c005] adding status bar to screen. I might want to add icons later. | |
| 2 files changed, 38 insertions(+), 1 deletion(-) | |
| GAs-MacBook-Air:cell_phone_html_css ga$ git push | |
| Counting objects: 4, done. | |
| Delta compression using up to 4 threads. | |
| Compressing objects: 100% (4/4), done. | |
| Writing objects: 100% (4/4), 910 bytes | 227.00 KiB/s, done. | |
| Total 4 (delta 3), reused 0 (delta 0) | |
| remote: Resolving deltas: 100% (3/3), completed with 3 local objects. | |
| To https://git.generalassemb.ly/tomatohammado/cell_phone_html_css.git | |
| 8a59623..e16c005 master -> master | |
| GAs-MacBook-Air:cell_phone_html_css ga$ git status | |
| On branch master | |
| Your branch is up to date with 'origin/master'. | |
| nothing to commit, working tree clean | |
| GAs-MacBook-Air:cell_phone_html_css ga$ git checkout -- | |
| M index.html | |
| M style.css | |
| Your branch is up to date with 'origin/master'. | |
| GAs-MacBook-Air:cell_phone_html_css ga$ git status | |
| On branch master | |
| Your branch is up to date with 'origin/master'. | |
| Changes not staged for commit: | |
| (use "git add <file>..." to update what will be committed) | |
| (use "git checkout -- <file>..." to discard changes in working directory) | |
| modified: index.html | |
| modified: style.css | |
| no changes added to commit (use "git add" and/or "git commit -a") | |
| GAs-MacBook-Air:cell_phone_html_css ga$ git add style.css | |
| GAs-MacBook-Air:cell_phone_html_css ga$ git commit -m "added whitespace between last few rules, for clarity" | |
| [master 1ee62e5] added whitespace between last few rules, for clarity | |
| 1 file changed, 8 insertions(+), 4 deletions(-) | |
| GAs-MacBook-Air:cell_phone_html_css ga$ git push | |
| Counting objects: 3, done. | |
| Delta compression using up to 4 threads. | |
| Compressing objects: 100% (3/3), done. | |
| Writing objects: 100% (3/3), 383 bytes | 127.00 KiB/s, done. | |
| Total 3 (delta 2), reused 0 (delta 0) | |
| remote: Resolving deltas: 100% (2/2), completed with 2 local objects. | |
| To https://git.generalassemb.ly/tomatohammado/cell_phone_html_css.git | |
| e16c005..1ee62e5 master -> master | |
| GAs-MacBook-Air:cell_phone_html_css ga$ git status | |
| On branch master | |
| Your branch is up to date with 'origin/master'. | |
| nothing to commit, working tree clean | |
| GAs-MacBook-Air:cell_phone_html_css ga$ git status | |
| On branch master | |
| Your branch is up to date with 'origin/master'. | |
| Changes not staged for commit: | |
| (use "git add <file>..." to update what will be committed) | |
| (use "git checkout -- <file>..." to discard changes in working directory) | |
| modified: index.html | |
| Untracked files: | |
| (use "git add <file>..." to include in what will be committed) | |
| font-awesome-4.7.0/ | |
| no changes added to commit (use "git add" and/or "git commit -a") | |
| GAs-MacBook-Air:cell_phone_html_css ga$ git add font-awesome-4.7.0/ | |
| GAs-MacBook-Air:cell_phone_html_css ga$ git commit -m "added font-awesome directory" | |
| [master 5bf43b2] added font-awesome directory | |
| 37 files changed, 8691 insertions(+) | |
| create mode 100644 font-awesome-4.7.0/HELP-US-OUT.txt | |
| create mode 100644 font-awesome-4.7.0/css/font-awesome.css | |
| create mode 100644 font-awesome-4.7.0/css/font-awesome.min.css | |
| create mode 100644 font-awesome-4.7.0/fonts/FontAwesome.otf | |
| create mode 100644 font-awesome-4.7.0/fonts/fontawesome-webfont.eot | |
| create mode 100644 font-awesome-4.7.0/fonts/fontawesome-webfont.svg | |
| create mode 100644 font-awesome-4.7.0/fonts/fontawesome-webfont.ttf | |
| create mode 100644 font-awesome-4.7.0/fonts/fontawesome-webfont.woff | |
| create mode 100644 font-awesome-4.7.0/fonts/fontawesome-webfont.woff2 | |
| create mode 100644 font-awesome-4.7.0/less/animated.less | |
| create mode 100644 font-awesome-4.7.0/less/bordered-pulled.less | |
| create mode 100644 font-awesome-4.7.0/less/core.less | |
| create mode 100644 font-awesome-4.7.0/less/fixed-width.less | |
| create mode 100644 font-awesome-4.7.0/less/font-awesome.less | |
| create mode 100644 font-awesome-4.7.0/less/icons.less | |
| create mode 100644 font-awesome-4.7.0/less/larger.less | |
| create mode 100644 font-awesome-4.7.0/less/list.less | |
| create mode 100644 font-awesome-4.7.0/less/mixins.less | |
| create mode 100644 font-awesome-4.7.0/less/path.less | |
| create mode 100644 font-awesome-4.7.0/less/rotated-flipped.less | |
| create mode 100644 font-awesome-4.7.0/less/screen-reader.less | |
| create mode 100644 font-awesome-4.7.0/less/stacked.less | |
| create mode 100644 font-awesome-4.7.0/less/variables.less | |
| create mode 100644 font-awesome-4.7.0/scss/_animated.scss | |
| create mode 100644 font-awesome-4.7.0/scss/_bordered-pulled.scss | |
| create mode 100644 font-awesome-4.7.0/scss/_core.scss | |
| create mode 100644 font-awesome-4.7.0/scss/_fixed-width.scss | |
| create mode 100644 font-awesome-4.7.0/scss/_icons.scss | |
| create mode 100644 font-awesome-4.7.0/scss/_larger.scss | |
| create mode 100644 font-awesome-4.7.0/scss/_list.scss | |
| create mode 100644 font-awesome-4.7.0/scss/_mixins.scss | |
| create mode 100644 font-awesome-4.7.0/scss/_path.scss | |
| create mode 100644 font-awesome-4.7.0/scss/_rotated-flipped.scss | |
| create mode 100644 font-awesome-4.7.0/scss/_screen-reader.scss | |
| create mode 100644 font-awesome-4.7.0/scss/_stacked.scss | |
| create mode 100644 font-awesome-4.7.0/scss/_variables.scss | |
| create mode 100644 font-awesome-4.7.0/scss/font-awesome.scss | |
| GAs-MacBook-Air:cell_phone_html_css ga$ git status | |
| On branch master | |
| Your branch is ahead of 'origin/master' by 1 commit. | |
| (use "git push" to publish your local commits) | |
| Changes not staged for commit: | |
| (use "git add <file>..." to update what will be committed) | |
| (use "git checkout -- <file>..." to discard changes in working directory) | |
| modified: index.html | |
| no changes added to commit (use "git add" and/or "git commit -a") | |
| GAs-MacBook-Air:cell_phone_html_css ga$ git add index.html | |
| GAs-MacBook-Air:cell_phone_html_css ga$ git commit -m "added icons to status bar" | |
| [master c75118f] added icons to status bar | |
| 1 file changed, 3 insertions(+), 2 deletions(-) | |
| GAs-MacBook-Air:cell_phone_html_css ga$ git status | |
| On branch master | |
| Your branch is ahead of 'origin/master' by 2 commits. | |
| (use "git push" to publish your local commits) | |
| nothing to commit, working tree clean | |
| GAs-MacBook-Air:cell_phone_html_css ga$ git push | |
| Counting objects: 47, done. | |
| Delta compression using up to 4 threads. | |
| Compressing objects: 100% (47/47), done. | |
| Writing objects: 100% (47/47), 552.95 KiB | 6.21 MiB/s, done. | |
| Total 47 (delta 7), reused 0 (delta 0) | |
| remote: Resolving deltas: 100% (7/7), completed with 1 local object. | |
| To https://git.generalassemb.ly/tomatohammado/cell_phone_html_css.git | |
| 1ee62e5..c75118f master -> master | |
| GAs-MacBook-Air:cell_phone_html_css ga$ git status | |
| On branch master | |
| Your branch is up to date with 'origin/master'. | |
| nothing to commit, working tree clean | |
| GAs-MacBook-Air:cell_phone_html_css ga$ git status | |
| On branch master | |
| Your branch is up to date with 'origin/master'. | |
| Changes not staged for commit: | |
| (use "git add <file>..." to update what will be committed) | |
| (use "git checkout -- <file>..." to discard changes in working directory) | |
| modified: index.html | |
| no changes added to commit (use "git add" and/or "git commit -a") | |
| GAs-MacBook-Air:cell_phone_html_css ga$ git add index.html | |
| GAs-MacBook-Air:cell_phone_html_css ga$ git commit -m "added more icons to the status bar, and used   entity for spacing between them instead of normal spaces. I could, and maybe should, have used margins, but since they're fonts I figured it would be ok. Maybe." | |
| [master 8018c9f] added more icons to the status bar, and used   entity for spacing between them instead of normal spaces. I could, and maybe should, have used margins, but since they're fonts I figured it would be ok. Maybe. | |
| 1 file changed, 2 insertions(+), 2 deletions(-) | |
| GAs-MacBook-Air:cell_phone_html_css ga$ git push | |
| Counting objects: 3, done. | |
| Delta compression using up to 4 threads. | |
| Compressing objects: 100% (3/3), done. | |
| Writing objects: 100% (3/3), 488 bytes | 488.00 KiB/s, done. | |
| Total 3 (delta 2), reused 0 (delta 0) | |
| remote: Resolving deltas: 100% (2/2), completed with 2 local objects. | |
| To https://git.generalassemb.ly/tomatohammado/cell_phone_html_css.git | |
| c75118f..8018c9f master -> master | |
| GAs-MacBook-Air:cell_phone_html_css ga$ git add . | |
| GAs-MacBook-Air:cell_phone_html_css ga$ git commit -m "minor styl changes: made the status bar text larger, adjusted spacing a bit. Nothing huge." | |
| [master d91351e] minor styl changes: made the status bar text larger, adjusted spacing a bit. Nothing huge. | |
| 2 files changed, 3 insertions(+), 5 deletions(-) | |
| GAs-MacBook-Air:cell_phone_html_css ga$ git push | |
| Counting objects: 4, done. | |
| Delta compression using up to 4 threads. | |
| Compressing objects: 100% (4/4), done. | |
| Writing objects: 100% (4/4), 422 bytes | 422.00 KiB/s, done. | |
| Total 4 (delta 3), reused 0 (delta 0) | |
| remote: Resolving deltas: 100% (3/3), completed with 3 local objects. | |
| To https://git.generalassemb.ly/tomatohammado/cell_phone_html_css.git | |
| 8018c9f..d91351e master -> master | |
| GAs-MacBook-Air:cell_phone_html_css ga$ git status | |
| On branch master | |
| Your branch is up to date with 'origin/master'. | |
| Changes not staged for commit: | |
| (use "git add <file>..." to update what will be committed) | |
| (use "git checkout -- <file>..." to discard changes in working directory) | |
| modified: style.css | |
| no changes added to commit (use "git add" and/or "git commit -a") | |
| GAs-MacBook-Air:cell_phone_html_css ga$ git add style.css | |
| GAs-MacBook-Air:cell_phone_html_css ga$ git commit -m "increased the border-radius on the screen by 1px. I might be getting a little too picky here..." | |
| [master 26d9fd9] increased the border-radius on the screen by 1px. I might be getting a little too picky here... | |
| 1 file changed, 1 insertion(+), 1 deletion(-) | |
| GAs-MacBook-Air:cell_phone_html_css ga$ git push | |
| Counting objects: 3, done. | |
| Delta compression using up to 4 threads. | |
| Compressing objects: 100% (3/3), done. | |
| Writing objects: 100% (3/3), 349 bytes | 349.00 KiB/s, done. | |
| Total 3 (delta 2), reused 0 (delta 0) | |
| remote: Resolving deltas: 100% (2/2), completed with 2 local objects. | |
| To https://git.generalassemb.ly/tomatohammado/cell_phone_html_css.git | |
| d91351e..26d9fd9 master -> master | |
| GAs-MacBook-Air:cell_phone_html_css ga$ git status | |
| On branch master | |
| Your branch is up to date with 'origin/master'. | |
| Changes not staged for commit: | |
| (use "git add <file>..." to update what will be committed) | |
| (use "git checkout -- <file>..." to discard changes in working directory) | |
| modified: style.css | |
| no changes added to commit (use "git add" and/or "git commit -a") | |
| GAs-MacBook-Air:cell_phone_html_css ga$ git add style.css | |
| GAs-MacBook-Air:cell_phone_html_css ga$ git commit -m "made border-radius larger, added box-shadow to help differentiate difference between buttons on the side. Now to make those buttons." | |
| [master d909bd1] made border-radius larger, added box-shadow to help differentiate difference between buttons on the side. Now to make those buttons. | |
| 1 file changed, 2 insertions(+), 1 deletion(-) | |
| GAs-MacBook-Air:cell_phone_html_css ga$ git push | |
| Counting objects: 3, done. | |
| Delta compression using up to 4 threads. | |
| Compressing objects: 100% (3/3), done. | |
| Writing objects: 100% (3/3), 393 bytes | 131.00 KiB/s, done. | |
| Total 3 (delta 2), reused 0 (delta 0) | |
| remote: Resolving deltas: 100% (2/2), completed with 2 local objects. | |
| To https://git.generalassemb.ly/tomatohammado/cell_phone_html_css.git | |
| 26d9fd9..d909bd1 master -> master | |
| GAs-MacBook-Air:cell_phone_html_css ga$ git status | |
| On branch master | |
| Your branch is up to date with 'origin/master'. | |
| Changes not staged for commit: | |
| (use "git add <file>..." to update what will be committed) | |
| (use "git checkout -- <file>..." to discard changes in working directory) | |
| modified: index.html | |
| modified: style.css | |
| no changes added to commit (use "git add" and/or "git commit -a") | |
| GAs-MacBook-Air:cell_phone_html_css ga$ git add index.html | |
| GAs-MacBook-Air:cell_phone_html_css ga$ git commit -m "added divs for side buttons on phone body" | |
| [master ee28876] added divs for side buttons on phone body | |
| 1 file changed, 13 insertions(+) | |
| GAs-MacBook-Air:cell_phone_html_css ga$ git add style.css | |
| GAs-MacBook-Air:cell_phone_html_css ga$ git commit -m "moved around some styles on .phone-body, added position: relative, and added styles for .toggle-button. Which is really a switch, but whatever.", | |
| [master d21227e] moved around some styles on .phone-body, added position: relative, and added styles for .toggle-button. Which is really a switch, but whatever., | |
| 1 file changed, 15 insertions(+), 2 deletions(-) | |
| GAs-MacBook-Air:cell_phone_html_css ga$ git status | |
| On branch master | |
| Your branch is ahead of 'origin/master' by 2 commits. | |
| (use "git push" to publish your local commits) | |
| Changes not staged for commit: | |
| (use "git add <file>..." to update what will be committed) | |
| (use "git checkout -- <file>..." to discard changes in working directory) | |
| modified: index.html | |
| modified: style.css | |
| no changes added to commit (use "git add" and/or "git commit -a") | |
| GAs-MacBook-Air:cell_phone_html_css ga$ git add index.html | |
| GAs-MacBook-Air:cell_phone_html_css ga$ git commit -m "added .volume-button class to volume buttons, because they share some styles. I can even use another more general .button class for all the buttons, but I'll save that for later." | |
| [master e97a305] added .volume-button class to volume buttons, because they share some styles. I can even use another more general .button class for all the buttons, but I'll save that for later. | |
| 1 file changed, 2 insertions(+), 2 deletions(-) | |
| GAs-MacBook-Air:cell_phone_html_css ga$ git add style.css | |
| GAs-MacBook-Air:cell_phone_html_css ga$ git commit -m "added styles for volume buttons." | |
| [master cad7663] added styles for volume buttons. | |
| 1 file changed, 20 insertions(+) | |
| GAs-MacBook-Air:cell_phone_html_css ga$ git push | |
| Counting objects: 12, done. | |
| Delta compression using up to 4 threads. | |
| Compressing objects: 100% (12/12), done. | |
| Writing objects: 100% (12/12), 1.51 KiB | 309.00 KiB/s, done. | |
| Total 12 (delta 8), reused 0 (delta 0) | |
| remote: Resolving deltas: 100% (8/8), completed with 3 local objects. | |
| To https://git.generalassemb.ly/tomatohammado/cell_phone_html_css.git | |
| d909bd1..cad7663 master -> master | |
| GAs-MacBook-Air:cell_phone_html_css ga$ git status | |
| On branch master | |
| Your branch is up to date with 'origin/master'. | |
| Changes not staged for commit: | |
| (use "git add <file>..." to update what will be committed) | |
| (use "git checkout -- <file>..." to discard changes in working directory) | |
| modified: style.css | |
| no changes added to commit (use "git add" and/or "git commit -a") | |
| GAs-MacBook-Air:cell_phone_html_css ga$ git add style.css | |
| GAs-MacBook-Air:cell_phone_html_css ga$ git commit -m "made volume and power button a little larger, added power button styles." | |
| [master 3805a36] made volume and power button a little larger, added power button styles. | |
| 1 file changed, 14 insertions(+), 2 deletions(-) | |
| GAs-MacBook-Air:cell_phone_html_css ga$ git add index.html | |
| GAs-MacBook-Air:cell_phone_html_css ga$ git commit -m "added more general .side-button class to buttons." | |
| [master dd48679] added more general .side-button class to buttons. | |
| 1 file changed, 4 insertions(+), 4 deletions(-) | |
| GAs-MacBook-Air:cell_phone_html_css ga$ git add style.css | |
| GAs-MacBook-Air:cell_phone_html_css ga$ git commit -m "refactored styles on buttons to reduce repetition." | |
| [master 3f3d2c5] refactored styles on buttons to reduce repetition. | |
| 1 file changed, 12 insertions(+), 15 deletions(-) | |
| GAs-MacBook-Air:cell_phone_html_css ga$ git push | |
| Counting objects: 9, done. | |
| Delta compression using up to 4 threads. | |
| Compressing objects: 100% (9/9), done. | |
| Writing objects: 100% (9/9), 1.05 KiB | 539.00 KiB/s, done. | |
| Total 9 (delta 6), reused 0 (delta 0) | |
| remote: Resolving deltas: 100% (6/6), completed with 3 local objects. | |
| To https://git.generalassemb.ly/tomatohammado/cell_phone_html_css.git | |
| cad7663..3f3d2c5 master -> master | |
| GAs-MacBook-Air:cell_phone_html_css ga$ git status | |
| On branch master | |
| Your branch is up to date with 'origin/master'. | |
| nothing to commit, working tree clean | |
| GAs-MacBook-Air:cell_phone_html_css ga$ git status | |
| On branch master | |
| Your branch is up to date with 'origin/master'. | |
| Changes not staged for commit: | |
| (use "git add <file>..." to update what will be committed) | |
| (use "git checkout -- <file>..." to discard changes in working directory) | |
| modified: style.css | |
| no changes added to commit (use "git add" and/or "git commit -a") | |
| GAs-MacBook-Air:cell_phone_html_css ga$ git add style.css | |
| GAs-MacBook-Air:cell_phone_html_css ga$ git commit -m "adjusted button postioning. Minor stuff." | |
| [master d694696] adjusted button postioning. Minor stuff. | |
| 1 file changed, 4 insertions(+), 4 deletions(-) | |
| GAs-MacBook-Air:cell_phone_html_css ga$ git status | |
| On branch master | |
| Your branch is ahead of 'origin/master' by 1 commit. | |
| (use "git push" to publish your local commits) | |
| Changes not staged for commit: | |
| (use "git add <file>..." to update what will be committed) | |
| (use "git checkout -- <file>..." to discard changes in working directory) | |
| modified: index.html | |
| no changes added to commit (use "git add" and/or "git commit -a") | |
| GAs-MacBook-Air:cell_phone_html_css ga$ git add index.html | |
| GAs-MacBook-Air:cell_phone_html_css ga$ git commit -m "added HTML elements for border notches. I didn't end up breaking the closing `</div>` tag onto another line, and I think it looks cleaner. So my next commit will be me going through and cleaning up the tags, and adding some comments for organizatin. It's getting a little hairy." | |
| -bash: command substitution: line 1: syntax error near unexpected token `newline' | |
| -bash: command substitution: line 1: `</div>' | |
| [master e070ec9] added HTML elements for border notches. I didn't end up breaking the closing tag onto another line, and I think it looks cleaner. So my next commit will be me going through and cleaning up the tags, and adding some comments for organizatin. It's getting a little hairy. | |
| 1 file changed, 8 insertions(+) | |
| GAs-MacBook-Air:cell_phone_html_css ga$ mkdir css/ | |
| GAs-MacBook-Air:cell_phone_html_css ga$ mv style.css font-awesome-4.7.0/ css/ | |
| GAs-MacBook-Air:cell_phone_html_css ga$ ls css/ | |
| font-awesome-4.7.0 style.css | |
| GAs-MacBook-Air:cell_phone_html_css ga$ git add css/ | |
| GAs-MacBook-Air:cell_phone_html_css ga$ git status | |
| On branch master | |
| Your branch is ahead of 'origin/master' by 2 commits. | |
| (use "git push" to publish your local commits) | |
| Changes to be committed: | |
| (use "git reset HEAD <file>..." to unstage) | |
| new file: css/font-awesome-4.7.0/HELP-US-OUT.txt | |
| new file: css/font-awesome-4.7.0/css/font-awesome.css | |
| new file: css/font-awesome-4.7.0/css/font-awesome.min.css | |
| new file: css/font-awesome-4.7.0/fonts/FontAwesome.otf | |
| new file: css/font-awesome-4.7.0/fonts/fontawesome-webfont.eot | |
| new file: css/font-awesome-4.7.0/fonts/fontawesome-webfont.svg | |
| new file: css/font-awesome-4.7.0/fonts/fontawesome-webfont.ttf | |
| new file: css/font-awesome-4.7.0/fonts/fontawesome-webfont.woff | |
| new file: css/font-awesome-4.7.0/fonts/fontawesome-webfont.woff2 | |
| new file: css/font-awesome-4.7.0/less/animated.less | |
| new file: css/font-awesome-4.7.0/less/bordered-pulled.less | |
| new file: css/font-awesome-4.7.0/less/core.less | |
| new file: css/font-awesome-4.7.0/less/fixed-width.less | |
| new file: css/font-awesome-4.7.0/less/font-awesome.less | |
| new file: css/font-awesome-4.7.0/less/icons.less | |
| new file: css/font-awesome-4.7.0/less/larger.less | |
| new file: css/font-awesome-4.7.0/less/list.less | |
| new file: css/font-awesome-4.7.0/less/mixins.less | |
| new file: css/font-awesome-4.7.0/less/path.less | |
| new file: css/font-awesome-4.7.0/less/rotated-flipped.less | |
| new file: css/font-awesome-4.7.0/less/screen-reader.less | |
| new file: css/font-awesome-4.7.0/less/stacked.less | |
| new file: css/font-awesome-4.7.0/less/variables.less | |
| new file: css/font-awesome-4.7.0/scss/_animated.scss | |
| new file: css/font-awesome-4.7.0/scss/_bordered-pulled.scss | |
| new file: css/font-awesome-4.7.0/scss/_core.scss | |
| new file: css/font-awesome-4.7.0/scss/_fixed-width.scss | |
| new file: css/font-awesome-4.7.0/scss/_icons.scss | |
| new file: css/font-awesome-4.7.0/scss/_larger.scss | |
| new file: css/font-awesome-4.7.0/scss/_list.scss | |
| new file: css/font-awesome-4.7.0/scss/_mixins.scss | |
| new file: css/font-awesome-4.7.0/scss/_path.scss | |
| new file: css/font-awesome-4.7.0/scss/_rotated-flipped.scss | |
| new file: css/font-awesome-4.7.0/scss/_screen-reader.scss | |
| new file: css/font-awesome-4.7.0/scss/_stacked.scss | |
| new file: css/font-awesome-4.7.0/scss/_variables.scss | |
| new file: css/font-awesome-4.7.0/scss/font-awesome.scss | |
| new file: css/style.css | |
| Changes not staged for commit: | |
| (use "git add/rm <file>..." to update what will be committed) | |
| (use "git checkout -- <file>..." to discard changes in working directory) | |
| deleted: font-awesome-4.7.0/HELP-US-OUT.txt | |
| deleted: font-awesome-4.7.0/css/font-awesome.css | |
| deleted: font-awesome-4.7.0/css/font-awesome.min.css | |
| deleted: font-awesome-4.7.0/fonts/FontAwesome.otf | |
| deleted: font-awesome-4.7.0/fonts/fontawesome-webfont.eot | |
| deleted: font-awesome-4.7.0/fonts/fontawesome-webfont.svg | |
| deleted: font-awesome-4.7.0/fonts/fontawesome-webfont.ttf | |
| deleted: font-awesome-4.7.0/fonts/fontawesome-webfont.woff | |
| deleted: font-awesome-4.7.0/fonts/fontawesome-webfont.woff2 | |
| deleted: font-awesome-4.7.0/less/animated.less | |
| deleted: font-awesome-4.7.0/less/bordered-pulled.less | |
| deleted: font-awesome-4.7.0/less/core.less | |
| deleted: font-awesome-4.7.0/less/fixed-width.less | |
| deleted: font-awesome-4.7.0/less/font-awesome.less | |
| deleted: font-awesome-4.7.0/less/icons.less | |
| deleted: font-awesome-4.7.0/less/larger.less | |
| deleted: font-awesome-4.7.0/less/list.less | |
| deleted: font-awesome-4.7.0/less/mixins.less | |
| deleted: font-awesome-4.7.0/less/path.less | |
| deleted: font-awesome-4.7.0/less/rotated-flipped.less | |
| deleted: font-awesome-4.7.0/less/screen-reader.less | |
| deleted: font-awesome-4.7.0/less/stacked.less | |
| deleted: font-awesome-4.7.0/less/variables.less | |
| deleted: font-awesome-4.7.0/scss/_animated.scss | |
| deleted: font-awesome-4.7.0/scss/_bordered-pulled.scss | |
| deleted: font-awesome-4.7.0/scss/_core.scss | |
| deleted: font-awesome-4.7.0/scss/_fixed-width.scss | |
| deleted: font-awesome-4.7.0/scss/_icons.scss | |
| deleted: font-awesome-4.7.0/scss/_larger.scss | |
| deleted: font-awesome-4.7.0/scss/_list.scss | |
| deleted: font-awesome-4.7.0/scss/_mixins.scss | |
| deleted: font-awesome-4.7.0/scss/_path.scss | |
| deleted: font-awesome-4.7.0/scss/_rotated-flipped.scss | |
| deleted: font-awesome-4.7.0/scss/_screen-reader.scss | |
| deleted: font-awesome-4.7.0/scss/_stacked.scss | |
| deleted: font-awesome-4.7.0/scss/_variables.scss | |
| deleted: font-awesome-4.7.0/scss/font-awesome.scss | |
| modified: index.html | |
| deleted: style.css | |
| GAs-MacBook-Air:cell_phone_html_css ga$ git status | |
| On branch master | |
| Your branch is ahead of 'origin/master' by 2 commits. | |
| (use "git push" to publish your local commits) | |
| Changes to be committed: | |
| (use "git reset HEAD <file>..." to unstage) | |
| new file: css/font-awesome-4.7.0/HELP-US-OUT.txt | |
| new file: css/font-awesome-4.7.0/css/font-awesome.css | |
| new file: css/font-awesome-4.7.0/css/font-awesome.min.css | |
| new file: css/font-awesome-4.7.0/fonts/FontAwesome.otf | |
| new file: css/font-awesome-4.7.0/fonts/fontawesome-webfont.eot | |
| new file: css/font-awesome-4.7.0/fonts/fontawesome-webfont.svg | |
| new file: css/font-awesome-4.7.0/fonts/fontawesome-webfont.ttf | |
| new file: css/font-awesome-4.7.0/fonts/fontawesome-webfont.woff | |
| new file: css/font-awesome-4.7.0/fonts/fontawesome-webfont.woff2 | |
| new file: css/font-awesome-4.7.0/less/animated.less | |
| new file: css/font-awesome-4.7.0/less/bordered-pulled.less | |
| new file: css/font-awesome-4.7.0/less/core.less | |
| new file: css/font-awesome-4.7.0/less/fixed-width.less | |
| new file: css/font-awesome-4.7.0/less/font-awesome.less | |
| new file: css/font-awesome-4.7.0/less/icons.less | |
| new file: css/font-awesome-4.7.0/less/larger.less | |
| new file: css/font-awesome-4.7.0/less/list.less | |
| new file: css/font-awesome-4.7.0/less/mixins.less | |
| new file: css/font-awesome-4.7.0/less/path.less | |
| new file: css/font-awesome-4.7.0/less/rotated-flipped.less | |
| new file: css/font-awesome-4.7.0/less/screen-reader.less | |
| new file: css/font-awesome-4.7.0/less/stacked.less | |
| new file: css/font-awesome-4.7.0/less/variables.less | |
| new file: css/font-awesome-4.7.0/scss/_animated.scss | |
| new file: css/font-awesome-4.7.0/scss/_bordered-pulled.scss | |
| new file: css/font-awesome-4.7.0/scss/_core.scss | |
| new file: css/font-awesome-4.7.0/scss/_fixed-width.scss | |
| new file: css/font-awesome-4.7.0/scss/_icons.scss | |
| new file: css/font-awesome-4.7.0/scss/_larger.scss | |
| new file: css/font-awesome-4.7.0/scss/_list.scss | |
| new file: css/font-awesome-4.7.0/scss/_mixins.scss | |
| new file: css/font-awesome-4.7.0/scss/_path.scss | |
| new file: css/font-awesome-4.7.0/scss/_rotated-flipped.scss | |
| new file: css/font-awesome-4.7.0/scss/_screen-reader.scss | |
| new file: css/font-awesome-4.7.0/scss/_stacked.scss | |
| new file: css/font-awesome-4.7.0/scss/_variables.scss | |
| new file: css/font-awesome-4.7.0/scss/font-awesome.scss | |
| new file: css/style.css | |
| Changes not staged for commit: | |
| (use "git add/rm <file>..." to update what will be committed) | |
| (use "git checkout -- <file>..." to discard changes in working directory) | |
| modified: css/style.css | |
| deleted: font-awesome-4.7.0/HELP-US-OUT.txt | |
| deleted: font-awesome-4.7.0/css/font-awesome.css | |
| deleted: font-awesome-4.7.0/css/font-awesome.min.css | |
| deleted: font-awesome-4.7.0/fonts/FontAwesome.otf | |
| deleted: font-awesome-4.7.0/fonts/fontawesome-webfont.eot | |
| deleted: font-awesome-4.7.0/fonts/fontawesome-webfont.svg | |
| deleted: font-awesome-4.7.0/fonts/fontawesome-webfont.ttf | |
| deleted: font-awesome-4.7.0/fonts/fontawesome-webfont.woff | |
| deleted: font-awesome-4.7.0/fonts/fontawesome-webfont.woff2 | |
| deleted: font-awesome-4.7.0/less/animated.less | |
| deleted: font-awesome-4.7.0/less/bordered-pulled.less | |
| deleted: font-awesome-4.7.0/less/core.less | |
| deleted: font-awesome-4.7.0/less/fixed-width.less | |
| deleted: font-awesome-4.7.0/less/font-awesome.less | |
| deleted: font-awesome-4.7.0/less/icons.less | |
| deleted: font-awesome-4.7.0/less/larger.less | |
| deleted: font-awesome-4.7.0/less/list.less | |
| deleted: font-awesome-4.7.0/less/mixins.less | |
| deleted: font-awesome-4.7.0/less/path.less | |
| deleted: font-awesome-4.7.0/less/rotated-flipped.less | |
| deleted: font-awesome-4.7.0/less/screen-reader.less | |
| deleted: font-awesome-4.7.0/less/stacked.less | |
| deleted: font-awesome-4.7.0/less/variables.less | |
| deleted: font-awesome-4.7.0/scss/_animated.scss | |
| deleted: font-awesome-4.7.0/scss/_bordered-pulled.scss | |
| deleted: font-awesome-4.7.0/scss/_core.scss | |
| deleted: font-awesome-4.7.0/scss/_fixed-width.scss | |
| deleted: font-awesome-4.7.0/scss/_icons.scss | |
| deleted: font-awesome-4.7.0/scss/_larger.scss | |
| deleted: font-awesome-4.7.0/scss/_list.scss | |
| deleted: font-awesome-4.7.0/scss/_mixins.scss | |
| deleted: font-awesome-4.7.0/scss/_path.scss | |
| deleted: font-awesome-4.7.0/scss/_rotated-flipped.scss | |
| deleted: font-awesome-4.7.0/scss/_screen-reader.scss | |
| deleted: font-awesome-4.7.0/scss/_stacked.scss | |
| deleted: font-awesome-4.7.0/scss/_variables.scss | |
| deleted: font-awesome-4.7.0/scss/font-awesome.scss | |
| modified: index.html | |
| deleted: style.css | |
| GAs-MacBook-Air:cell_phone_html_css ga$ git add css/style.css | |
| GAs-MacBook-Air:cell_phone_html_css ga$ git status | |
| On branch master | |
| Your branch is ahead of 'origin/master' by 2 commits. | |
| (use "git push" to publish your local commits) | |
| Changes to be committed: | |
| (use "git reset HEAD <file>..." to unstage) | |
| new file: css/font-awesome-4.7.0/HELP-US-OUT.txt | |
| new file: css/font-awesome-4.7.0/css/font-awesome.css | |
| new file: css/font-awesome-4.7.0/css/font-awesome.min.css | |
| new file: css/font-awesome-4.7.0/fonts/FontAwesome.otf | |
| new file: css/font-awesome-4.7.0/fonts/fontawesome-webfont.eot | |
| new file: css/font-awesome-4.7.0/fonts/fontawesome-webfont.svg | |
| new file: css/font-awesome-4.7.0/fonts/fontawesome-webfont.ttf | |
| new file: css/font-awesome-4.7.0/fonts/fontawesome-webfont.woff | |
| new file: css/font-awesome-4.7.0/fonts/fontawesome-webfont.woff2 | |
| new file: css/font-awesome-4.7.0/less/animated.less | |
| new file: css/font-awesome-4.7.0/less/bordered-pulled.less | |
| new file: css/font-awesome-4.7.0/less/core.less | |
| new file: css/font-awesome-4.7.0/less/fixed-width.less | |
| new file: css/font-awesome-4.7.0/less/font-awesome.less | |
| new file: css/font-awesome-4.7.0/less/icons.less | |
| new file: css/font-awesome-4.7.0/less/larger.less | |
| new file: css/font-awesome-4.7.0/less/list.less | |
| new file: css/font-awesome-4.7.0/less/mixins.less | |
| new file: css/font-awesome-4.7.0/less/path.less | |
| new file: css/font-awesome-4.7.0/less/rotated-flipped.less | |
| new file: css/font-awesome-4.7.0/less/screen-reader.less | |
| new file: css/font-awesome-4.7.0/less/stacked.less | |
| new file: css/font-awesome-4.7.0/less/variables.less | |
| new file: css/font-awesome-4.7.0/scss/_animated.scss | |
| new file: css/font-awesome-4.7.0/scss/_bordered-pulled.scss | |
| new file: css/font-awesome-4.7.0/scss/_core.scss | |
| new file: css/font-awesome-4.7.0/scss/_fixed-width.scss | |
| new file: css/font-awesome-4.7.0/scss/_icons.scss | |
| new file: css/font-awesome-4.7.0/scss/_larger.scss | |
| new file: css/font-awesome-4.7.0/scss/_list.scss | |
| new file: css/font-awesome-4.7.0/scss/_mixins.scss | |
| new file: css/font-awesome-4.7.0/scss/_path.scss | |
| new file: css/font-awesome-4.7.0/scss/_rotated-flipped.scss | |
| new file: css/font-awesome-4.7.0/scss/_screen-reader.scss | |
| new file: css/font-awesome-4.7.0/scss/_stacked.scss | |
| new file: css/font-awesome-4.7.0/scss/_variables.scss | |
| new file: css/font-awesome-4.7.0/scss/font-awesome.scss | |
| new file: css/style.css | |
| Changes not staged for commit: | |
| (use "git add/rm <file>..." to update what will be committed) | |
| (use "git checkout -- <file>..." to discard changes in working directory) | |
| deleted: font-awesome-4.7.0/HELP-US-OUT.txt | |
| deleted: font-awesome-4.7.0/css/font-awesome.css | |
| deleted: font-awesome-4.7.0/css/font-awesome.min.css | |
| deleted: font-awesome-4.7.0/fonts/FontAwesome.otf | |
| deleted: font-awesome-4.7.0/fonts/fontawesome-webfont.eot | |
| deleted: font-awesome-4.7.0/fonts/fontawesome-webfont.svg | |
| deleted: font-awesome-4.7.0/fonts/fontawesome-webfont.ttf | |
| deleted: font-awesome-4.7.0/fonts/fontawesome-webfont.woff | |
| deleted: font-awesome-4.7.0/fonts/fontawesome-webfont.woff2 | |
| deleted: font-awesome-4.7.0/less/animated.less | |
| deleted: font-awesome-4.7.0/less/bordered-pulled.less | |
| deleted: font-awesome-4.7.0/less/core.less | |
| deleted: font-awesome-4.7.0/less/fixed-width.less | |
| deleted: font-awesome-4.7.0/less/font-awesome.less | |
| deleted: font-awesome-4.7.0/less/icons.less | |
| deleted: font-awesome-4.7.0/less/larger.less | |
| deleted: font-awesome-4.7.0/less/list.less | |
| deleted: font-awesome-4.7.0/less/mixins.less | |
| deleted: font-awesome-4.7.0/less/path.less | |
| deleted: font-awesome-4.7.0/less/rotated-flipped.less | |
| deleted: font-awesome-4.7.0/less/screen-reader.less | |
| deleted: font-awesome-4.7.0/less/stacked.less | |
| deleted: font-awesome-4.7.0/less/variables.less | |
| deleted: font-awesome-4.7.0/scss/_animated.scss | |
| deleted: font-awesome-4.7.0/scss/_bordered-pulled.scss | |
| deleted: font-awesome-4.7.0/scss/_core.scss | |
| deleted: font-awesome-4.7.0/scss/_fixed-width.scss | |
| deleted: font-awesome-4.7.0/scss/_icons.scss | |
| deleted: font-awesome-4.7.0/scss/_larger.scss | |
| deleted: font-awesome-4.7.0/scss/_list.scss | |
| deleted: font-awesome-4.7.0/scss/_mixins.scss | |
| deleted: font-awesome-4.7.0/scss/_path.scss | |
| deleted: font-awesome-4.7.0/scss/_rotated-flipped.scss | |
| deleted: font-awesome-4.7.0/scss/_screen-reader.scss | |
| deleted: font-awesome-4.7.0/scss/_stacked.scss | |
| deleted: font-awesome-4.7.0/scss/_variables.scss | |
| deleted: font-awesome-4.7.0/scss/font-awesome.scss | |
| modified: index.html | |
| deleted: style.css | |
| GAs-MacBook-Air:cell_phone_html_css ga$ git commit -m "moved font-awesome directory and style.css to a css/ directory. Had to change the relative paths in the link tags and the phone screen background image." | |
| [master b019086] moved font-awesome directory and style.css to a css/ directory. Had to change the relative paths in the link tags and the phone screen background image. | |
| 38 files changed, 8873 insertions(+) | |
| create mode 100644 css/font-awesome-4.7.0/HELP-US-OUT.txt | |
| create mode 100644 css/font-awesome-4.7.0/css/font-awesome.css | |
| create mode 100644 css/font-awesome-4.7.0/css/font-awesome.min.css | |
| create mode 100644 css/font-awesome-4.7.0/fonts/FontAwesome.otf | |
| create mode 100644 css/font-awesome-4.7.0/fonts/fontawesome-webfont.eot | |
| create mode 100644 css/font-awesome-4.7.0/fonts/fontawesome-webfont.svg | |
| create mode 100644 css/font-awesome-4.7.0/fonts/fontawesome-webfont.ttf | |
| create mode 100644 css/font-awesome-4.7.0/fonts/fontawesome-webfont.woff | |
| create mode 100644 css/font-awesome-4.7.0/fonts/fontawesome-webfont.woff2 | |
| create mode 100644 css/font-awesome-4.7.0/less/animated.less | |
| create mode 100644 css/font-awesome-4.7.0/less/bordered-pulled.less | |
| create mode 100644 css/font-awesome-4.7.0/less/core.less | |
| create mode 100644 css/font-awesome-4.7.0/less/fixed-width.less | |
| create mode 100644 css/font-awesome-4.7.0/less/font-awesome.less | |
| create mode 100644 css/font-awesome-4.7.0/less/icons.less | |
| create mode 100644 css/font-awesome-4.7.0/less/larger.less | |
| create mode 100644 css/font-awesome-4.7.0/less/list.less | |
| create mode 100644 css/font-awesome-4.7.0/less/mixins.less | |
| create mode 100644 css/font-awesome-4.7.0/less/path.less | |
| create mode 100644 css/font-awesome-4.7.0/less/rotated-flipped.less | |
| create mode 100644 css/font-awesome-4.7.0/less/screen-reader.less | |
| create mode 100644 css/font-awesome-4.7.0/less/stacked.less | |
| create mode 100644 css/font-awesome-4.7.0/less/variables.less | |
| create mode 100644 css/font-awesome-4.7.0/scss/_animated.scss | |
| create mode 100644 css/font-awesome-4.7.0/scss/_bordered-pulled.scss | |
| create mode 100644 css/font-awesome-4.7.0/scss/_core.scss | |
| create mode 100644 css/font-awesome-4.7.0/scss/_fixed-width.scss | |
| create mode 100644 css/font-awesome-4.7.0/scss/_icons.scss | |
| create mode 100644 css/font-awesome-4.7.0/scss/_larger.scss | |
| create mode 100644 css/font-awesome-4.7.0/scss/_list.scss | |
| create mode 100644 css/font-awesome-4.7.0/scss/_mixins.scss | |
| create mode 100644 css/font-awesome-4.7.0/scss/_path.scss | |
| create mode 100644 css/font-awesome-4.7.0/scss/_rotated-flipped.scss | |
| create mode 100644 css/font-awesome-4.7.0/scss/_screen-reader.scss | |
| create mode 100644 css/font-awesome-4.7.0/scss/_stacked.scss | |
| create mode 100644 css/font-awesome-4.7.0/scss/_variables.scss | |
| create mode 100644 css/font-awesome-4.7.0/scss/font-awesome.scss | |
| create mode 100644 css/style.css | |
| GAs-MacBook-Air:cell_phone_html_css ga$ git add index.html | |
| GAs-MacBook-Air:cell_phone_html_css ga$ git commit -m "added comments, deleted some newline breaks between `<div>` tags, and changed relative paths for css files." | |
| -bash: command substitution: line 1: syntax error near unexpected token `newline' | |
| -bash: command substitution: line 1: `<div>' | |
| [master f18b77b] added comments, deleted some newline breaks between tags, and changed relative paths for css files. | |
| 1 file changed, 42 insertions(+), 27 deletions(-) | |
| GAs-MacBook-Air:cell_phone_html_css ga$ git status | |
| On branch master | |
| Your branch is ahead of 'origin/master' by 4 commits. | |
| (use "git push" to publish your local commits) | |
| Changes not staged for commit: | |
| (use "git add/rm <file>..." to update what will be committed) | |
| (use "git checkout -- <file>..." to discard changes in working directory) | |
| deleted: font-awesome-4.7.0/HELP-US-OUT.txt | |
| deleted: font-awesome-4.7.0/css/font-awesome.css | |
| deleted: font-awesome-4.7.0/css/font-awesome.min.css | |
| deleted: font-awesome-4.7.0/fonts/FontAwesome.otf | |
| deleted: font-awesome-4.7.0/fonts/fontawesome-webfont.eot | |
| deleted: font-awesome-4.7.0/fonts/fontawesome-webfont.svg | |
| deleted: font-awesome-4.7.0/fonts/fontawesome-webfont.ttf | |
| deleted: font-awesome-4.7.0/fonts/fontawesome-webfont.woff | |
| deleted: font-awesome-4.7.0/fonts/fontawesome-webfont.woff2 | |
| deleted: font-awesome-4.7.0/less/animated.less | |
| deleted: font-awesome-4.7.0/less/bordered-pulled.less | |
| deleted: font-awesome-4.7.0/less/core.less | |
| deleted: font-awesome-4.7.0/less/fixed-width.less | |
| deleted: font-awesome-4.7.0/less/font-awesome.less | |
| deleted: font-awesome-4.7.0/less/icons.less | |
| deleted: font-awesome-4.7.0/less/larger.less | |
| deleted: font-awesome-4.7.0/less/list.less | |
| deleted: font-awesome-4.7.0/less/mixins.less | |
| deleted: font-awesome-4.7.0/less/path.less | |
| deleted: font-awesome-4.7.0/less/rotated-flipped.less | |
| deleted: font-awesome-4.7.0/less/screen-reader.less | |
| deleted: font-awesome-4.7.0/less/stacked.less | |
| deleted: font-awesome-4.7.0/less/variables.less | |
| deleted: font-awesome-4.7.0/scss/_animated.scss | |
| deleted: font-awesome-4.7.0/scss/_bordered-pulled.scss | |
| deleted: font-awesome-4.7.0/scss/_core.scss | |
| deleted: font-awesome-4.7.0/scss/_fixed-width.scss | |
| deleted: font-awesome-4.7.0/scss/_icons.scss | |
| deleted: font-awesome-4.7.0/scss/_larger.scss | |
| deleted: font-awesome-4.7.0/scss/_list.scss | |
| deleted: font-awesome-4.7.0/scss/_mixins.scss | |
| deleted: font-awesome-4.7.0/scss/_path.scss | |
| deleted: font-awesome-4.7.0/scss/_rotated-flipped.scss | |
| deleted: font-awesome-4.7.0/scss/_screen-reader.scss | |
| deleted: font-awesome-4.7.0/scss/_stacked.scss | |
| deleted: font-awesome-4.7.0/scss/_variables.scss | |
| deleted: font-awesome-4.7.0/scss/font-awesome.scss | |
| deleted: style.css | |
| no changes added to commit (use "git add" and/or "git commit -a") | |
| GAs-MacBook-Air:cell_phone_html_css ga$ git add . | |
| GAs-MacBook-Air:cell_phone_html_css ga$ git commit -m "commiting changes for all the css files I just moved" | |
| [master 13f1c8e] commiting changes for all the css files I just moved | |
| 38 files changed, 8873 deletions(-) | |
| delete mode 100644 font-awesome-4.7.0/HELP-US-OUT.txt | |
| delete mode 100644 font-awesome-4.7.0/css/font-awesome.css | |
| delete mode 100644 font-awesome-4.7.0/css/font-awesome.min.css | |
| delete mode 100644 font-awesome-4.7.0/fonts/FontAwesome.otf | |
| delete mode 100644 font-awesome-4.7.0/fonts/fontawesome-webfont.eot | |
| delete mode 100644 font-awesome-4.7.0/fonts/fontawesome-webfont.svg | |
| delete mode 100644 font-awesome-4.7.0/fonts/fontawesome-webfont.ttf | |
| delete mode 100644 font-awesome-4.7.0/fonts/fontawesome-webfont.woff | |
| delete mode 100644 font-awesome-4.7.0/fonts/fontawesome-webfont.woff2 | |
| delete mode 100644 font-awesome-4.7.0/less/animated.less | |
| delete mode 100644 font-awesome-4.7.0/less/bordered-pulled.less | |
| delete mode 100644 font-awesome-4.7.0/less/core.less | |
| delete mode 100644 font-awesome-4.7.0/less/fixed-width.less | |
| delete mode 100644 font-awesome-4.7.0/less/font-awesome.less | |
| delete mode 100644 font-awesome-4.7.0/less/icons.less | |
| delete mode 100644 font-awesome-4.7.0/less/larger.less | |
| delete mode 100644 font-awesome-4.7.0/less/list.less | |
| delete mode 100644 font-awesome-4.7.0/less/mixins.less | |
| delete mode 100644 font-awesome-4.7.0/less/path.less | |
| delete mode 100644 font-awesome-4.7.0/less/rotated-flipped.less | |
| delete mode 100644 font-awesome-4.7.0/less/screen-reader.less | |
| delete mode 100644 font-awesome-4.7.0/less/stacked.less | |
| delete mode 100644 font-awesome-4.7.0/less/variables.less | |
| delete mode 100644 font-awesome-4.7.0/scss/_animated.scss | |
| delete mode 100644 font-awesome-4.7.0/scss/_bordered-pulled.scss | |
| delete mode 100644 font-awesome-4.7.0/scss/_core.scss | |
| delete mode 100644 font-awesome-4.7.0/scss/_fixed-width.scss | |
| delete mode 100644 font-awesome-4.7.0/scss/_icons.scss | |
| delete mode 100644 font-awesome-4.7.0/scss/_larger.scss | |
| delete mode 100644 font-awesome-4.7.0/scss/_list.scss | |
| delete mode 100644 font-awesome-4.7.0/scss/_mixins.scss | |
| delete mode 100644 font-awesome-4.7.0/scss/_path.scss | |
| delete mode 100644 font-awesome-4.7.0/scss/_rotated-flipped.scss | |
| delete mode 100644 font-awesome-4.7.0/scss/_screen-reader.scss | |
| delete mode 100644 font-awesome-4.7.0/scss/_stacked.scss | |
| delete mode 100644 font-awesome-4.7.0/scss/_variables.scss | |
| delete mode 100644 font-awesome-4.7.0/scss/font-awesome.scss | |
| delete mode 100644 style.css | |
| GAs-MacBook-Air:cell_phone_html_css ga$ git status | |
| On branch master | |
| Your branch is ahead of 'origin/master' by 5 commits. | |
| (use "git push" to publish your local commits) | |
| nothing to commit, working tree clean | |
| GAs-MacBook-Air:cell_phone_html_css ga$ git status | |
| On branch master | |
| Your branch is ahead of 'origin/master' by 5 commits. | |
| (use "git push" to publish your local commits) | |
| Changes not staged for commit: | |
| (use "git add <file>..." to update what will be committed) | |
| (use "git checkout -- <file>..." to discard changes in working directory) | |
| modified: css/style.css | |
| no changes added to commit (use "git add" and/or "git commit -a") | |
| GAs-MacBook-Air:cell_phone_html_css ga$ git add css/style.css | |
| GAs-MacBook-Air:cell_phone_html_css ga$ git commit -m "added styles for border-notches. That should be everything. The only thing I might want to do now is add comments to the css, and see if there's any way I can refactor." | |
| [master ec6eb70] added styles for border-notches. That should be everything. The only thing I might want to do now is add comments to the css, and see if there's any way I can refactor. | |
| 1 file changed, 27 insertions(+) | |
| GAs-MacBook-Air:cell_phone_html_css ga$ git push | |
| Counting objects: 19, done. | |
| Delta compression using up to 4 threads. | |
| Compressing objects: 100% (19/19), done. | |
| Writing objects: 100% (19/19), 3.91 KiB | 1.30 MiB/s, done. | |
| Total 19 (delta 10), reused 0 (delta 0) | |
| remote: Resolving deltas: 100% (10/10), completed with 3 local objects. | |
| To https://git.generalassemb.ly/tomatohammado/cell_phone_html_css.git | |
| 3f3d2c5..ec6eb70 master -> master | |
| GAs-MacBook-Air:cell_phone_html_css ga$ git status | |
| On branch master | |
| Your branch is up to date with 'origin/master'. | |
| Changes not staged for commit: | |
| (use "git add <file>..." to update what will be committed) | |
| (use "git checkout -- <file>..." to discard changes in working directory) | |
| modified: css/style.css | |
| no changes added to commit (use "git add" and/or "git commit -a") | |
| GAs-MacBook-Air:cell_phone_html_css ga$ git status | |
| On branch master | |
| Your branch is up to date with 'origin/master'. | |
| Changes not staged for commit: | |
| (use "git add <file>..." to update what will be committed) | |
| (use "git checkout -- <file>..." to discard changes in working directory) | |
| modified: css/style.css | |
| no changes added to commit (use "git add" and/or "git commit -a") | |
| GAs-MacBook-Air:cell_phone_html_css ga$ git add . | |
| GAs-MacBook-Air:cell_phone_html_css ga$ git commit -m "rearranged properties, but width before height because that's how screens are measured W x D. Added indentation for related selectors. After this commit, I'll add some comments for better organizational clarity." | |
| [master d88fa00] rearranged properties, but width before height because that's how screens are measured W x D. Added indentation for related selectors. After this commit, I'll add some comments for better organizational clarity. | |
| 1 file changed, 112 insertions(+), 111 deletions(-) | |
| GAs-MacBook-Air:cell_phone_html_css ga$ git status | |
| On branch master | |
| Your branch is ahead of 'origin/master' by 1 commit. | |
| (use "git push" to publish your local commits) | |
| Changes not staged for commit: | |
| (use "git add <file>..." to update what will be committed) | |
| (use "git checkout -- <file>..." to discard changes in working directory) | |
| modified: css/style.css | |
| no changes added to commit (use "git add" and/or "git commit -a") | |
| GAs-MacBook-Air:cell_phone_html_css ga$ git commit css/style.css | |
| Aborting commit due to empty commit message. | |
| GAs-MacBook-Air:cell_phone_html_css ga$ git add css/style.css | |
| GAs-MacBook-Air:cell_phone_html_css ga$ git status | |
| On branch master | |
| Your branch is ahead of 'origin/master' by 1 commit. | |
| (use "git push" to publish your local commits) | |
| Changes to be committed: | |
| (use "git reset HEAD <file>..." to unstage) | |
| modified: css/style.css | |
| GAs-MacBook-Air:cell_phone_html_css ga$ git commit -m "added comments to stylesheet. Alright, that should be it." | |
| [master 57acc8c] added comments to stylesheet. Alright, that should be it. | |
| 1 file changed, 30 insertions(+), 15 deletions(-) | |
| GAs-MacBook-Air:cell_phone_html_css ga$ git push | |
| Counting objects: 8, done. | |
| Delta compression using up to 4 threads. | |
| Compressing objects: 100% (8/8), done. | |
| Writing objects: 100% (8/8), 1.83 KiB | 1.83 MiB/s, done. | |
| Total 8 (delta 4), reused 0 (delta 0) | |
| remote: Resolving deltas: 100% (4/4), completed with 2 local objects. | |
| To https://git.generalassemb.ly/tomatohammado/cell_phone_html_css.git | |
| ec6eb70..57acc8c master -> master | |
| GAs-MacBook-Air:cell_phone_html_css ga$ git status | |
| On branch master | |
| Your branch is up to date with 'origin/master'. | |
| nothing to commit, working tree clean | |
| GAs-MacBook-Air:cell_phone_html_css ga$ git checkout -b update1-css-html-iphone | |
| Switched to a new branch 'update1-css-html-iphone' | |
| GAs-MacBook-Air:cell_phone_html_css ga$ git status | |
| On branch update1-css-html-iphone | |
| nothing to commit, working tree clean | |
| GAs-MacBook-Air:cell_phone_html_css ga$ git push | |
| fatal: The current branch update1-css-html-iphone has no upstream branch. | |
| To push the current branch and set the remote as upstream, use | |
| git push --set-upstream origin update1-css-html-iphone | |
| GAs-MacBook-Air:cell_phone_html_css ga$ git push --set-upstream origin update1-css-html-iphone | |
| Total 0 (delta 0), reused 0 (delta 0) | |
| To https://git.generalassemb.ly/tomatohammado/cell_phone_html_css.git | |
| * [new branch] update1-css-html-iphone -> update1-css-html-iphone | |
| Branch 'update1-css-html-iphone' set up to track remote branch 'update1-css-html-iphone' from 'origin'. | |
| GAs-MacBook-Air:cell_phone_html_css ga$ git checkout master | |
| Switched to branch 'master' | |
| Your branch is up to date with 'origin/master'. | |
| GAs-MacBook-Air:cell_phone_html_css ga$ git status | |
| On branch master | |
| Your branch is up to date with 'origin/master'. | |
| nothing to commit, working tree clean | |
| GAs-MacBook-Air:cell_phone_html_css ga$ |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment