From 2e25becf91b302e121b13cb72df362d1c6d5861a Mon Sep 17 00:00:00 2001 From: Priscilla Mac-Gatus Date: Mon, 16 Sep 2024 14:52:06 +0200 Subject: [PATCH 01/44] Added 2 comments and a header tag --- Wireframe/index.html | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Wireframe/index.html b/Wireframe/index.html index 67544158..e6f7313c 100644 --- a/Wireframe/index.html +++ b/Wireframe/index.html @@ -9,5 +9,11 @@ + + + +
+ + Date: Mon, 16 Sep 2024 14:58:25 +0200 Subject: [PATCH 02/44] Inserted "h1" and "p" tags inside the header tags. --- Wireframe/index.html | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/Wireframe/index.html b/Wireframe/index.html index e6f7313c..63ceaf07 100644 --- a/Wireframe/index.html +++ b/Wireframe/index.html @@ -12,7 +12,12 @@ -
+
+ +

Git: A Developer's Best Friend

+

Explore the world of Git branching and discover how this powerful feature can enhance your development workflow.

+ +
From 57e9c948c9c7981e2ea30af162224ab3a73d751a Mon Sep 17 00:00:00 2001 From: Priscilla Mac-Gatus Date: Mon, 16 Sep 2024 15:01:41 +0200 Subject: [PATCH 03/44] Inserted a class attribute each to "h1" ad "p" tags in the header tags. --- Wireframe/index.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Wireframe/index.html b/Wireframe/index.html index 63ceaf07..4f3763b9 100644 --- a/Wireframe/index.html +++ b/Wireframe/index.html @@ -13,9 +13,9 @@
- -

Git: A Developer's Best Friend

-

Explore the world of Git branching and discover how this powerful feature can enhance your development workflow.

+ +

Git: A Developer's Best Friend

+

Explore the world of Git branching and discover how this powerful feature can enhance your development workflow.

From 806e781c3aa5513994153b814016aaef2b47f655 Mon Sep 17 00:00:00 2001 From: Priscilla Mac-Gatus Date: Mon, 16 Sep 2024 15:03:43 +0200 Subject: [PATCH 04/44] Added 2 comments and main tags --- Wireframe/index.html | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/Wireframe/index.html b/Wireframe/index.html index 4f3763b9..e31c2f6e 100644 --- a/Wireframe/index.html +++ b/Wireframe/index.html @@ -20,5 +20,12 @@

Git: A Developer's Best Friend

+ + + +
+ + + Date: Mon, 16 Sep 2024 15:06:53 +0200 Subject: [PATCH 05/44] Attached an article tag and 3 div tags --- Wireframe/index.html | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/Wireframe/index.html b/Wireframe/index.html index e31c2f6e..cc36a843 100644 --- a/Wireframe/index.html +++ b/Wireframe/index.html @@ -21,9 +21,18 @@

Git: A Developer's Best Friend

- + -
+
+
+
+ +
+ +
+ +
+
From 553ea14ff4f8feba97060f19d5aacf8505b7c582 Mon Sep 17 00:00:00 2001 From: Priscilla Mac-Gatus Date: Mon, 16 Sep 2024 15:14:09 +0200 Subject: [PATCH 06/44] Inserted a comment and a div with "img", "h4", "p", "a" and button tags for the first content in article tags --- Wireframe/index.html | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/Wireframe/index.html b/Wireframe/index.html index cc36a843..966bbe5e 100644 --- a/Wireframe/index.html +++ b/Wireframe/index.html @@ -25,7 +25,28 @@

Git: A Developer's Best Friend

-
+ + + +
+ + An image with the inscription Git + + +
+ +

What Is Git?

+ +

Git is a powerful version control system that enables developers to efficiently manage their code, collaborative development, tracking changes, and undoing mistakes.

+ + + + + +
+ + +
From 4fac6f0cda057a9a661265534cfd2c2c7279475f Mon Sep 17 00:00:00 2001 From: Priscilla Mac-Gatus Date: Mon, 16 Sep 2024 15:23:20 +0200 Subject: [PATCH 07/44] Added a comment and a div with "img", "h4", "a", "p" and button tags as the second content of article. --- Wireframe/index.html | 32 ++++++++++++++++++++++++++------ 1 file changed, 26 insertions(+), 6 deletions(-) diff --git a/Wireframe/index.html b/Wireframe/index.html index 966bbe5e..45590906 100644 --- a/Wireframe/index.html +++ b/Wireframe/index.html @@ -35,20 +35,40 @@

Git: A Developer's Best Friend

-

What Is Git?

+

What Is Git?

-

Git is a powerful version control system that enables developers to efficiently manage their code, collaborative development, tracking changes, and undoing mistakes.

+

