diff --git a/README.md b/README.md index c04b838..8118d85 100644 --- a/README.md +++ b/README.md @@ -1,11 +1,12 @@ Prework ======= -[Wikipedia on pair programming](http://en.wikipedia.org/wiki/Pair_programming) - #### Front End -[Guide to wireframing](http://webdesign.tutsplus.com/articles/a-beginners-guide-to-wireframing--webdesign-7399) +Do Code Academy's [HTML/CSS course](http://www.codecademy.com/en/tracks/web). + +[Guide to wireframing](http://webdesign.tutsplus.com/articles/a-beginners-guide-to-wireframing--webdesign-7399) + [A compilation of wireframing articles](http://www.gracesmith.co.uk/get-wireframing-the-all-in-one-guide/) #### JavaScript @@ -30,4 +31,9 @@ Prework [Python Cheatsheet](http://perso.limsi.fr/pointal/_media/python:cours:mementopython3-english.pdf) + +#### Miscellaneous + [Rubular (for regex)](http://www.rubular.com) + +[Wikipedia on pair programming](http://en.wikipedia.org/wiki/Pair_programming) diff --git a/front-end/1-basic-layout/day1.html b/front-end/1-basic-layout/day1.html deleted file mode 100644 index 6d62b04..0000000 --- a/front-end/1-basic-layout/day1.html +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/front-end/1-basic-layout/index.html b/front-end/1-basic-layout/index.html new file mode 100644 index 0000000..bc3503f --- /dev/null +++ b/front-end/1-basic-layout/index.html @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/front-end/1-basic-layout/day1.css b/front-end/1-basic-layout/main.css similarity index 86% rename from front-end/1-basic-layout/day1.css rename to front-end/1-basic-layout/main.css index 2196013..8eba01e 100644 --- a/front-end/1-basic-layout/day1.css +++ b/front-end/1-basic-layout/main.css @@ -1,23 +1,23 @@ -header{ +header { background-color: gray; height: 5em; width: 100%; } -nav{ +nav { height: 2em; background-color: red; width: 100%; } -.content{ +.content { height: 20em; width: 80%; background-color: blue; margin: 0 auto; } -.col{ +.col { width: 24%; height: 100%; float: left; @@ -25,12 +25,12 @@ nav{ margin-right: .9%; } -.col:nth-child(4){ +.col:nth-child(4) { border-right: none; margin-right: none; } -footer{ +footer { position: absolute; bottom: 0; height: 3em; @@ -38,4 +38,4 @@ footer{ width: 80%; left: 10%; -} \ No newline at end of file +}