diff --git a/lesson_06/NoahLCoding.html b/lesson_06/NoahLCoding.html new file mode 100644 index 0000000..f6ddd52 --- /dev/null +++ b/lesson_06/NoahLCoding.html @@ -0,0 +1,25 @@ + + + + + + + Noah's Page + + +
+
+ +

Home

 +

About

 +

Team

 +

Contact

 +
+
+

Welcome to my page

+

Highschool student who enjoys programming, volleyball, gaming and chilling at home.

+ The team Page +
+
+ + \ No newline at end of file diff --git a/lesson_06/team.html b/lesson_06/team.html index 4bb4728..0cd2aea 100644 --- a/lesson_06/team.html +++ b/lesson_06/team.html @@ -33,12 +33,14 @@

- - + +

Noah Latakas

+ +

Angel G

diff --git a/lesson_07/index.html b/lesson_07/index.html index 7eb0fd4..7ae030c 100644 --- a/lesson_07/index.html +++ b/lesson_07/index.html @@ -50,8 +50,8 @@

Index

$("#i_summary").attr("src","oak_summary.html"); }) $("#beech").click(function(){ - - + $("#i_content").attr("src","beech_content.html"); + $("#i_summary").attr("src","beech_summary.html"); }) /* This will not be merged ! */ diff --git a/lesson_07/pine_tree_content.html b/lesson_07/pine_tree_content.html new file mode 100644 index 0000000..4db5131 --- /dev/null +++ b/lesson_07/pine_tree_content.html @@ -0,0 +1,23 @@ + + +

Pine Tree

+ +

A pine is any conifer in the genus Pinus (/ˈpiːnuːs/)[1] of the family Pinaceae. Pinus is the sole genus in the subfamily Pinoideae. The Plant List compiled by the Royal Botanic Gardens, Kew and Missouri Botanical Garden accepts 126 species names of pines as current, together with 35 unresolved species and many more synonyms.

+ +

Pine may also refer to the lumber derived from pine trees; pine is one of the more extensively used types of wood used as lumber

\ No newline at end of file diff --git a/lesson_07/pine_tree_summary.html b/lesson_07/pine_tree_summary.html new file mode 100644 index 0000000..00cbcc9 --- /dev/null +++ b/lesson_07/pine_tree_summary.html @@ -0,0 +1,35 @@ + + + +

Pine Tree

+ +

Tree

+ + +

Family: genus Pinus of the family Pinaceae.

+ + diff --git a/lesson_08/img/banana.png b/lesson_08/img/banana.png new file mode 100644 index 0000000..004e4ce Binary files /dev/null and b/lesson_08/img/banana.png differ diff --git a/lesson_08/img/bg.jpg b/lesson_08/img/bg.jpg new file mode 100644 index 0000000..dd68767 Binary files /dev/null and b/lesson_08/img/bg.jpg differ diff --git a/lesson_08/img/chocolate.png b/lesson_08/img/chocolate.png new file mode 100644 index 0000000..a062a3c Binary files /dev/null and b/lesson_08/img/chocolate.png differ diff --git a/lesson_08/img/coconut.png b/lesson_08/img/coconut.png new file mode 100644 index 0000000..f42ad43 Binary files /dev/null and b/lesson_08/img/coconut.png differ diff --git a/lesson_08/img/grapefruit.png b/lesson_08/img/grapefruit.png new file mode 100644 index 0000000..888a90a Binary files /dev/null and b/lesson_08/img/grapefruit.png differ diff --git a/lesson_08/img/lemon.png b/lesson_08/img/lemon.png new file mode 100644 index 0000000..74d4aba Binary files /dev/null and b/lesson_08/img/lemon.png differ diff --git a/lesson_08/img/mango.png b/lesson_08/img/mango.png new file mode 100644 index 0000000..96a4745 Binary files /dev/null and b/lesson_08/img/mango.png differ diff --git a/lesson_08/img/orange.png b/lesson_08/img/orange.png new file mode 100644 index 0000000..185046f Binary files /dev/null and b/lesson_08/img/orange.png differ diff --git a/lesson_08/img/pistachio.png b/lesson_08/img/pistachio.png new file mode 100644 index 0000000..2731bc4 Binary files /dev/null and b/lesson_08/img/pistachio.png differ diff --git a/lesson_08/img/strawberry.png b/lesson_08/img/strawberry.png new file mode 100644 index 0000000..5ce5e4d Binary files /dev/null and b/lesson_08/img/strawberry.png differ diff --git a/lesson_08/img/vanilla.png b/lesson_08/img/vanilla.png new file mode 100644 index 0000000..430be22 Binary files /dev/null and b/lesson_08/img/vanilla.png differ diff --git a/lesson_08/index.html b/lesson_08/index.html index 08f4589..2b5e65b 100644 --- a/lesson_08/index.html +++ b/lesson_08/index.html @@ -8,20 +8,70 @@
-