Git is a powerful version control system that enables developers to efficiently manage their code, collaborative development, tracking changes, and undoing mistakes.

- - - + + +
-
+ + +
+ + An image with question why Git? + + + +
+

Importance Of Git

+ +

Git is a revolutionized way developers work. It provides a robust framework for tracking changes to code, collaborating with team members, and managing project history.

+ + + + +
+ + + +
From 4750789e3a3ec12f7af5845970450641132b4913 Mon Sep 17 00:00:00 2001 From: Priscilla Mac-Gatus Date: Mon, 16 Sep 2024 15:34:17 +0200 Subject: [PATCH 08/44] Attached a comment and a div tag with "img", "h4", "p", "a" and button tags for the third content of the article tag --- Wireframe/index.html | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/Wireframe/index.html b/Wireframe/index.html index 45590906..f68bf0b7 100644 --- a/Wireframe/index.html +++ b/Wireframe/index.html @@ -70,7 +70,28 @@

Importance Of Git

-
+ + +
+ + This is an image of a source control icon + + +
+

What is a Git Branch?

+ +

Git Branches are like parallel paths within a project's history. They allow developers to work on different features, bug fixes, or experimental changes without affecting the main codebase.

+ + + + + + +
+ + +
From 4b256bf402169d3a56f32f74b1bcda55ac582703 Mon Sep 17 00:00:00 2001 From: Priscilla Mac-Gatus Date: Mon, 16 Sep 2024 15:43:17 +0200 Subject: [PATCH 09/44] Inserted 2 comments and footer tag with 2 paragraph tags --- Wireframe/index.html | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/Wireframe/index.html b/Wireframe/index.html index f68bf0b7..5c7bb9b2 100644 --- a/Wireframe/index.html +++ b/Wireframe/index.html @@ -97,6 +97,21 @@

What is a Git Branch?

+ + +
+

+ Address: 145 Main Street, Lviv, 089970
+ Phone: (+380) 475-387-330
+ Email: developersHub@gmail.com +

+ +

Copyright © 2024 Developer's Hub

+ +
+ + + Date: Mon, 16 Sep 2024 15:51:15 +0200 Subject: [PATCH 10/44] Corrected the file path of the style.css file in the html head tags --- Wireframe/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Wireframe/index.html b/Wireframe/index.html index 5c7bb9b2..927ebc0a 100644 --- a/Wireframe/index.html +++ b/Wireframe/index.html @@ -4,7 +4,7 @@ Wireframe - + From 32f7877dd8e9ac3aa7fa511a81c667d4aed2f05e Mon Sep 17 00:00:00 2001 From: Priscilla Mac-Gatus Date: Mon, 16 Sep 2024 16:08:59 +0200 Subject: [PATCH 11/44] Applied css style to the Header --- Wireframe/css/style.css | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/Wireframe/css/style.css b/Wireframe/css/style.css index e69de29b..a36c37a8 100644 --- a/Wireframe/css/style.css +++ b/Wireframe/css/style.css @@ -0,0 +1,15 @@ +/* Header */ + +header{ text-align: center;} + +.page_title{font-size: 40px;} + + +.title_description{ +font-family: Georgia, 'Times New Roman', Times, serif; +font-size: large; +font-style: italic; +} + + + From fbb779ee50a759a9991e2714efdad9b2d81904ea Mon Sep 17 00:00:00 2001 From: Priscilla Mac-Gatus Date: Mon, 16 Sep 2024 16:21:58 +0200 Subject: [PATCH 12/44] Added a class name to div tag in article content 1 --- Wireframe/css/style.css | 5 +++++ Wireframe/index.html | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/Wireframe/css/style.css b/Wireframe/css/style.css index a36c37a8..a1add545 100644 --- a/Wireframe/css/style.css +++ b/Wireframe/css/style.css @@ -12,4 +12,9 @@ font-style: italic; } +/* Article */ + +.div_article1.div_article1{ +text-align: center; +} diff --git a/Wireframe/index.html b/Wireframe/index.html index 927ebc0a..13cb9963 100644 --- a/Wireframe/index.html +++ b/Wireframe/index.html @@ -28,7 +28,7 @@

Git: A Developer's Best Friend

