From aa522e03ec421070eb5108a08d4457d558211343 Mon Sep 17 00:00:00 2001 From: Nimi-AJ Date: Thu, 11 Feb 2021 01:14:46 +0100 Subject: [PATCH 1/8] First commit --- index.html | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/index.html b/index.html index aec217a..aa67cfd 100644 --- a/index.html +++ b/index.html @@ -130,7 +130,14 @@ 6 male - + + + Toluwanimi Ajike + Frank Ocean + Ondo State + 2 + Male + From bd107d0cc2ddf9a3bf1809798036a699e1a9c4b9 Mon Sep 17 00:00:00 2001 From: Nimi-AJ Date: Sun, 28 Feb 2021 13:25:43 +0100 Subject: [PATCH 2/8] first commit was adding a readme file --- README.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 README.md diff --git a/README.md b/README.md new file mode 100644 index 0000000..9f5ecd0 --- /dev/null +++ b/README.md @@ -0,0 +1 @@ +week 1 day 2 assignment From f06438017366b9a1ae56e38296c74760883d4a2f Mon Sep 17 00:00:00 2001 From: Nimi-AJ Date: Sun, 28 Feb 2021 13:32:55 +0100 Subject: [PATCH 3/8] deleted unwanted css file --- styles.css | 81 ------------------------------------------------------ 1 file changed, 81 deletions(-) delete mode 100644 styles.css diff --git a/styles.css b/styles.css deleted file mode 100644 index 98fd805..0000000 --- a/styles.css +++ /dev/null @@ -1,81 +0,0 @@ -body { - font-family: "Roboto", sans-serif; -} -.table { - width: 100%; - border-spacing: 0; - text-align: left; -} -.table th { - font-weight: 300; - font-size: 16px; - color: #fff; - line-height: 26px; - padding: 18px 30px; -} -.table thead tr { - background: #2b2d32; -} -.table td { - padding: 30px 30px 31px; - font-weight: 300; - font-size: 16px; - color: black-2; - line-height: 26px; - text-transform: uppercase; -} -.table tbody tr:nth-child(odd) { - background: $white; -} -.table tbody tr:nth-child(even) { - background: $f8fbfc; -} -.table__wrapper { - padding-top: 40px; -} -.btn { - display: inline-block; - font-weight: 700; - font-size: 15px; - line-height: 25px; - text-transform: uppercase; - width: 170px; - text-align: center; - padding: 10px; - border-radius: 3px; - transition: background 0.3s ease; - text-decoration: none; -} -.btn:hover { - color: $white; -} -.btn__male { - color: #2DE1FC; - border: 2px solid #2DE1FC; -} -.btn__malee:hover { - background: #2DE1FC; -} -.btn__female { - color: #FF0080; - border: 2px solid #FF0080; -} -.btn__female:hover { - background: #FF0080; -} -@media (max-width: 768px) { - .table td { - display: block; - text-align: right; - } - .table td:before { - content: attr(data-label); - float: left; - text-transform: uppercase; - font-weight: bold; - } - .table thead display none tr { - margin-bottom: 30px; - display: block; - } -} From 47f07c9b6428ed5c3268f36b45f0e31a8e6dc4ff Mon Sep 17 00:00:00 2001 From: Nimi-AJ Date: Sun, 28 Feb 2021 14:44:44 +0100 Subject: [PATCH 4/8] third commit --- html2.html | 63 +++++++++++++++++++ index.html | 175 ++++++++++++----------------------------------------- 2 files changed, 102 insertions(+), 136 deletions(-) create mode 100644 html2.html diff --git a/html2.html b/html2.html new file mode 100644 index 0000000..b389787 --- /dev/null +++ b/html2.html @@ -0,0 +1,63 @@ + + + + + My second HTML page! + +
+

Inside of header let's add a nav bar with some essential links

+ Home About Contact +
+
+ +

Here is the main section of our page- it consists of a news article

+ +

Article 1 - 1995 was a pretty crazy year for programming languages!

+

Don't believe me check this table out:

+ +

TABLE

+ +

Article 2 - Coming soon...

+ +

Contact us!

+ +

General Information

+
+ + + + +
+ +

Ingredients(probably not right...)

+
    +
  • 6 Eggs
    • +
  • 2 cups of flour
    • +
  • 2 Tablespoons of vanilla extract
    • +
  • 2 Teaspoons of baking powder
    • +
  • 1 Cup of Sugar
    • +
+ +

Instructions(may or may not be correct)

+
    +
  1. Add eggs, flour, vanilla extract and mix
    2. +
  2. Combine with sugar and baking powder and stir
    3. +
  3. Eat half the cookie batter and make batter cookies
    4. +
  4. Take the rest of the cookie batter and make cookies
    5. +
  5. Bake at 350 for 25 minutes
    6. +
  6. Enjoy!
    7. +
+
+ +
+
+

Oh you don't tust us? You want to see the actual recipe? You can view it here

+
+ + + + + + + + \ No newline at end of file diff --git a/index.html b/index.html index aa67cfd..26124e1 100644 --- a/index.html +++ b/index.html @@ -1,145 +1,48 @@ - - Document - + My first HTML page! - +
+

This is your first HTML page!

+
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +

Seems like things are going pretty well so far

+

Let's add a recipe for some delicious chocolate chip cookies

+

We are going to borrow a nice picture from General Milk

+ -
Full NameFavourite ArtistState of OriginNumber of SiblingsGender
Adewumi AdeyemoAngelique KidjoOyo8Male
Gabriel KayodeAsaOyo5Male
Efosa OdiaSinachEdo3Male
Akintunde AlabiVic OOsun2Male
Emmanuel OderemiJohnny DrilleOgun3Male
Olamiji BadmosSimiOyo4Female
Kareem JohnbelieveAlec BenjaminKogi state3Male
Matthew OmolewaRon KenolyEkiti3Male
Adebayo SeunWizkidOyo state3Male
Tahiru Tajudin Abdullahiidriskogi7Male
Badmus AdeshinaFalzLagos state3Male
Olufolahan TubiBrayn AdamsOyo State1Male
Ndibe ChinonsoLil WayneImo State3Male
Oru Chukwuemeka.EDavidoAbia State6male
Toluwanimi AjikeFrank OceanOndo State2Male
+

Here is what the recipe calls for

+

Ingredients(probably not right...)

+
    +
  • 6 Eggs
    • +
  • 2 cups of flour
    • +
  • 2 Tablespoons of vanilla extract
    • +
  • 2 Teaspoons of baking powder
    • +
  • 1 Cup of Sugar
    • +
+ +

Instructions(may or may not be correct)

+
    +
  1. Add eggs, flour, vanilla extract and mix
    2. +
  2. Combine with sugar and baking powder and stir
    3. +
  3. Eat half the cookie batter and make batter cookies
    4. +
  4. Take the rest of the cookie batter and make cookies
    5. +
  5. Bake at 350 for 25 minutes
    6. +
  6. Enjoy!
    7. +
+
+
+
+

Oh you don't tust us? You want to see the actual recipe? You can view it here

+
+ + + + + + - + \ No newline at end of file From c7042ee701011b7aae4da4d37e87a95de7a56b6c Mon Sep 17 00:00:00 2001 From: Nimi-AJ Date: Sun, 28 Feb 2021 19:10:53 +0100 Subject: [PATCH 5/8] Work in progress for second html --- html2.html | 51 +++++++++++++++++++++++++++++++-------------------- 1 file changed, 31 insertions(+), 20 deletions(-) diff --git a/html2.html b/html2.html index b389787..d79a316 100644 --- a/html2.html +++ b/html2.html @@ -24,34 +24,45 @@

Contact us!

General Information

+
+
+
-

Ingredients(probably not right...)

-
    -
  • 6 Eggs
    • -
  • 2 cups of flour
    • -
  • 2 Tablespoons of vanilla extract
    • -
  • 2 Teaspoons of baking powder
    • -
  • 1 Cup of Sugar
    • -
- -

Instructions(may or may not be correct)

-
    -
  1. Add eggs, flour, vanilla extract and mix
    2. -
  2. Combine with sugar and baking powder and stir
    3. -
  3. Eat half the cookie batter and make batter cookies
    4. -
  4. Take the rest of the cookie batter and make cookies
    5. -
  5. Bake at 350 for 25 minutes
    6. -
  6. Enjoy!
    7. -
+

General Information

+

What kind of work do you need?

+
+
+ +
+ +
+ +
+ +

How interested are you in our design skills?

+
+ +
+ +
+ +
+ +
+ +
+ +
+ -
+
-

Oh you don't tust us? You want to see the actual recipe? You can view it here

+

Here is our footer - let's make sure we copyright © this!

From fd681b552614683227ca4c90bda6fab8e0b2b810 Mon Sep 17 00:00:00 2001 From: Nimi-AJ Date: Sun, 28 Feb 2021 19:29:25 +0100 Subject: [PATCH 6/8] new file html 3 --- html3.html | 1 + 1 file changed, 1 insertion(+) create mode 100644 html3.html diff --git a/html3.html b/html3.html new file mode 100644 index 0000000..1936cc1 --- /dev/null +++ b/html3.html @@ -0,0 +1 @@ +html From bf451d7ae36eeb518753747a0f7b0b54421933b7 Mon Sep 17 00:00:00 2001 From: Nimi-AJ Date: Tue, 2 Mar 2021 10:05:43 +0100 Subject: [PATCH 7/8] commit --- html2.html | 40 +++++++++++++++++++++++++++++++++++++++- html3.html | 42 +++++++++++++++++++++++++++++++++++++++++- 2 files changed, 80 insertions(+), 2 deletions(-) diff --git a/html2.html b/html2.html index d79a316..4f8f1d1 100644 --- a/html2.html +++ b/html2.html @@ -16,6 +16,45 @@

Article 1 - 1995 was a pretty crazy year for programming languages!

Don't believe me check this table out:

TABLE

+ + + Language + Designed By + First Appeared + + + + + C++ + Bjarne Stroustrup + 1993 + + + Python + Guido van Rossom + 1991 + + + Ruby + Yukihiro Matsumoto ("Matz") + 1995 + + + Javascript + Brendan Eich + 1995 + + + Java + James Gosling + 1995 + + PHP + Rasmus Lerdorf + 1995 + + +

Article 2 - Coming soon...

@@ -70,5 +109,4 @@

General Information

- \ No newline at end of file diff --git a/html3.html b/html3.html index 1936cc1..d004265 100644 --- a/html3.html +++ b/html3.html @@ -1 +1,41 @@ -html + + + + + My third html page! + + +

WWelcome Back!

+

Here's a geat video from Youtube!

+ + + +

Here's some music from spotify (Not really though!)

+ + + +

Want to stay informed? Put your info here!

+
+ +
+ +
+ +
+ +
+ +
+ + + + + + + + + + + \ No newline at end of file From 847e1cf18748b337c5e8b895dc94bd98f89f039c Mon Sep 17 00:00:00 2001 From: Nimi-AJ Date: Tue, 2 Mar 2021 22:30:58 +0100 Subject: [PATCH 8/8] final commit --- html2.html | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/html2.html b/html2.html index 4f8f1d1..c57911e 100644 --- a/html2.html +++ b/html2.html @@ -16,6 +16,7 @@

Article 1 - 1995 was a pretty crazy year for programming languages!

Don't believe me check this table out:

TABLE

+ @@ -55,6 +56,27 @@

Article 1 - 1995 was a pretty crazy year for programming languages!

+
Language
+ +

Here's a table utilizing joinings (column span) to record data

+ + + + + + + + + + + + + + + + + +
LanguageDesigned byYear
CDennis RitchieKen Thompson19691973

Article 2 - Coming soon...