From 7e537eda68cabc24590ca8daa288c134914b5dbe Mon Sep 17 00:00:00 2001
From: Samuel Odudare
Date: Sat, 28 Mar 2020 14:24:26 +0000
Subject: [PATCH 01/16] completed 1-parent child exercise
---
week-1/1-parent-child/index.html | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/week-1/1-parent-child/index.html b/week-1/1-parent-child/index.html
index 458a4cb21..c24c041af 100644
--- a/week-1/1-parent-child/index.html
+++ b/week-1/1-parent-child/index.html
@@ -20,13 +20,15 @@
Who is available to meet this week to work on our group project?
- 6:48pm
+ 6:45pm
Habiba
I can meet on Tuesday and Wednesday after 4.
+
+
7:15pm >
From 1c8460400a025d23a6e5c33261fbcc6e25f8eded Mon Sep 17 00:00:00 2001
From: Samuel Odudare
Date: Sat, 28 Mar 2020 15:55:11 +0000
Subject: [PATCH 02/16] completed 2-parent child exercise
---
week-1/2-html-attributes/index.html | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/week-1/2-html-attributes/index.html b/week-1/2-html-attributes/index.html
index dc861fa4f..58b9017d4 100644
--- a/week-1/2-html-attributes/index.html
+++ b/week-1/2-html-attributes/index.html
@@ -23,14 +23,15 @@
Luke
- Let's meet at the iCafe in Merchant City. https://goo.gl/maps/aza4h9nUBhn
+ Let's meet at the iCafe in Merchant City.
+ https://goo.gl/maps/aza4h9nUBhn
7:35pm
Won
- Ok! https://media.giphy.com/media/l41K4KlVE8dgozf8I/giphy.gif
+
7:38pm
From a338e613557052e37c9a0e50d87f7795fa9b4b7b Mon Sep 17 00:00:00 2001
From: Samuel Odudare
Date: Tue, 31 Mar 2020 16:12:18 +0100
Subject: [PATCH 03/16] add week1/step1
---
week-1/3-semantic-html/index.html | 26 +++++++++----------
week-1/4-links-scripts/index.html | 2 ++
.../5-css-selectors/message-backgrounds.css | 11 ++++++++
3 files changed, 26 insertions(+), 13 deletions(-)
diff --git a/week-1/3-semantic-html/index.html b/week-1/3-semantic-html/index.html
index 3640deaff..91e6ee972 100644
--- a/week-1/3-semantic-html/index.html
+++ b/week-1/3-semantic-html/index.html
@@ -12,30 +12,30 @@
-
-
-
+
+
+
Won
Where should we meet later?
- Mar 25, 2018 7:25pm
-
-
+
Mar 25, 2018 7:25pm
+
+
Luke
Let's meet at the iCafe in Merchant City. https://goo.gl/maps/aza4h9nUBhn
- Mar 25, 2018 7:35pm
-
-
+
Mar 25, 2018 7:35pm
+
+
Won
Ok! https://media.giphy.com/media/l41K4KlVE8dgozf8I/giphy.gif
- Mar 25, 2018 7:38pm
-
-
+
Mar 25, 2018 7:38pm
+
+
diff --git a/week-1/4-links-scripts/index.html b/week-1/4-links-scripts/index.html
index 303c7fbd2..841913af6 100644
--- a/week-1/4-links-scripts/index.html
+++ b/week-1/4-links-scripts/index.html
@@ -4,6 +4,7 @@
4. Adding Links and Scripts - HTML, CSS and Git Exercises
+
@@ -30,6 +31,7 @@
No, I prefer the one on Sauchiehall Street. https://goo.gl/maps/wKDoARcHDp42
7:38pm
+
diff --git a/week-1/5-css-selectors/message-backgrounds.css b/week-1/5-css-selectors/message-backgrounds.css
index ffe483325..dccaf92f5 100644
--- a/week-1/5-css-selectors/message-backgrounds.css
+++ b/week-1/5-css-selectors/message-backgrounds.css
@@ -1 +1,12 @@
/* Add your CSS code below */
+#first-message {
+ background-color: red;
+}
+
+article {
+ background-color: cadetblue;
+}
+
+.message_author {
+ background-color: yellow;
+}
From 15288a15eb4ba77c5b53f7201cd3afbedb0ba2da Mon Sep 17 00:00:00 2001
From: Samuel Odudare
Date: Tue, 31 Mar 2020 16:30:36 +0100
Subject: [PATCH 04/16] week1/step5
---
week-1/5-css-selectors/message-backgrounds.css | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/week-1/5-css-selectors/message-backgrounds.css b/week-1/5-css-selectors/message-backgrounds.css
index dccaf92f5..ea327e0e7 100644
--- a/week-1/5-css-selectors/message-backgrounds.css
+++ b/week-1/5-css-selectors/message-backgrounds.css
@@ -7,6 +7,6 @@ article {
background-color: cadetblue;
}
-.message_author {
+.author {
background-color: yellow;
}
From 47629372d8f996aed83d367bc4a99ae5d24df93c Mon Sep 17 00:00:00 2001
From: Samuel Odudare
Date: Tue, 31 Mar 2020 16:33:43 +0100
Subject: [PATCH 05/16] week1/step5
---
week-1/5-css-selectors/message-backgrounds.css | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/week-1/5-css-selectors/message-backgrounds.css b/week-1/5-css-selectors/message-backgrounds.css
index ea327e0e7..dccaf92f5 100644
--- a/week-1/5-css-selectors/message-backgrounds.css
+++ b/week-1/5-css-selectors/message-backgrounds.css
@@ -7,6 +7,6 @@ article {
background-color: cadetblue;
}
-.author {
+.message_author {
background-color: yellow;
}
From f37d0a4b355a0320245121a3d702731df1d3eb48 Mon Sep 17 00:00:00 2001
From: Samuel Odudare
Date: Tue, 31 Mar 2020 16:36:19 +0100
Subject: [PATCH 06/16] week1/step5
---
week-1/5-css-selectors/message-backgrounds.css | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/week-1/5-css-selectors/message-backgrounds.css b/week-1/5-css-selectors/message-backgrounds.css
index dccaf92f5..af7154560 100644
--- a/week-1/5-css-selectors/message-backgrounds.css
+++ b/week-1/5-css-selectors/message-backgrounds.css
@@ -7,6 +7,6 @@ article {
background-color: cadetblue;
}
-.message_author {
+.message_content {
background-color: yellow;
}
From c67936a004ea9c61fc2beae71e96d23c4297de98 Mon Sep 17 00:00:00 2001
From: Samuel Odudare
Date: Tue, 31 Mar 2020 16:37:30 +0100
Subject: [PATCH 07/16] week1/step5
---
week-1/5-css-selectors/message-backgrounds.css | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/week-1/5-css-selectors/message-backgrounds.css b/week-1/5-css-selectors/message-backgrounds.css
index af7154560..dccaf92f5 100644
--- a/week-1/5-css-selectors/message-backgrounds.css
+++ b/week-1/5-css-selectors/message-backgrounds.css
@@ -7,6 +7,6 @@ article {
background-color: cadetblue;
}
-.message_content {
+.message_author {
background-color: yellow;
}
From 1925569c527e22d00707564ecceae661dd85fc40 Mon Sep 17 00:00:00 2001
From: Samuel Odudare
Date: Tue, 31 Mar 2020 17:07:33 +0100
Subject: [PATCH 08/16] week1/step5 update
---
week-1/5-css-selectors/message-backgrounds.css | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/week-1/5-css-selectors/message-backgrounds.css b/week-1/5-css-selectors/message-backgrounds.css
index dccaf92f5..ab04c756b 100644
--- a/week-1/5-css-selectors/message-backgrounds.css
+++ b/week-1/5-css-selectors/message-backgrounds.css
@@ -7,6 +7,6 @@ article {
background-color: cadetblue;
}
-.message_author {
+.message--latest {
background-color: yellow;
}
From d63ede793f374ee95ee3fcf7cb7400e3905e9e35 Mon Sep 17 00:00:00 2001
From: Samuel Odudare
Date: Tue, 31 Mar 2020 17:16:52 +0100
Subject: [PATCH 09/16] week1/step6 update
---
week-1/6-css-properties/styles.css | 19 +++++++++++++++++++
1 file changed, 19 insertions(+)
diff --git a/week-1/6-css-properties/styles.css b/week-1/6-css-properties/styles.css
index ffe483325..d48cc66a4 100644
--- a/week-1/6-css-properties/styles.css
+++ b/week-1/6-css-properties/styles.css
@@ -1 +1,20 @@
/* Add your CSS code below */
+a {
+ color: red;
+ font-weight: bold;
+ text-decoration: none;
+}
+
+.message__time {
+ font-size: 0.9rem;
+}
+.message--unread > .message__content {
+ border-left-style: solid;
+ border-color: blue;
+}
+.message--old {
+ opacity: 0.5;
+}
+.message__content {
+ line-height: 3;
+}
From f7160011e813fc0821db2c44ef7d7d6e904ff2a9 Mon Sep 17 00:00:00 2001
From: Samuel Odudare
Date: Tue, 31 Mar 2020 17:19:17 +0100
Subject: [PATCH 10/16] add week1/step6
---
week-1/6-css-properties/index.html | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/week-1/6-css-properties/index.html b/week-1/6-css-properties/index.html
index e8a198d8f..073c4e6c8 100644
--- a/week-1/6-css-properties/index.html
+++ b/week-1/6-css-properties/index.html
@@ -19,7 +19,7 @@
Won
- Where should we meet tomorrrow?
+ Where should we meet tomorrow?
Yesterday, 7:25pm
From 4539700b7fd99efaa768e95141f68fa6716720b0 Mon Sep 17 00:00:00 2001
From: Samuel Odudare
Date: Tue, 31 Mar 2020 17:32:10 +0100
Subject: [PATCH 11/16] add week1/step6 update
---
week-1/6-css-properties/styles.css | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/week-1/6-css-properties/styles.css b/week-1/6-css-properties/styles.css
index d48cc66a4..39c3aefd4 100644
--- a/week-1/6-css-properties/styles.css
+++ b/week-1/6-css-properties/styles.css
@@ -8,13 +8,13 @@ a {
.message__time {
font-size: 0.9rem;
}
-.message--unread > .message__content {
- border-left-style: solid;
- border-color: blue;
+
+.message.message--unread {
+ border-left: 5px solid blue;
}
-.message--old {
- opacity: 0.5;
+.message.message--old {
+ opacity: 40%;
}
-.message__content {
- line-height: 3;
+.message {
+ line-height: 1.9em;
}
From c78eaa03869983b51b7bb629d342a685e3dad8e9 Mon Sep 17 00:00:00 2001
From: Samuel Odudare
Date: Tue, 31 Mar 2020 21:44:45 +0100
Subject: [PATCH 12/16] wee1/step7
---
week-1/7-css-box/styles.css | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/week-1/7-css-box/styles.css b/week-1/7-css-box/styles.css
index 013b94f1e..30526744b 100644
--- a/week-1/7-css-box/styles.css
+++ b/week-1/7-css-box/styles.css
@@ -1,6 +1,14 @@
/* Try different box model properties below */
+.country {
+ padding: 15px;
+}
+
.pages__page {
border: 1px solid #4491db;
border-radius: 4px;
background: #fff;
}
+
+* {
+ border: 1px solid rgb(255, 208, 0);
+}
From 278988e1ac810844db569da5a163888048ae9e87 Mon Sep 17 00:00:00 2001
From: Samuel Odudare
Date: Tue, 31 Mar 2020 22:06:46 +0100
Subject: [PATCH 13/16] week1/step8
---
week-1/8-advanced-selectors/styles.css | 15 +++++++++++++++
1 file changed, 15 insertions(+)
diff --git a/week-1/8-advanced-selectors/styles.css b/week-1/8-advanced-selectors/styles.css
index d35c3c371..d03e42ec2 100644
--- a/week-1/8-advanced-selectors/styles.css
+++ b/week-1/8-advanced-selectors/styles.css
@@ -1 +1,16 @@
/* Try different box model properties below */
+.site-wrapper {
+ margin-bottom: 20px;
+}
+.site-header {
+ color: yellow;
+}
+
+.site-footer {
+ font-size: 12px;
+ text-align: center;
+}
+
+.last-child {
+ box-shadow: 4px 4px 0 #dba944;
+}
From 23ba5332958023b3a8c5cf31b282a41165ccff71 Mon Sep 17 00:00:00 2001
From: Samuel Odudare
Date: Fri, 3 Apr 2020 21:21:40 +0100
Subject: [PATCH 14/16] Update red_links branch
---
week-1/9-git-branch/index.html | 2 +-
week-1/9-git-branch/styles.css | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/week-1/9-git-branch/index.html b/week-1/9-git-branch/index.html
index 2aca59639..4e5b828fb 100644
--- a/week-1/9-git-branch/index.html
+++ b/week-1/9-git-branch/index.html
@@ -19,7 +19,7 @@
Won
- Where should we meet tomorrrow?
+ Where should we meet tomorrow?
Yesterday, 7:25pm
diff --git a/week-1/9-git-branch/styles.css b/week-1/9-git-branch/styles.css
index 0051cdbaf..7a3354927 100644
--- a/week-1/9-git-branch/styles.css
+++ b/week-1/9-git-branch/styles.css
@@ -1,6 +1,6 @@
/* Add your own CSS code below */
.link {
- color: #4491db;
+ color: red;
font-weight: 700;
text-decoration: none;
}
From b807a94577bbfd824b0a032ae538a74e614ee024 Mon Sep 17 00:00:00 2001
From: Samuel Odudare
Date: Tue, 7 Apr 2020 12:36:43 +0100
Subject: [PATCH 15/16] week1/9
---
week-1/9-git-branch/styles.css | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/week-1/9-git-branch/styles.css b/week-1/9-git-branch/styles.css
index 7a3354927..736fda2c3 100644
--- a/week-1/9-git-branch/styles.css
+++ b/week-1/9-git-branch/styles.css
@@ -1,6 +1,6 @@
/* Add your own CSS code below */
.link {
- color: red;
+ color: darkorange;
font-weight: 700;
text-decoration: none;
}
From 7ebc175a38e161cf19cec1865703e01bacc6a8f3 Mon Sep 17 00:00:00 2001
From: Samuel Odudare
Date: Tue, 7 Apr 2020 12:45:57 +0100
Subject: [PATCH 16/16] Update red_links branch
---
week-1/9-git-branch/styles.css | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/week-1/9-git-branch/styles.css b/week-1/9-git-branch/styles.css
index 736fda2c3..89cc58c86 100644
--- a/week-1/9-git-branch/styles.css
+++ b/week-1/9-git-branch/styles.css
@@ -1,6 +1,6 @@
/* Add your own CSS code below */
.link {
- color: darkorange;
+ color: dark_orange;
font-weight: 700;
text-decoration: none;
}