-
+
An image with the inscription Git From 2db8ce7516655182dca2ad97fa7cb8063ebfca05 Mon Sep 17 00:00:00 2001 From: Priscilla Mac-Gatus Date: Mon, 16 Sep 2024 16:26:04 +0200 Subject: [PATCH 13/44] Corrected error in css style for article and applied first-child to the article section in css --- Wireframe/css/style.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Wireframe/css/style.css b/Wireframe/css/style.css index a1add545..2a4bb95d 100644 --- a/Wireframe/css/style.css +++ b/Wireframe/css/style.css @@ -14,7 +14,7 @@ font-style: italic; /* Article */ -.div_article1.div_article1{ +.div_article1:first-child{ text-align: center; } From 95d9b2bcd416d5572f8c1c0d87c8b42beaf48855 Mon Sep 17 00:00:00 2001 From: Priscilla Mac-Gatus Date: Mon, 16 Sep 2024 16:38:28 +0200 Subject: [PATCH 14/44] Applied a css style and a class attribute to the second article in the div tag. --- Wireframe/css/style.css | 3 +++ Wireframe/index.html | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/Wireframe/css/style.css b/Wireframe/css/style.css index 2a4bb95d..cb37975f 100644 --- a/Wireframe/css/style.css +++ b/Wireframe/css/style.css @@ -18,3 +18,6 @@ font-style: italic; text-align: center; } +.div_article2{ +border:0.5px solid grey; +} diff --git a/Wireframe/index.html b/Wireframe/index.html index 13cb9963..e28dc54a 100644 --- a/Wireframe/index.html +++ b/Wireframe/index.html @@ -50,7 +50,7 @@

What Is Git?

-
+
An image with question why Git? From 78c85e29d624462c24660a30792bfd61f5b0554e Mon Sep 17 00:00:00 2001 From: Priscilla Mac-Gatus Date: Mon, 16 Sep 2024 16:43:26 +0200 Subject: [PATCH 15/44] Attached a class attribute and applied css style to 3rd article content in the div tag --- Wireframe/css/style.css | 5 +++++ Wireframe/index.html | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/Wireframe/css/style.css b/Wireframe/css/style.css index cb37975f..452ee5dc 100644 --- a/Wireframe/css/style.css +++ b/Wireframe/css/style.css @@ -21,3 +21,8 @@ text-align: center; .div_article2{ border:0.5px solid grey; } + + +.div_article3{ +border:0.5px solid grey; +} diff --git a/Wireframe/index.html b/Wireframe/index.html index e28dc54a..4cff6d9c 100644 --- a/Wireframe/index.html +++ b/Wireframe/index.html @@ -72,7 +72,7 @@

Importance Of Git

-
+
This is an image of a source control icon From e58efa77313e4f1900a3f8ac46ac8c0381cdb3e4 Mon Sep 17 00:00:00 2001 From: Priscilla Mac-Gatus Date: Mon, 16 Sep 2024 16:56:48 +0200 Subject: [PATCH 16/44] Applied margin spacing to the header. --- Wireframe/css/style.css | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/Wireframe/css/style.css b/Wireframe/css/style.css index 452ee5dc..a63b69da 100644 --- a/Wireframe/css/style.css +++ b/Wireframe/css/style.css @@ -2,13 +2,19 @@ header{ text-align: center;} -.page_title{font-size: 40px;} +.page_title{font-size: 40px; +margin-bottom: 10px; +} .title_description{ font-family: Georgia, 'Times New Roman', Times, serif; font-size: large; font-style: italic; +margin-top:0px; +margin-bottom: 80px; + + } From 974994c15f8eb73688ac17cf109350d6e001d72d Mon Sep 17 00:00:00 2001 From: Priscilla Mac-Gatus Date: Mon, 16 Sep 2024 17:31:27 +0200 Subject: [PATCH 17/44] Added a class to div contain semantic tags in the first article and applied css style --- Wireframe/css/style.css | 11 +++++++++++ Wireframe/index.html | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/Wireframe/css/style.css b/Wireframe/css/style.css index a63b69da..10231a04 100644 --- a/Wireframe/css/style.css +++ b/Wireframe/css/style.css @@ -22,6 +22,17 @@ margin-bottom: 80px; .div_article1:first-child{ text-align: center; + +} + +.subdivided_div_article1{ +border: 1px solid grey; +width: 967px; +position: relative; +left: 315px; +bottom:4px; +text-align: left; +padding: 15px; } .div_article2{ diff --git a/Wireframe/index.html b/Wireframe/index.html index 4cff6d9c..8ec4bc19 100644 --- a/Wireframe/index.html +++ b/Wireframe/index.html @@ -33,7 +33,7 @@

Git: A Developer's Best Friend

An image with the inscription Git -
+

What Is Git?

From 5b6e8ed2b2644d8536843a1956c60693ad58c973 Mon Sep 17 00:00:00 2001 From: Priscilla Mac-Gatus Date: Mon, 16 Sep 2024 17:38:35 +0200 Subject: [PATCH 18/44] Adjusted the size of the image in the second article --- Wireframe/css/style.css | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Wireframe/css/style.css b/Wireframe/css/style.css index 10231a04..24cd4f9f 100644 --- a/Wireframe/css/style.css +++ b/Wireframe/css/style.css @@ -39,6 +39,9 @@ padding: 15px; border:0.5px solid grey; } +.div_article2 img{ +width:450px; +} .div_article3{ border:0.5px solid grey; From 59316c11f1d7d3f5e6213a40aa74e5bf869cbbde Mon Sep 17 00:00:00 2001 From: Priscilla Mac-Gatus Date: Mon, 16 Sep 2024 18:16:05 +0200 Subject: [PATCH 19/44] Applied css positioning and width to the second div article --- Wireframe/css/style.css | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Wireframe/css/style.css b/Wireframe/css/style.css index 24cd4f9f..16f9c81c 100644 --- a/Wireframe/css/style.css +++ b/Wireframe/css/style.css @@ -36,7 +36,10 @@ padding: 15px; } .div_article2{ -border:0.5px solid grey; +border:0.5px solid grey; +width: 500px; +position: relative; +left: 300px; } .div_article2 img{ From c2ea2f8d0ff9d78ec252257a1d4d5573b590c3f2 Mon Sep 17 00:00:00 2001 From: Priscilla Mac-Gatus Date: Mon, 16 Sep 2024 18:21:34 +0200 Subject: [PATCH 20/44] Added a class of a subdivided div with semantic tags(h4, p, a, button) in second article. and applied a comment and css border style --- Wireframe/css/style.css | 16 +++++++++++++++- Wireframe/index.html | 2 +- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/Wireframe/css/style.css b/Wireframe/css/style.css index 16f9c81c..5f91e490 100644 --- a/Wireframe/css/style.css +++ b/Wireframe/css/style.css @@ -18,7 +18,7 @@ margin-bottom: 80px; } -/* Article */ +/* Article 1 */ .div_article1:first-child{ text-align: center; @@ -35,6 +35,8 @@ text-align: left; padding: 15px; } +/* Article 2 */ + .div_article2{ border:0.5px solid grey; width: 500px; @@ -46,6 +48,18 @@ left: 300px; width:450px; } + +.subdivided_div_article2{ + border: 1px solid grey; +} + + + + + + + + .div_article3{ border:0.5px solid grey; } diff --git a/Wireframe/index.html b/Wireframe/index.html index 8ec4bc19..4a860868 100644 --- a/Wireframe/index.html +++ b/Wireframe/index.html @@ -56,7 +56,7 @@

