diff --git a/step1-00/assets/fabric.jpg b/assets/fabric.jpg similarity index 100% rename from step1-00/assets/fabric.jpg rename to assets/fabric.jpg diff --git a/assets/todo_screenshot.jpg b/assets/todo_screenshot.jpg new file mode 100644 index 0000000..cf85ea5 Binary files /dev/null and b/assets/todo_screenshot.jpg differ diff --git a/docs/step1-00/css-demo/css-demo-finished.html b/docs/step1-00/css-demo/css-demo-finished.html index ff34678..9f18134 100644 --- a/docs/step1-00/css-demo/css-demo-finished.html +++ b/docs/step1-00/css-demo/css-demo-finished.html @@ -14,7 +14,7 @@

Our Logo

- fabric logo + fabric logo

Contact Us

diff --git a/docs/step1-00/css-demo/css-demo.html b/docs/step1-00/css-demo/css-demo.html index 295440c..f1ea2c9 100644 --- a/docs/step1-00/css-demo/css-demo.html +++ b/docs/step1-00/css-demo/css-demo.html @@ -14,7 +14,7 @@

Our Logo

- fabric logo + fabric logo

Contact Us

diff --git a/docs/step1-00/js-demo/js-demo.html b/docs/step1-00/js-demo/js-demo.html index ce350c2..18b059f 100644 --- a/docs/step1-00/js-demo/js-demo.html +++ b/docs/step1-00/js-demo/js-demo.html @@ -12,7 +12,7 @@

Our Logo

- fabric logo + fabric logo

Contact Us

diff --git a/index.html b/index.html index 1e5cb66..9f3e489 100644 --- a/index.html +++ b/index.html @@ -16,22 +16,16 @@

Day 1

Setup, HTML, CSS, Javascript and Intro to React -
  • - - Step 0
    - HTML/CSS/JS -
    -
  • Step 1
    - Todo HTML + HTML/CSS/JS
  • Step 2
    - Todo CSS + Todo HTML & CSS
  • diff --git a/package-lock.json b/package-lock.json index d3f802a..ef2b86a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -3600,7 +3600,8 @@ "ansi-regex": { "version": "2.1.1", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "aproba": { "version": "1.2.0", @@ -3621,12 +3622,14 @@ "balanced-match": { "version": "1.0.0", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "brace-expansion": { "version": "1.1.11", "bundled": true, "dev": true, + "optional": true, "requires": { "balanced-match": "^1.0.0", "concat-map": "0.0.1" @@ -3641,17 +3644,20 @@ "code-point-at": { "version": "1.1.0", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "concat-map": { "version": "0.0.1", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "console-control-strings": { "version": "1.1.0", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "core-util-is": { "version": "1.0.2", @@ -3768,7 +3774,8 @@ "inherits": { "version": "2.0.3", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "ini": { "version": "1.3.5", @@ -3780,6 +3787,7 @@ "version": "1.0.0", "bundled": true, "dev": true, + "optional": true, "requires": { "number-is-nan": "^1.0.0" } @@ -3794,6 +3802,7 @@ "version": "3.0.4", "bundled": true, "dev": true, + "optional": true, "requires": { "brace-expansion": "^1.1.7" } @@ -3801,7 +3810,8 @@ "minimist": { "version": "0.0.8", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "minipass": { "version": "2.3.5", @@ -3905,7 +3915,8 @@ "number-is-nan": { "version": "1.0.1", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "object-assign": { "version": "4.1.1", @@ -4038,6 +4049,7 @@ "version": "1.0.2", "bundled": true, "dev": true, + "optional": true, "requires": { "code-point-at": "^1.0.0", "is-fullwidth-code-point": "^1.0.0", @@ -4057,6 +4069,7 @@ "version": "3.0.1", "bundled": true, "dev": true, + "optional": true, "requires": { "ansi-regex": "^2.0.0" } diff --git a/step1-00/css-demo/css-demo.css b/step1-00/css-demo/css-demo.css deleted file mode 100644 index e69de29..0000000 diff --git a/step1-00/index.html b/step1-00/index.html deleted file mode 100644 index 8e0bfb1..0000000 --- a/step1-00/index.html +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - - - diff --git a/step1-01/README.md b/step1-01/README.md new file mode 100644 index 0000000..3ce439b --- /dev/null +++ b/step1-01/README.md @@ -0,0 +1,23 @@ +## How the Web Works + +A simple web page is rendered on the screen via the following steps + +> There are many sub steps in this process +> but these are the highlights + +1. You instruct the browser which webpage you'd like to see +2. The browser looks up the site in a 'DNS Server' + - This is like a big phone book for website server addresses +3. The browser asks the server to send over a specific page of the website `developer.mozilla.org/filename.html` or `developer.mozilla.org` + - If asked for a 'root' level address, most servers will return `'root'/index.html` +4. The server sends the HTML file back to the browser +5. The browser starts to read the HTML file from the top to the bottom, \*stopping any time that additional resources are required + - CSS stylesheets + - JavaScript files + - Fonts + - Images +6. Browser makes requests for additional resources + - Those resources might request even more files +7. Once the browser gets to the bottom of the page it can start rendering, and then load the page + +![MDN Page Load](https://user-images.githubusercontent.com/1434956/53033758-9da8d580-3426-11e9-9ab8-09f42ccab9a8.png) diff --git a/step1-01/css-demo/README.md b/step1-01/css-demo/README.md new file mode 100644 index 0000000..3974435 --- /dev/null +++ b/step1-01/css-demo/README.md @@ -0,0 +1,127 @@ +## CSS Demo + +### CSS Properties + +Now that we've gone over adding HTML tags to the page, lets cover adding styles to those tags. We can do quite a lot with styles! We can change: + +- Typography +- Colors +- Appearance (Corners, Borders, Decorations) +- Layout +- Position +- Inline vs Block +- Animations +- and [many more](https://developer.mozilla.org/en-US/docs/Web/CSS/Reference) + +CSS is always applied in `property: value` pairs, like `background: blue;` and are terminated with a semi colon. + +### Applying CSS to an HTML file + +CSS can be applied to HTML tags in three different ways. + +1. Inline - Styles are applied directly to the HTML tag + +- `
    Hello
    ` + +2. Via a `