diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index 31b7ee7..58f0f9c 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -15,15 +15,15 @@ TITLE: Include your section in the pull request title - [ ] Wednesday - [ ] Thursday - [ ] Friday 3pm -- [ ] Friday 6pm +- [x] Friday 6pm **Is the solution complete?** -[Yes/No] +[Yes] **Did you run into any problems?** -[Describe...] +[No] **Did you collaborate with others on this solution?** diff --git a/alternating.html b/alternating.html index a3f5035..1a8511a 100644 --- a/alternating.html +++ b/alternating.html @@ -4,27 +4,60 @@ Cookie Store +
-

Our Cookies

-

Checkout our latest and delicious cookies.

+ +
+

Our Cookies

+

Checkout our latest and delicious cookies.

+
-

Mint Chocolate

-

Tasty mint chocolate cookies

- A single mint chocolate cookie +
-

Peanut Butter

-

Yummy peanut buttery goodness

- A single peanut butter cookie +
+
+

Mint Chocolate

+

Tasty mint chocolate cookies

+
+
+ A single mint chocolate cookie +
+
-

Oatmeal

-

Your fitness instructors favorite

- A single oatmeal cookie +
+
+

Peanut Butter

+

Yummy peanut buttery goodness

+
+
+ A single peanut butter cookie +
+
+ +
+
+

Oatmeal

+

Your fitness instructors favorite

+
+
+ A single oatmeal cookie +
+
+ +
+
+

Chocolate Chip

+

Gooey chocolate you'll love

+
+
+ A single chocolate chip cookie +
+
+ +
-

Chocolate Chip

-

Gooey chocolate you'll love

- A single chocolate chip cookie
diff --git a/css/styles.css b/css/styles.css index 3c3f2b6..6c11443 100644 --- a/css/styles.css +++ b/css/styles.css @@ -1 +1,54 @@ /* Add custom css styles here */ +body.center { + text-align: center; +} + +main { + margin: 50px auto; +} + +header { + height: 400px; + background-size: cover; + background-image: url('./../images/coffee-biscuits.jpg'); + +} + +.in-header { + background-color: rgba(0, 0, 0, 50%); + border-radius: 20px; + color: rgb(200, 200, 200); + display: inline-block; + padding: 10px; + margin-top: 125px; +} + +.in-header h1 { + font-weight: 350; +} + +.in-header p { + font-size: 20px; + font-weight: 350; +} + +.img-fluid { + border-radius: 100%; +} + +.about-us { + background-color: rgb(240, 240, 240); + padding: 30px; +} + +.baker { + height: 100px; + float: left; + border-radius: 100%; +} + +footer { + background-color: rgb(60, 112, 255); + padding: 40px; + color: white; +} \ No newline at end of file diff --git a/index.html b/index.html index eae824d..0b2f85b 100644 --- a/index.html +++ b/index.html @@ -4,53 +4,87 @@ Cookie Store + + -
-

Cookie Store

-

Buy our awesome cookies. All proceeds go to charity!

+
+
+

Cookie Store

+

Buy our awesome cookies. All proceeds go to charity!

+
-

Our Cookies

-

Checkout our latest and delicious cookies.

- -

Mint Chocolate

-

Tasty mint chocolate cookies

- A single mint chocolate cookie - -

Peanut Butter

-

Yummy peanut buttery goodness

- A single peanut butter cookie +
+

Our Cookies

+

Checkout our latest and delicious cookies.

+
-

Oatmeal

-

Your fitness instructors favorite

- A single oatmeal cookie +
+
+
+

Mint Chocolate

+

Tasty mint chocolate cookies

+ A single mint chocolate cookie +
+
+

Peanut Butter

+

Yummy peanut buttery goodness

+ A single peanut butter cookie +
+
+

Oatmeal

+

Your fitness instructors favorite

+ A single oatmeal cookie +
+
+

Chocolate Chip

+

Gooey chocolate you'll love

+ A single chocolate chip cookie +
+
+
-

Chocolate Chip

-

Gooey chocolate you'll love

- A single chocolate chip cookie
-
-

About us

- - illustrations of two people baking + +
- Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod - tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim - veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea - commodo consequat. Duis aute irure dolor in reprehenderit in voluptate - velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint - occaecat cupidatat non proident, sunt in culpa qui officia deserunt - mollit anim id est laborum. +

About us

+
+
+ illustrations of two people baking +
+
+ Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod + tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim + veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea + commodo consequat. Duis aute irure dolor in reprehenderit in voluptate + velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint + occaecat cupidatat non proident, sunt in culpa qui officia deserunt + mollit anim id est laborum. +
+
+