diff --git a/README.md b/README.md index 3dd94a43..4326663c 100644 --- a/README.md +++ b/README.md @@ -12,98 +12,102 @@ Don't worry about being pixel perfect, and don't worry if your code doesn't matc ## Step 1 -* Open `level-1/index.html` && `level-1/step-1.css` && `level-1/step-1.jpg`. -* Locate the element with the class of `content-left`. +* Open `level-1/index.html` && `level-1/step-1/step-1-level-1.css` && `level-1/step-1/step-1-level-1.png`. +* Select the element with the class of `content-left`. * Position this element to the left side of the screen. -* Locate the element with the class of `content-mid`. +* Select the element with the class of `content-mid`. * Position this element to appear just to the right of `content-left` and take up the remaining space. -* Locate the element with the class of `footer`. +* Select the element with the class of `footer`. * Position this element to appear at the bottom of the page. ## Step 2 -* Open `level-1/index.html` && `level-1/step-2.css` && `level-1/step-2.jpg`. -* Locate the element with the class of `content-left`. +* Open `level-1/index.html` && `level-1/step-2/step-2-level-1.css` && `level-1/step-2/step-2-level-1.jpg`. +* Select the element with the class of `content-left`. * Add padding of 20 pixels on the top, left, right, and bottom. -* Locate the element with the class of `header`. +* Select the element with the class of `header`. * Add padding of 20 pixels on the top, left, right, and bottom. -* Locate the element with the class of `profile-image-container`. +* Select the element with the class of `profile-image-container`. * Assign a width, height, and margin-bottom. -* Locate the element with the class of `profile-links-container`. +* Select the element with the class of `profile-links-container`. * Assign a width and height. -* Locate the element with the class of `logo-container`. +* Select the element with the class of `logo-container`. * Assign a width, height, and float. -* Locate the element with the class of `menu-container`. +* Select the element with the class of `menu-container`. * Assign a width, height, and float. ## Step 3 -* Open `level-1/index.html` && `level-1/step-3.css` && `level-1/step-3.jpg`. -* Locate the element with the class of `content-mid`. +* Open `level-1/index.html` && `level-1/step-3/step-3-level-1.css` && `level-1/step-3/step-3-level-1.jpg`. +* Select the element with the class of `content-mid`. * Add padding of 80 pixels on the top, left, right, and bottom. -* Locate the element with the class of `content-mid-header`. +* Select the element with the class of `content-mid-header`. * Assign a width and height. -* Locate the element with the class of `content-container`. +* Select the element with the class of `content-container`. * Assign a width and height. -* Locate the element with the class of `content`. +* Select the element with the class of `content`. * Add padding of 20 pixels on the top, left, right, and bottom. * Assign a width, height, and text-align. +* Locate the element with the class of `content` in the html. * Add some random text inside the `div`. # Level 2 ## Step 1 -* Open `level-2/index.html` && `level-2/step-1.css` && `level-1/step-1.jpg`. -* Locate the element with the class of `menu`, `logo` and `sign-in`. +* Open `level-2/index.html` && `level-2/step-1/step-1-level-2.css` && `level-2/step-1/step-1-level-2.jpg`. +* Select the elements with the class of `menu`, `logo` and `sign-in`. * Assign a display that will allow these elements to appear on the same line. -* Locate the element with the class of `menu`. +* Select the element with the class of `menu`. * Assign a position, left, and top. -* Locate the element with the class of `sign-in`. +* Select the element with the class of `sign-in`. * Assign a position, right, and top. +* Select the element with the class of `bottom-container` + * Assign a position and bottom. ## Step 2 -* Open `level-2/index.html` && `level-2/step-2.css` && `level-2/step-2.jgp`. -* Locate the element with the class of `main-bottom-section`. +* Open `level-2/index.html` && `level-2/step-2/step-2-level-2.css` && `level-2/step-2/step-2-level-2.jpg`. +* Select the element with the class of `main-bottom-section`. * Add a text-align. -* Locate the element with the class of `item`. +* Select the element with the class of `item`. * Add a width, height, and display. -* Locate the element with the class of `full-width-item`. +* Select the element with the class of `full-width-item`. * Add a width, height, and margin. -* Locate the element with the class of `large-item`. +* Select the element with the class of `large-item`. * Add a width, height, and margin. # Level 3 ## Step 1 -* Open `level-3/index.html` && `level-3/step-1.css` && `level-3/step-1.css`. -* Locate the element with the class of `main-top-section`. +* Open `level-3/index.html` && `level-3/step-1/step-1-level-3.css` && `level-3/step-1/step-1-level-3.jpg`. +* Select the element with the class of `main-top-section`. * Add a background color of `#F2EFE5`. -* Locate the element with the class of `menu-icon`. - * Link the src path to `level-3/img/icons/MENU`. -* Locate the element with the class of `logo-icon`. - * Link the src path to `level-3/img/icons/dev-shop`. -* Locate the element with the class of `sign-in`. - * Link the src path to `level-3/img/icons/Sign_In`. -* Locate the element with the class of `shop-icon`. - * Link the src path to `level-3/img/icons/Shop_Deals`. +* Locate the element with the class of `menu-icon` in the html. + * Link the src path to `img/icons/MENU.png`. +* Locate the element with the class of `logo-icon` in the html. + * Link the src path to `img/icons/dev-shop.png`. +* Locate the element with the class of `sign-in` in the html. + * Link the src path to `img/icons/Sign_In.png`. +* Locate the element with the class of `shop-icon` in the html. + * Link the src path to `img/icons/Shop_Deals.png`. ## Step 2 -* Locate the element with the class of `item-image` and alt of `tops`. - * Link the src path to `level-3/img/Tops.png`. -* Locate the element with the class of `item-image` and alt of `bottoms`. - * Link the src path to `level-3/img/bottoms.png`. -* Locate the element with the class of `item-image` and alt of `accessories`. - * Link the src path to `level-3/img/accessories.png`. -* Locate the element with the class of `item-image` and alt of `collection`. - * Link the src path to `level-3/img/collection.png`. -* Locate the element with the class of `item-image` and alt of `kicks`. - * Link the src path to `level-3/img/kicks.png`. -* Locate the element with the class of `item-image` and alt of `hats`. - * Link the src path to `level-3/img/hats.png` +* Open `level-3/index.html` && `level-3/step-2/step-2-level-3.jpg`. +* Locate the element with the class of `item-image` and alt of `tops` in the html. + * Link the src path to `img/Tops.png`. +* Locate the element with the class of `item-image` and alt of `bottoms` in the html. + * Link the src path to `img/bottoms.png`. +* Locate the element with the class of `item-image` and alt of `accessories` in the html. + * Link the src path to `img/accessories.png`. +* Locate the element with the class of `item-image` and alt of `collection` in the html. + * Link the src path to `img/collection.png`. +* Locate the element with the class of `item-image` and alt of `kicks` in the html. + * Link the src path to `img/kicks.png`. +* Locate the element with the class of `item-image` and alt of `hats` in the html. + * Link the src path to `img/hats.png` ## Contributions diff --git a/base/base.css b/level-1/base.css similarity index 100% rename from base/base.css rename to level-1/base.css diff --git a/level-1/index.html b/level-1/index.html index 4de4033c..cdfa2849 100644 --- a/level-1/index.html +++ b/level-1/index.html @@ -4,16 +4,16 @@ level-1 - + - + - + - + diff --git a/level-1/solution/solution.html b/level-1/solution/solution-level-1.html similarity index 85% rename from level-1/solution/solution.html rename to level-1/solution/solution-level-1.html index a366dd01..a2fee894 100644 --- a/level-1/solution/solution.html +++ b/level-1/solution/solution-level-1.html @@ -4,16 +4,16 @@ level-1 - + - + - + - + diff --git a/level-1/solution/step-1.css b/level-1/solution/step-1-level-1-solution.css similarity index 96% rename from level-1/solution/step-1.css rename to level-1/solution/step-1-level-1-solution.css index f798f653..8b5b05bc 100644 --- a/level-1/solution/step-1.css +++ b/level-1/solution/step-1-level-1-solution.css @@ -28,7 +28,7 @@ .footer { width: 100%; height: 100px; - background: #3A3A3A; + background: #D8D8D8; position: absolute; bottom: 0; } diff --git a/level-1/solution/step-2.css b/level-1/solution/step-2-level-1-solution.css similarity index 100% rename from level-1/solution/step-2.css rename to level-1/solution/step-2-level-1-solution.css diff --git a/level-1/solution/step-3.css b/level-1/solution/step-3-level-1-solution.css similarity index 100% rename from level-1/solution/step-3.css rename to level-1/solution/step-3-level-1-solution.css diff --git a/level-1/step-1/step-1.css b/level-1/step-1/step-1-level-1.css old mode 100755 new mode 100644 similarity index 96% rename from level-1/step-1/step-1.css rename to level-1/step-1/step-1-level-1.css index 571198df..ad3a4f6f --- a/level-1/step-1/step-1.css +++ b/level-1/step-1/step-1-level-1.css @@ -28,5 +28,5 @@ .footer { width: 100%; height: 100px; - background: #3A3A3A; + background: #D8D8D8; } \ No newline at end of file diff --git a/level-1/step-1/step-1-level-1.png b/level-1/step-1/step-1-level-1.png new file mode 100644 index 00000000..0f15aeef Binary files /dev/null and b/level-1/step-1/step-1-level-1.png differ diff --git a/level-1/step-1/step-1.jpg b/level-1/step-1/step-1.jpg deleted file mode 100644 index 016edbe3..00000000 Binary files a/level-1/step-1/step-1.jpg and /dev/null differ diff --git a/level-1/step-2/step-2.css b/level-1/step-2/step-2-level-1.css similarity index 100% rename from level-1/step-2/step-2.css rename to level-1/step-2/step-2-level-1.css diff --git a/level-1/step-2/step-2.jpg b/level-1/step-2/step-2-level-1.jpg similarity index 100% rename from level-1/step-2/step-2.jpg rename to level-1/step-2/step-2-level-1.jpg diff --git a/level-1/step-3/step-3.css b/level-1/step-3/step-3-level-1.css old mode 100755 new mode 100644 similarity index 100% rename from level-1/step-3/step-3.css rename to level-1/step-3/step-3-level-1.css diff --git a/level-1/step-3/step-3.jpg b/level-1/step-3/step-3-level-1.jpg similarity index 100% rename from level-1/step-3/step-3.jpg rename to level-1/step-3/step-3-level-1.jpg diff --git a/level-2/base.css b/level-2/base.css new file mode 100644 index 00000000..579b4383 --- /dev/null +++ b/level-2/base.css @@ -0,0 +1,55 @@ +/* DO NOT CHANGE THESE */ +/* DO NOT CHANGE THESE */ +/* DO NOT CHANGE THESE */ +/* DO NOT CHANGE THESE */ +/* DO NOT CHANGE THESE */ +/* DO NOT CHANGE THESE */ +/* DO NOT CHANGE THESE */ +/* DO NOT CHANGE THESE */ + +html, body, div, span, applet, object, iframe, +h1, h2, h3, h4, h5, h6, p, blockquote, pre, +a, abbr, acronym, address, big, cite, code, +del, dfn, em, img, ins, kbd, q, s, samp, +small, strike, strong, sub, sup, tt, var, +b, u, i, center, +dl, dt, dd, ol, ul, li, +fieldset, form, label, legend, +table, caption, tbody, tfoot, thead, tr, th, td, +article, aside, canvas, details, embed, +figure, figcaption, footer, header, hgroup, +menu, nav, output, ruby, section, summary, +time, mark, audio, video { + margin: 0; + padding: 0; + border: 0; + font-size: 100%; + font: inherit; + vertical-align: baseline; + box-sizing: border-box; +} + + +/* HTML5 display-role reset for older browsers */ +article, aside, details, figcaption, figure, +footer, header, hgroup, menu, nav, section { + display: block; +} +body { + line-height: 1; +} +ol, ul { + list-style: none; +} +blockquote, q { + quotes: none; +} +blockquote:before, blockquote:after, +q:before, q:after { + content: ''; + content: none; +} +table { + border-collapse: collapse; + border-spacing: 0; +} \ No newline at end of file diff --git a/level-2/index.html b/level-2/index.html index 7273d7fe..78246288 100644 --- a/level-2/index.html +++ b/level-2/index.html @@ -4,14 +4,14 @@ level-2 - + - + - + diff --git a/level-2/solution/solution.html b/level-2/solution/solution-level-2.html similarity index 83% rename from level-2/solution/solution.html rename to level-2/solution/solution-level-2.html index 4f42c02e..96aa808f 100644 --- a/level-2/solution/solution.html +++ b/level-2/solution/solution-level-2.html @@ -4,13 +4,13 @@ level-2 - + - + - + diff --git a/level-2/solution/step-1.css b/level-2/solution/step-1-level-2-solution.css similarity index 100% rename from level-2/solution/step-1.css rename to level-2/solution/step-1-level-2-solution.css diff --git a/level-2/solution/step-2.css b/level-2/solution/step-2-level-2-solution.css similarity index 100% rename from level-2/solution/step-2.css rename to level-2/solution/step-2-level-2-solution.css diff --git a/level-2/step-1/step-1.css b/level-2/step-1/step-1-level-2.css old mode 100755 new mode 100644 similarity index 100% rename from level-2/step-1/step-1.css rename to level-2/step-1/step-1-level-2.css diff --git a/level-2/step-1/step-1.jpg b/level-2/step-1/step-1-level-2.jpg similarity index 100% rename from level-2/step-1/step-1.jpg rename to level-2/step-1/step-1-level-2.jpg diff --git a/level-2/step-2/step-2.css b/level-2/step-2/step-2-level-2.css old mode 100755 new mode 100644 similarity index 94% rename from level-2/step-2/step-2.css rename to level-2/step-2/step-2-level-2.css index eec2909b..37f23b44 --- a/level-2/step-2/step-2.css +++ b/level-2/step-2/step-2-level-2.css @@ -11,7 +11,6 @@ /*display*/ margin: 0 20px 30px; background: #DED6D3; - margin-bottom: 30px; } /* Step-2 Add a width, height, and margin property to make these containers look like the design. Remember margin: auto is helpful when trying to center a container. */ @@ -19,7 +18,6 @@ /*width*/ /*height*/ /*margin*/ - margin:0 auto 30px; background: #DED6D3; } diff --git a/level-2/step-2/step-2.jpg b/level-2/step-2/step-2-level-2.jpg similarity index 100% rename from level-2/step-2/step-2.jpg rename to level-2/step-2/step-2-level-2.jpg diff --git a/level-3/base.css b/level-3/base.css new file mode 100644 index 00000000..579b4383 --- /dev/null +++ b/level-3/base.css @@ -0,0 +1,55 @@ +/* DO NOT CHANGE THESE */ +/* DO NOT CHANGE THESE */ +/* DO NOT CHANGE THESE */ +/* DO NOT CHANGE THESE */ +/* DO NOT CHANGE THESE */ +/* DO NOT CHANGE THESE */ +/* DO NOT CHANGE THESE */ +/* DO NOT CHANGE THESE */ + +html, body, div, span, applet, object, iframe, +h1, h2, h3, h4, h5, h6, p, blockquote, pre, +a, abbr, acronym, address, big, cite, code, +del, dfn, em, img, ins, kbd, q, s, samp, +small, strike, strong, sub, sup, tt, var, +b, u, i, center, +dl, dt, dd, ol, ul, li, +fieldset, form, label, legend, +table, caption, tbody, tfoot, thead, tr, th, td, +article, aside, canvas, details, embed, +figure, figcaption, footer, header, hgroup, +menu, nav, output, ruby, section, summary, +time, mark, audio, video { + margin: 0; + padding: 0; + border: 0; + font-size: 100%; + font: inherit; + vertical-align: baseline; + box-sizing: border-box; +} + + +/* HTML5 display-role reset for older browsers */ +article, aside, details, figcaption, figure, +footer, header, hgroup, menu, nav, section { + display: block; +} +body { + line-height: 1; +} +ol, ul { + list-style: none; +} +blockquote, q { + quotes: none; +} +blockquote:before, blockquote:after, +q:before, q:after { + content: ''; + content: none; +} +table { + border-collapse: collapse; + border-spacing: 0; +} \ No newline at end of file diff --git a/level-3/index.html b/level-3/index.html index 88c23fe4..4421b091 100755 --- a/level-3/index.html +++ b/level-3/index.html @@ -4,13 +4,13 @@ level-3 - + - + - + @@ -20,21 +20,21 @@
- +
- shop icon + shop icon
diff --git a/level-3/solution/solution.html b/level-3/solution/solution-level-3.html similarity index 91% rename from level-3/solution/solution.html rename to level-3/solution/solution-level-3.html index cde5bc7c..fd8d8154 100644 --- a/level-3/solution/solution.html +++ b/level-3/solution/solution-level-3.html @@ -4,13 +4,13 @@ level-3 - + - + - + diff --git a/level-3/solution/step-1.css b/level-3/solution/step-1-level-3-solution.css similarity index 100% rename from level-3/solution/step-1.css rename to level-3/solution/step-1-level-3-solution.css diff --git a/level-3/solution/step-2.css b/level-3/solution/step-2-level-3-solution.css similarity index 100% rename from level-3/solution/step-2.css rename to level-3/solution/step-2-level-3-solution.css diff --git a/level-3/step-1/step-1.css b/level-3/step-1/step-1-level-3.css similarity index 100% rename from level-3/step-1/step-1.css rename to level-3/step-1/step-1-level-3.css diff --git a/level-3/step-1/step-1.png b/level-3/step-1/step-1-level-3.png similarity index 100% rename from level-3/step-1/step-1.png rename to level-3/step-1/step-1-level-3.png diff --git a/level-3/step-2/step-2.css b/level-3/step-2/step-2-level-3.css similarity index 100% rename from level-3/step-2/step-2.css rename to level-3/step-2/step-2-level-3.css diff --git a/level-3/step-2/step-2.png b/level-3/step-2/step-2-level-3.png similarity index 100% rename from level-3/step-2/step-2.png rename to level-3/step-2/step-2-level-3.png