What Is Git?

-
+

Importance Of Git

Git is a revolutionized way developers work. It provides a robust framework for tracking changes to code, collaborating with team members, and managing project history.

From cc8bbdeb894a1e1ed6d45c64b7a14f13327766a3 Mon Sep 17 00:00:00 2001 From: Priscilla Mac-Gatus Date: Mon, 16 Sep 2024 18:31:37 +0200 Subject: [PATCH 21/44] Applied css width,height and position to 3rd article and image --- Wireframe/css/style.css | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/Wireframe/css/style.css b/Wireframe/css/style.css index 5f91e490..f8dfe49b 100644 --- a/Wireframe/css/style.css +++ b/Wireframe/css/style.css @@ -56,10 +56,19 @@ width:450px; - +/* Article 3 */ .div_article3{ -border:0.5px solid grey; +border:0.5px solid grey; +width: 500px; +height:400px; +position:relative; +left: 850px; +bottom:500px; } + +.div_article3 img{ +width:100px; +} \ No newline at end of file From a30ff1dd9084863fdc594a0b2351e98a7c04655f Mon Sep 17 00:00:00 2001 From: Priscilla Mac-Gatus Date: Mon, 16 Sep 2024 18:59:07 +0200 Subject: [PATCH 22/44] REplace image links with new src links --- Wireframe/index.html | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/Wireframe/index.html b/Wireframe/index.html index 4a860868..082ae1ae 100644 --- a/Wireframe/index.html +++ b/Wireframe/index.html @@ -30,8 +30,7 @@

Git: A Developer's Best Friend

- An image with the inscription Git - + An image with the inscription Git
@@ -52,7 +51,7 @@

What Is Git?

- An image with question why Git? + An image with question why Git? @@ -74,12 +73,11 @@

Importance Of Git

- This is an image of a source control icon - - + This is an image of a source control icon + +
-

What is a Git Branch?

+

What is a Git Branch?

Git Branches are like parallel paths within a project's history. They allow developers to work on different features, bug fixes, or experimental changes without affecting the main codebase.

