Vestibule Week 1 Day 5: updates to yesterdays lab

gistfile1.txt

Last login: Wed Nov 15 09:07:20 on ttys000
GAs-MacBook-Air:~ ga$ cd ga-wdi/
GAs-MacBook-Air:ga-wdi ga$ ls
fundamentals	sandbox
GAs-MacBook-Air:ga-wdi ga$ cd ..
GAs-MacBook-Air:~ ga$ ls
Applications	Documents	Dropbox		Movies		Pictures	ga-wdi
Desktop		Downloads	Library		Music		Public		test
GAs-MacBook-Air:~ ga$ ls test/
git_test	shelley
GAs-MacBook-Air:~ ga$ code test/git_test/
GAs-MacBook-Air:~ ga$ mv test/ ga-wdi/
GAs-MacBook-Air:~ ga$ ls
Applications	Documents	Dropbox		Movies		Pictures	ga-wdi
Desktop		Downloads	Library		Music		Public
GAs-MacBook-Air:~ ga$ cd ga-wdi/
GAs-MacBook-Air:ga-wdi ga$ ls
fundamentals	sandbox		test
GAs-MacBook-Air:ga-wdi ga$ mv test/ sandbox/
GAs-MacBook-Air:ga-wdi ga$ ls
fundamentals	sandbox
GAs-MacBook-Air:ga-wdi ga$ ;s sandbox/
-bash: syntax error near unexpected token `;'
GAs-MacBook-Air:ga-wdi ga$ ls sandbox/
css-test			test
html-intro-test			week1_day3_layout_exercise
GAs-MacBook-Air:ga-wdi ga$ mv sandbox/test/ sandbox/vestibule_day1_test/
GAs-MacBook-Air:ga-wdi ga$ ls sandbox/
css-test			vestibule_day1_test
html-intro-test			week1_day3_layout_exercise
GAs-MacBook-Air:ga-wdi ga$ ls fundamentals/
World				github_resume			wdi-fundamentals-memorygame
cell_phone_html_css		thinking_like_a_programmer
GAs-MacBook-Air:ga-wdi ga$ code fundamentals/cell_phone_html_css/
GAs-MacBook-Air:ga-wdi ga$ open fundamentals/cell_phone_html_css/
GAs-MacBook-Air:ga-wdi ga$ cd fundamentals/cell_phone_html_css/
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 values for `<img>` alt tags."
-bash: command substitution: line 1: syntax error near unexpected token `newline'
-bash: command substitution: line 1: `<img>'
[master f291969] added values for  alt tags.
 1 file changed, 11 insertions(+), 11 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), 458 bytes | 458.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
   57acc8c..f291969  master -> master
GAs-MacBook-Air:cell_phone_html_css ga$ git branch
* master
  update1-css-html-iphone
GAs-MacBook-Air:cell_phone_html_css ga$ git checkout update1-css-html-iphone
Switched to branch 'update1-css-html-iphone'
Your branch is up to date with 'origin/update1-css-html-iphone'.
GAs-MacBook-Air:cell_phone_html_css ga$ git merge master
Updating 57acc8c..f291969
Fast-forward
 index.html | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)
GAs-MacBook-Air:cell_phone_html_css ga$ git status
On branch update1-css-html-iphone
Your branch is ahead of 'origin/update1-css-html-iphone' by 1 commit.
  (use "git push" to publish your local commits)

nothing to commit, working tree clean
GAs-MacBook-Air:cell_phone_html_css ga$ git push
Total 0 (delta 0), reused 0 (delta 0)
To https://git.generalassemb.ly/tomatohammado/cell_phone_html_css.git
   57acc8c..f291969  update1-css-html-iphone -> update1-css-html-iphone
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$ cd ~/
GAs-MacBook-Air:~ ga$ code ga-wdi/fundamentals/cell_phone_html_css/
GAs-MacBook-Air:~ ga$ git status
fatal: Not a git repository (or any of the parent directories): .git
GAs-MacBook-Air:~ ga$ cd ga-wdi/fundamentals/cell_phone_html_css/
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 checkout -- index.html 
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 -- index.html 
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:   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 "noticed the border-notches were 1px less wide than the .phone-body border, so I fixed the widths and the positioning offsets."
[master 3bc8ffd] noticed the border-notches were 1px less wide than the .phone-body border, so I fixed the widths and the positioning offsets.
 1 file changed, 5 insertions(+), 5 deletions(-)
GAs-MacBook-Air:cell_phone_html_css ga$ git push
gCounting objects: 4, done.
Delta compression using up to 4 threads.
Compressing objects: 100% (4/4), done.
Writing objects: 100% (4/4), 505 bytes | 505.00 KiB/s, done.
Total 4 (delta 2), reused 0 (delta 0)
remote: Resolving deltas: 100% (2/2), completed with 2 local objects.
^R
To https://git.generalassemb.ly/tomatohammado/cell_phone_html_css.git
   f291969..3bc8ffd  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 "replaced generic `<div>`s with semantic tags. Doesn't look like I broke anything."
-bash: command substitution: line 1: syntax error near unexpected token `newline'
-bash: command substitution: line 1: `<div>'
[master 3de5031] replaced generic s with semantic tags. Doesn't look like I broke anything.
 1 file changed, 17 insertions(+), 17 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), 450 bytes | 450.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
   3bc8ffd..3de5031  master -> master
GAs-MacBook-Air:cell_phone_html_css ga$ git branch
* master
  update1-css-html-iphone
GAs-MacBook-Air:cell_phone_html_css ga$ git checkout update1-css-html-iphone
Switched to branch 'update1-css-html-iphone'
Your branch is up to date with 'origin/update1-css-html-iphone'.
GAs-MacBook-Air:cell_phone_html_css ga$ git merge master
Updating f291969..3de5031
Fast-forward
 css/style.css | 10 +++++-----
 index.html    | 34 +++++++++++++++++-----------------
 2 files changed, 22 insertions(+), 22 deletions(-)
GAs-MacBook-Air:cell_phone_html_css ga$ git push
Total 0 (delta 0), reused 0 (delta 0)
To https://git.generalassemb.ly/tomatohammado/cell_phone_html_css.git
   f291969..3de5031  update1-css-html-iphone -> update1-css-html-iphone
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$ 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 "so the embedded image credit code from unsplash.com caused a syntax warning in visual studio code. It didn't like the html entities for the quotes in the inline style attribute for the font-family. So I replaced the html entities with single quotes, which gets rid of the warning and doesn't seem to break anything."
[master 0666d9f] so the embedded image credit code from unsplash.com caused a syntax warning in visual studio code. It didn't like the html entities for the quotes in the inline style attribute for the font-family. So I replaced the html entities with single quotes, which gets rid of the warning and doesn't seem to break anything.
 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), 516 bytes | 516.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
   3de5031..0666d9f  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 branch
* master
  update1-css-html-iphone
GAs-MacBook-Air:cell_phone_html_css ga$ git checkout update1-css-html-iphone
Switched to branch 'update1-css-html-iphone'
Your branch is up to date with 'origin/update1-css-html-iphone'.
GAs-MacBook-Air:cell_phone_html_css ga$ git merge master
Updating 3de5031..0666d9f
Fast-forward
 index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
GAs-MacBook-Air:cell_phone_html_css ga$ git push
Total 0 (delta 0), reused 0 (delta 0)
To https://git.generalassemb.ly/tomatohammado/cell_phone_html_css.git
   3de5031..0666d9f  update1-css-html-iphone -> update1-css-html-iphone
GAs-MacBook-Air:cell_phone_html_css ga$ git status
On branch update1-css-html-iphone
Your branch is up to date with 'origin/update1-css-html-iphone'.

nothing to commit, working tree clean
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$