Welcome to our ice cream store

+

Welcome to The Ice Cream Store

+

These are our flavors:

-

These are our flavors:

-

Vanilla

-

Chocolate

-

Banana

-

Mango

-

Coconut

-

Lemon

-

Grapefruit

-

Orange

-

Strawberry

-

Pistachio

+
+ + + Vanilla + +
+
+ + + Chocolate + +
+
+ + + Banana + +
+
+ + + Mango + +
+
+ + + Coconut + +
+
+ + + Lemon + +
+
+ + + Grapefruit + +
+
+ + + Orange + +
+
+ + + Strawberry + +
+
+ + + Pistachio + +
diff --git a/lesson_08/lemon.html b/lesson_08/lemon.html index 8478fe4..0b39c17 100644 --- a/lesson_08/lemon.html +++ b/lesson_08/lemon.html @@ -18,17 +18,17 @@

Lemon

- - India + - + diff --git a/lesson_08/mango.html b/lesson_08/mango.html index fd50cee..4c907b0 100644 --- a/lesson_08/mango.html +++ b/lesson_08/mango.html @@ -11,8 +11,8 @@
-

- +

Mango

+
Our mango ice cream is very fresh tasting and has a nice, appealing orange color. We use fresh mangos for our mango ice cream. @@ -27,7 +27,7 @@

  • Pakistan
    • - + diff --git a/lesson_08/style.css b/lesson_08/style.css index 6a91a07..09cd848 100644 --- a/lesson_08/style.css +++ b/lesson_08/style.css @@ -5,5 +5,126 @@ img{ } body{ - background-color:beige; + background-image: url("img/bg.jpg"); + background-size: cover; + background-repeat: repeat; + font-family: 'Roboto', sans-serif; +} + +.container{ + max-width: 1100px; + margin: auto; + text-align: center; +} + +a{ + text-decoration: none; + color: black; +} + +h1{ + font-family: 'Ribeye Marrow', cursive; + font-size: 60px; + color: white; + margin: 0; +} + +h3{ + font-family: 'Ribeye Marrow', cursive; + font-size: 30px; + color: white; +} + +.subtitle{ + font-size: 20px; + color: white; +} + +.flavors{ + margin: auto; + display: flex; + flex-wrap: wrap; + justify-content: center; + max-width: 1000px; + +} +.flavor{ + padding: 20px; + background-color: white; + margin: 10px; + margin-top: 80px; + border-radius: 17px; + box-shadow: rgba(0, 0, 0, 0.2) 0px 20px 25px -5px, rgba(0, 0, 0, 0.09) 0px 10px 10px -5px; + transition: 0.3s; + color: black; + +} +.flavor:hover{ + box-shadow: none; +} + +.icecream-icon{ + width: 120px; + height: auto; + margin-top: -70px; + transition: 0.1s; +} + +.main2{ + margin-top: 30px; +} + +.content{ + max-width: 900px; + margin: auto; + background-color: white; + padding: 30px; + border-radius: 20px; + margin-top: 40px; + margin-bottom: 10px; + box-shadow: rgba(0, 0, 0, 0.35) 0px 5px 15px; +} + +.description, li{ + font-size: 20px; + text-align: left; + max-width: 600px; + margin: auto; +} + +.content-title{ + color: black; + text-align:center; + margin-top: 10px; + margin-bottom: 10px; +} + +.content-image{ + width: 300px; + height: auto; + margin: auto; + margin-top: -90px; + padding-left: 500px; +} +.cover-image { + width: 100%; + height: auto; + margin: 0; + border-radius: 15px; +} + +.back-button{ + padding: 10px; + border: white 2px solid; + border-radius: 5px; + margin: 20px; + color: white; + background-color: rgba(0, 0, 0, 0.3); + width: 70px; +} + +.back-button:hover{ + background-color: white; + border-radius: 10px; + color: black; } \ No newline at end of file