From 5c2972b1ce8a1bad411b2e80ecae9ded3fcc9202 Mon Sep 17 00:00:00 2001 From: Priscilla Mac-Gatus Date: Mon, 16 Sep 2024 19:05:01 +0200 Subject: [PATCH 23/44] Adjusted the height and width of the 1st article image --- Wireframe/css/style.css | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Wireframe/css/style.css b/Wireframe/css/style.css index f8dfe49b..55153f26 100644 --- a/Wireframe/css/style.css +++ b/Wireframe/css/style.css @@ -22,9 +22,15 @@ margin-bottom: 80px; .div_article1:first-child{ text-align: center; +} +.div_article1 img{ + width: 1000px; +height: 500px; } + + .subdivided_div_article1{ border: 1px solid grey; width: 967px; From 91761413651cdcac0aad0d38d8ae6e528bde8b0b Mon Sep 17 00:00:00 2001 From: Priscilla Mac-Gatus Date: Mon, 16 Sep 2024 19:13:52 +0200 Subject: [PATCH 24/44] Adjusted the width and height of the 2nd and 3rd article --- Wireframe/css/style.css | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/Wireframe/css/style.css b/Wireframe/css/style.css index 55153f26..29d53f0e 100644 --- a/Wireframe/css/style.css +++ b/Wireframe/css/style.css @@ -46,18 +46,18 @@ padding: 15px; .div_article2{ border:0.5px solid grey; width: 500px; +height: 420px; position: relative; left: 300px; +top:35px; } .div_article2 img{ -width:450px; +width:500px; } -.subdivided_div_article2{ - border: 1px solid grey; -} + @@ -69,12 +69,13 @@ width:450px; .div_article3{ border:0.5px solid grey; width: 500px; -height:400px; +height:420px; position:relative; -left: 850px; -bottom:500px; +left: 845px; +bottom:385px; } .div_article3 img{ -width:100px; +width:500px; +height: 250px; } \ No newline at end of file From e8a0db023bc4b33425acc64bd49597fa2efda794 Mon Sep 17 00:00:00 2001 From: Priscilla Mac-Gatus Date: Mon, 16 Sep 2024 19:33:28 +0200 Subject: [PATCH 25/44] Re-adjusting height and width of article 1 --- Wireframe/css/style.css | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/Wireframe/css/style.css b/Wireframe/css/style.css index 29d53f0e..32336811 100644 --- a/Wireframe/css/style.css +++ b/Wireframe/css/style.css @@ -21,7 +21,10 @@ margin-bottom: 80px; /* Article 1 */ .div_article1:first-child{ -text-align: center; +border: 1px solid grey; +width: 1000px; +position: relative; +left:300px ; } .div_article1 img{ @@ -29,18 +32,16 @@ text-align: center; height: 500px; } - - -.subdivided_div_article1{ -border: 1px solid grey; -width: 967px; -position: relative; -left: 315px; -bottom:4px; -text-align: left; +.div_article1 h4{ + text-align: left; padding: 15px; } + + + + + /* Article 2 */ .div_article2{ From 4bd359422c9a19ba2dff90aff702f58a1d7d7af1 Mon Sep 17 00:00:00 2001 From: Priscilla Mac-Gatus Date: Mon, 16 Sep 2024 19:38:18 +0200 Subject: [PATCH 26/44] replaced class name for group semantic tags in div tags --- Wireframe/css/style.css | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/Wireframe/css/style.css b/Wireframe/css/style.css index 32336811..a9a5708e 100644 --- a/Wireframe/css/style.css +++ b/Wireframe/css/style.css @@ -32,16 +32,14 @@ left:300px ; height: 500px; } -.div_article1 h4{ - text-align: left; -padding: 15px; +.subdivided_div_article1{ +text-align: left; +padding: 10px; } - - /* Article 2 */ .div_article2{ From 35817ad9026df1d9dd9a6a52a6b65afd927fef05 Mon Sep 17 00:00:00 2001 From: Priscilla Mac-Gatus Date: Mon, 16 Sep 2024 19:47:32 +0200 Subject: [PATCH 27/44] Adjusted the width and positioning of the article 3 --- Wireframe/css/style.css | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Wireframe/css/style.css b/Wireframe/css/style.css index a9a5708e..9424c8aa 100644 --- a/Wireframe/css/style.css +++ b/Wireframe/css/style.css @@ -67,14 +67,14 @@ width:500px; .div_article3{ border:0.5px solid grey; -width: 500px; +width: 455px; height:420px; position:relative; -left: 845px; +left: 848px; bottom:385px; } .div_article3 img{ -width:500px; +width:455px; height: 250px; } \ No newline at end of file From 6727bdc556d5a462ef6d2aa5d843d757ba45250e Mon Sep 17 00:00:00 2001 From: Priscilla Mac-Gatus Date: Mon, 16 Sep 2024 20:04:01 +0200 Subject: [PATCH 28/44] Applied margin css styling to article 2 --- Wireframe/css/style.css | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Wireframe/css/style.css b/Wireframe/css/style.css index 9424c8aa..00d0513a 100644 --- a/Wireframe/css/style.css +++ b/Wireframe/css/style.css @@ -55,7 +55,9 @@ top:35px; width:500px; } - +.subdivided_div_article2{ +margin: 10px; +} From 0d3fdfba80f44eec916a319e0e2d20b775df9385 Mon Sep 17 00:00:00 2001 From: Priscilla Mac-Gatus Date: Mon, 16 Sep 2024 20:07:25 +0200 Subject: [PATCH 29/44] Attached a class attribute to article 3 subdivision div tag and css margin style to 3rd article --- Wireframe/css/style.css | 4 ++++ Wireframe/index.html | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/Wireframe/css/style.css b/Wireframe/css/style.css index 00d0513a..2d898c2e 100644 --- a/Wireframe/css/style.css +++ b/Wireframe/css/style.css @@ -79,4 +79,8 @@ bottom:385px; .div_article3 img{ width:455px; height: 250px; +} + +.subdivided_div_article3{ +margin: 10px; } \ No newline at end of file diff --git a/Wireframe/index.html b/Wireframe/index.html index 082ae1ae..4afcb931 100644 --- a/Wireframe/index.html +++ b/Wireframe/index.html @@ -76,7 +76,7 @@

Importance Of Git

This is an image of a source control icon -
+

What is a Git Branch?

Git Branches are like parallel paths within a project's history. They allow developers to work on different features, bug fixes, or experimental changes without affecting the main codebase.

From 3e8cf3b60a2a107091b319e6a578663e6afbbc27 Mon Sep 17 00:00:00 2001 From: Priscilla Mac-Gatus Date: Mon, 16 Sep 2024 20:42:42 +0200 Subject: [PATCH 30/44] Applied css color and border style to buttons --- Wireframe/css/style.css | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/Wireframe/css/style.css b/Wireframe/css/style.css index 2d898c2e..a294daf7 100644 --- a/Wireframe/css/style.css +++ b/Wireframe/css/style.css @@ -56,7 +56,7 @@ width:500px; } .subdivided_div_article2{ -margin: 10px; +margin: 10px; } @@ -83,4 +83,26 @@ height: 250px; .subdivided_div_article3{ margin: 10px; +} + + + +/* Buttons */ + +.subdivided_div_article1 button { +color:grey; +border-radius: 7px; +border:0.5px solid grey; +} + +.subdivided_div_article2 button { +color:grey; +border-radius: 7px; +border:0.5px solid grey; +} + +.subdivided_div_article3 button { +color:grey; +border-radius: 7px; +border:0.5px solid grey; } \ No newline at end of file From 570870db38afaedd0df403675309b3cc7647d7fa Mon Sep 17 00:00:00 2001 From: Priscilla Mac-Gatus Date: Mon, 16 Sep 2024 20:55:09 +0200 Subject: [PATCH 31/44] Applied font family to 3 articles --- Wireframe/css/style.css | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/Wireframe/css/style.css b/Wireframe/css/style.css index a294daf7..3468e904 100644 --- a/Wireframe/css/style.css +++ b/Wireframe/css/style.css @@ -35,6 +35,8 @@ height: 500px; .subdivided_div_article1{ text-align: left; padding: 10px; +font-family:Georgia, 'Times New Roman', Times, serif; + } @@ -56,7 +58,9 @@ width:500px; } .subdivided_div_article2{ -margin: 10px; +margin: 10px; +font-family:Georgia, 'Times New Roman', Times, serif; + } @@ -82,7 +86,9 @@ height: 250px; } .subdivided_div_article3{ -margin: 10px; +margin: 10px; +font-family:Georgia, 'Times New Roman', Times, serif; + } From 03ef72047573e9eacde0369c5f69548670237456 Mon Sep 17 00:00:00 2001 From: Priscilla Mac-Gatus Date: Mon, 16 Sep 2024 20:58:07 +0200 Subject: [PATCH 32/44] Applied font size to all article titles --- Wireframe/css/style.css | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Wireframe/css/style.css b/Wireframe/css/style.css index 3468e904..a988ffd8 100644 --- a/Wireframe/css/style.css +++ b/Wireframe/css/style.css @@ -18,6 +18,10 @@ margin-bottom: 80px; } +/* Article Title */ +h4{font-size: 19px;} + + /* Article 1 */ .div_article1:first-child{ From f44139dc23c618bf6e65da29b132a59d198778b9 Mon Sep 17 00:00:00 2001 From: Priscilla Mac-Gatus Date: Mon, 16 Sep 2024 21:04:11 +0200 Subject: [PATCH 33/44] Reduced the font size of all the the article titles --- Wireframe/css/style.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Wireframe/css/style.css b/Wireframe/css/style.css index a988ffd8..2d19d433 100644 --- a/Wireframe/css/style.css +++ b/Wireframe/css/style.css @@ -19,7 +19,7 @@ margin-bottom: 80px; /* Article Title */ -h4{font-size: 19px;} +h4{font-size: 18px;} /* Article 1 */ From f17c4f4b8c16485d463b6a9be700ab16c36406dd Mon Sep 17 00:00:00 2001 From: Priscilla Mac-Gatus Date: Mon, 16 Sep 2024 21:59:53 +0200 Subject: [PATCH 34/44] Applied positioning to the header title and description --- Wireframe/css/style.css | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/Wireframe/css/style.css b/Wireframe/css/style.css index 2d19d433..c3df26de 100644 --- a/Wireframe/css/style.css +++ b/Wireframe/css/style.css @@ -1,9 +1,18 @@ + +body{ +background-color:lavenderblush; +} + + + /* Header */ -header{ text-align: center;} -.page_title{font-size: 40px; +.page_title{ +font-size: 40px; margin-bottom: 10px; +position: relative; +left: 500px; } @@ -13,8 +22,8 @@ font-size: large; font-style: italic; margin-top:0px; margin-bottom: 80px; - - +position: relative; +left: 400px; } @@ -28,7 +37,7 @@ h4{font-size: 18px;} border: 1px solid grey; width: 1000px; position: relative; -left:300px ; +left:300px ;; } .div_article1 img{ @@ -40,7 +49,6 @@ height: 500px; text-align: left; padding: 10px; font-family:Georgia, 'Times New Roman', Times, serif; - } From 26475e46722d7ef1adcf059ed158f4a0ea8eb5f7 Mon Sep 17 00:00:00 2001 From: Priscilla Mac-Gatus Date: Mon, 16 Sep 2024 22:09:39 +0200 Subject: [PATCH 35/44] Changed the color of the border --- Wireframe/css/style.css | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Wireframe/css/style.css b/Wireframe/css/style.css index c3df26de..e5f990b7 100644 --- a/Wireframe/css/style.css +++ b/Wireframe/css/style.css @@ -1,6 +1,6 @@ body{ -background-color:lavenderblush; +background-color:rgb(137, 165, 153); } @@ -34,7 +34,7 @@ h4{font-size: 18px;} /* Article 1 */ .div_article1:first-child{ -border: 1px solid grey; +border: 0.5px solid rgb(245, 234, 217); width: 1000px; position: relative; left:300px ;; @@ -57,7 +57,7 @@ font-family:Georgia, 'Times New Roman', Times, serif; /* Article 2 */ .div_article2{ -border:0.5px solid grey; +border:0.5px solid rgb(245, 234, 217); width: 500px; height: 420px; position: relative; @@ -84,7 +84,7 @@ font-family:Georgia, 'Times New Roman', Times, serif; .div_article3{ -border:0.5px solid grey; +border:0.5px solid rgb(245, 234, 217); width: 455px; height:420px; position:relative; From 3e15dd99315588ea67ae1018e52f97b630a0dc27 Mon Sep 17 00:00:00 2001 From: Priscilla Mac-Gatus Date: Mon, 16 Sep 2024 22:13:26 +0200 Subject: [PATCH 36/44] Changed the background color and text color in article and header --- Wireframe/css/style.css | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/Wireframe/css/style.css b/Wireframe/css/style.css index e5f990b7..e72c9113 100644 --- a/Wireframe/css/style.css +++ b/Wireframe/css/style.css @@ -1,6 +1,6 @@ body{ -background-color:rgb(137, 165, 153); +background-color:rgb(63, 54, 65); } @@ -13,6 +13,7 @@ font-size: 40px; margin-bottom: 10px; position: relative; left: 500px; +color: aliceblue; } @@ -24,11 +25,15 @@ margin-top:0px; margin-bottom: 80px; position: relative; left: 400px; +color: aliceblue; } /* Article Title */ -h4{font-size: 18px;} +h4{ +font-size: 18px; +color: aliceblue; +} /* Article 1 */ @@ -49,6 +54,7 @@ height: 500px; text-align: left; padding: 10px; font-family:Georgia, 'Times New Roman', Times, serif; +color: aliceblue; } @@ -72,6 +78,7 @@ width:500px; .subdivided_div_article2{ margin: 10px; font-family:Georgia, 'Times New Roman', Times, serif; +color: aliceblue; } @@ -100,6 +107,7 @@ height: 250px; .subdivided_div_article3{ margin: 10px; font-family:Georgia, 'Times New Roman', Times, serif; +color: aliceblue; } From 004266ed7ddd54a850346005933d7b10ced8358c Mon Sep 17 00:00:00 2001 From: Priscilla Mac-Gatus Date: Mon, 16 Sep 2024 22:27:23 +0200 Subject: [PATCH 37/44] Adjusted css style property of the buttons --- Wireframe/css/style.css | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/Wireframe/css/style.css b/Wireframe/css/style.css index e72c9113..1a34241e 100644 --- a/Wireframe/css/style.css +++ b/Wireframe/css/style.css @@ -116,19 +116,28 @@ color: aliceblue; /* Buttons */ .subdivided_div_article1 button { -color:grey; +color:black; border-radius: 7px; border:0.5px solid grey; +background-color: rgb(181, 207, 183); +height:30px; +width: 100px; } .subdivided_div_article2 button { -color:grey; +color:black; border-radius: 7px; border:0.5px solid grey; +background-color: rgb(181, 207, 183); +height:30px; +width: 100px; } .subdivided_div_article3 button { -color:grey; +color:black; border-radius: 7px; border:0.5px solid grey; +background-color: rgb(181, 207, 183); +height:30px; +width: 100px; } \ No newline at end of file From 826a9e19be373758390da092a5a78ea49460aaf9 Mon Sep 17 00:00:00 2001 From: Priscilla Mac-Gatus Date: Mon, 16 Sep 2024 22:35:09 +0200 Subject: [PATCH 38/44] Re-adjusted position and padding of articles --- Wireframe/css/style.css | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/Wireframe/css/style.css b/Wireframe/css/style.css index 1a34241e..1f19063b 100644 --- a/Wireframe/css/style.css +++ b/Wireframe/css/style.css @@ -52,7 +52,7 @@ height: 500px; .subdivided_div_article1{ text-align: left; -padding: 10px; +padding: 15px; font-family:Georgia, 'Times New Roman', Times, serif; color: aliceblue; } @@ -68,7 +68,9 @@ width: 500px; height: 420px; position: relative; left: 300px; -top:35px; +top:53px; +overflow: hidden; +padding-bottom:15px; } .div_article2 img{ @@ -97,6 +99,9 @@ height:420px; position:relative; left: 848px; bottom:385px; +overflow: hidden; +padding-bottom:15px; + } .div_article3 img{ @@ -108,7 +113,7 @@ height: 250px; margin: 10px; font-family:Georgia, 'Times New Roman', Times, serif; color: aliceblue; - + } From cb108373d930c8dbe5af61f9ab94e6d3ef77fd06 Mon Sep 17 00:00:00 2001 From: Priscilla Mac-Gatus Date: Mon, 16 Sep 2024 22:38:09 +0200 Subject: [PATCH 39/44] Attached target attribute tpo the anchor tags of each element --- Wireframe/index.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Wireframe/index.html b/Wireframe/index.html index 4afcb931..1fb12aca 100644 --- a/Wireframe/index.html +++ b/Wireframe/index.html @@ -38,7 +38,7 @@

What Is Git?

Git is a powerful version control system that enables developers to efficiently manage their code, collaborative development, tracking changes, and undoing mistakes.

- + @@ -60,7 +60,7 @@

Importance Of Git

Git is a revolutionized way developers work. It provides a robust framework for tracking changes to code, collaborating with team members, and managing project history.

- +
@@ -82,7 +82,7 @@

What is a Git Branch?

Git Branches are like parallel paths within a project's history. They allow developers to work on different features, bug fixes, or experimental changes without affecting the main codebase.

- + From c843e9ccdce67c50fea9ae69e10b345ef68db355 Mon Sep 17 00:00:00 2001 From: Priscilla Mac-Gatus Date: Mon, 16 Sep 2024 23:09:16 +0200 Subject: [PATCH 40/44] Applied css style to the footer, fixed it to the bottom of the viewport, added colors, fonts, shadows and padding. --- Wireframe/css/style.css | 15 +++++++++++++++ Wireframe/index.html | 2 ++ 2 files changed, 17 insertions(+) diff --git a/Wireframe/css/style.css b/Wireframe/css/style.css index 1f19063b..59fa6cf9 100644 --- a/Wireframe/css/style.css +++ b/Wireframe/css/style.css @@ -145,4 +145,19 @@ border:0.5px solid grey; background-color: rgb(181, 207, 183); height:30px; width: 100px; +} + + +/* Footer */ + +footer{ +color: rgb(218, 240, 231); +background-color: rgb(71, 63, 80); +text-align: center; +font-size: larger; +padding:30px; +position: fixed; +bottom: 0; +width: 100%; +box-shadow: 0 -2px 5px rgb(126, 126, 126); } \ No newline at end of file diff --git a/Wireframe/index.html b/Wireframe/index.html index 1fb12aca..d9f48cb1 100644 --- a/Wireframe/index.html +++ b/Wireframe/index.html @@ -95,6 +95,8 @@

What is a Git Branch?

+ +