From 2e25becf91b302e121b13cb72df362d1c6d5861a Mon Sep 17 00:00:00 2001 From: Priscilla Mac-Gatus Date: Mon, 16 Sep 2024 14:52:06 +0200 Subject: [PATCH 001/104] 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 002/104] 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 003/104] 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 004/104] 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 005/104] 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 006/104] 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 007/104] 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 008/104] 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 009/104] 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 010/104] 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 011/104] 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 012/104] 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 013/104] 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 014/104] 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 015/104] 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 016/104] 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 017/104] 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 018/104] 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 019/104] 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 020/104] 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 021/104] 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 022/104] 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 023/104] 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 024/104] 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 025/104] 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 026/104] 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 027/104] 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 028/104] 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 029/104] 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 030/104] 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 031/104] 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 032/104] 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 033/104] 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 034/104] 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 035/104] 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 036/104] 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 037/104] 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 038/104] 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 039/104] 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 040/104] 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?

+ +
From beb304a56855573a685ad789e5ad9a9d26afd6d1 Mon Sep 17 00:00:00 2001 From: Priscilla Mac-Gatus Date: Mon, 16 Sep 2024 23:26:03 +0200 Subject: [PATCH 041/104] Attached a comment for body tags, readjusted positioning of page title an description. --- Wireframe/css/style.css | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/Wireframe/css/style.css b/Wireframe/css/style.css index 59fa6cf9..1975da65 100644 --- a/Wireframe/css/style.css +++ b/Wireframe/css/style.css @@ -1,4 +1,6 @@ +/* Body */ + body{ background-color:rgb(63, 54, 65); } @@ -12,7 +14,7 @@ background-color:rgb(63, 54, 65); font-size: 40px; margin-bottom: 10px; position: relative; -left: 500px; +left: 750px; color: aliceblue; } @@ -24,12 +26,21 @@ font-style: italic; margin-top:0px; margin-bottom: 80px; position: relative; -left: 400px; +left: 600px; color: aliceblue; } /* Article Title */ + + +article { +position: relative; +left: 170px; +} + + + h4{ font-size: 18px; color: aliceblue; From 76d94513fd5b31190c167948dfa920103e308ead Mon Sep 17 00:00:00 2001 From: Priscilla Mac-Gatus Date: Mon, 16 Sep 2024 23:31:03 +0200 Subject: [PATCH 042/104] Added new word wireframe --- .vscode/settings.json | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 .vscode/settings.json diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 00000000..83dffe16 --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,5 @@ +{ + "cSpell.words": [ + "Wireframe" + ] +} \ No newline at end of file From 7836a62edcecfe07ca728eec0500023dad773d34 Mon Sep 17 00:00:00 2001 From: Priscilla Mac-Gatus Date: Mon, 16 Sep 2024 23:32:23 +0200 Subject: [PATCH 043/104] Removing extra spaces from Css --- Wireframe/css/style.css | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/Wireframe/css/style.css b/Wireframe/css/style.css index 1975da65..00a9c932 100644 --- a/Wireframe/css/style.css +++ b/Wireframe/css/style.css @@ -92,7 +92,6 @@ width:500px; margin: 10px; font-family:Georgia, 'Times New Roman', Times, serif; color: aliceblue; - } @@ -111,8 +110,7 @@ position:relative; left: 848px; bottom:385px; overflow: hidden; -padding-bottom:15px; - +padding-bottom:15px; } .div_article3 img{ @@ -124,7 +122,6 @@ height: 250px; margin: 10px; font-family:Georgia, 'Times New Roman', Times, serif; color: aliceblue; - } From 83af665efd9af4d25b78a077ee282ceb86d7015e Mon Sep 17 00:00:00 2001 From: Priscilla Mac-Gatus Date: Tue, 17 Sep 2024 09:37:24 +0200 Subject: [PATCH 044/104] Added a meta description and content to the head to the html file --- Wireframe/index.html | 1 + 1 file changed, 1 insertion(+) diff --git a/Wireframe/index.html b/Wireframe/index.html index d9f48cb1..1f10beeb 100644 --- a/Wireframe/index.html +++ b/Wireframe/index.html @@ -1,6 +1,7 @@ + Wireframe From ce820cd643932fbd14bcb7fa5f4d43c01dedb7df Mon Sep 17 00:00:00 2001 From: Priscilla Mac-Gatus Date: Mon, 23 Sep 2024 20:19:53 +0200 Subject: [PATCH 045/104] Added a Roboto font style and link to css file --- Cakes-Co/index.html | 30 +++++++++++++++++++----------- 1 file changed, 19 insertions(+), 11 deletions(-) diff --git a/Cakes-Co/index.html b/Cakes-Co/index.html index 60b1afe1..96c67c7a 100644 --- a/Cakes-Co/index.html +++ b/Cakes-Co/index.html @@ -1,16 +1,24 @@ - - - - - + + + + Responsive Cake webpage - - - - - + + + + - \ No newline at end of file + + + + + + + + From 34307949a0db9b6726c8db0d955625898cc8e8c5 Mon Sep 17 00:00:00 2001 From: Priscilla Mac-Gatus Date: Mon, 23 Sep 2024 21:17:01 +0200 Subject: [PATCH 046/104] Created header tags,with an image logo with a paragraph tag. --- Cakes-Co/index.html | 26 ++++++++++++++++++++++++-- 1 file changed, 24 insertions(+), 2 deletions(-) diff --git a/Cakes-Co/index.html b/Cakes-Co/index.html index 96c67c7a..6f92253f 100644 --- a/Cakes-Co/index.html +++ b/Cakes-Co/index.html @@ -14,11 +14,33 @@ rel="stylesheet" /> - + - + +
+ + + +
+
+ an image of an icon menu +
+ +
+

The best cakes in town delivered to your door

+
+
+
From 24f23ed57e0530361fe25d542ffde66530fb18c6 Mon Sep 17 00:00:00 2001 From: Priscilla Mac-Gatus Date: Mon, 23 Sep 2024 21:18:39 +0200 Subject: [PATCH 047/104] Applied CSS properties to the header logo, menu icon and paragraph. --- Cakes-Co/style.css | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/Cakes-Co/style.css b/Cakes-Co/style.css index 6de1b356..3e0866bc 100644 --- a/Cakes-Co/style.css +++ b/Cakes-Co/style.css @@ -1 +1,27 @@ /* Add your styling here */ + +header { + display: flex; + justify-content: space-between; +} + +.header-img-text { + display: grid; + grid-template-rows: 1fr 1fr; + justify-items: end; +} + +.header-logo img { + width: 150px; + border-radius: 50%; +} + +.header-menu img { + width: 50px; +} + +.header-text { + font-size: 35px; + text-wrap: wrap; + text-align: right; +} From 976af156970cc37e7c194b54074c662a8336414a Mon Sep 17 00:00:00 2001 From: Priscilla Mac-Gatus Date: Mon, 23 Sep 2024 21:45:25 +0200 Subject: [PATCH 048/104] A main section with a h1,p and img tag for the main section --- Cakes-Co/index.html | 23 +++++++++++++++++++++++ Cakes-Co/style.css | 5 ++++- 2 files changed, 27 insertions(+), 1 deletion(-) diff --git a/Cakes-Co/index.html b/Cakes-Co/index.html index 6f92253f..0eecb2a1 100644 --- a/Cakes-Co/index.html +++ b/Cakes-Co/index.html @@ -42,5 +42,28 @@
+ + + +
+

Welcome

+
+

+ Thank you for visiting ShelbyCakes, where we craft beautiful, custom + cakes for every special occasion. From birthdays to weddings, our + delicious creations are designed to bring your cake visions to life. + Explore our flavors and designs, and let us sweeten your celebrations + with a touch of joy! +

+
+ +
+ an black and gold cake +
+
diff --git a/Cakes-Co/style.css b/Cakes-Co/style.css index 3e0866bc..107f5357 100644 --- a/Cakes-Co/style.css +++ b/Cakes-Co/style.css @@ -1,8 +1,9 @@ -/* Add your styling here */ +/* ------------HEADER---------*/ header { display: flex; justify-content: space-between; + background-color: beige; } .header-img-text { @@ -25,3 +26,5 @@ header { text-wrap: wrap; text-align: right; } + +/* ------------HEADER---------*/ From bf04c741cba06f85838124ece54a741d5c399728 Mon Sep 17 00:00:00 2001 From: Priscilla Mac-Gatus Date: Mon, 23 Sep 2024 22:11:21 +0200 Subject: [PATCH 049/104] Change img src,width of header and added a comment in css --- Cakes-Co/index.html | 2 +- Cakes-Co/style.css | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Cakes-Co/index.html b/Cakes-Co/index.html index 0eecb2a1..d4c1c6f2 100644 --- a/Cakes-Co/index.html +++ b/Cakes-Co/index.html @@ -60,7 +60,7 @@

Welcome

an black and gold cake
diff --git a/Cakes-Co/style.css b/Cakes-Co/style.css index 107f5357..ed8a9cbe 100644 --- a/Cakes-Co/style.css +++ b/Cakes-Co/style.css @@ -4,6 +4,7 @@ header { display: flex; justify-content: space-between; background-color: beige; + width: 100%; } .header-img-text { @@ -27,4 +28,4 @@ header { text-align: right; } -/* ------------HEADER---------*/ +/* ------------MAIN---------*/ From 7342ddf80ea0708f4c56da4cdcf2dbc26a50d153 Mon Sep 17 00:00:00 2001 From: Priscilla Mac-Gatus Date: Mon, 23 Sep 2024 22:12:32 +0200 Subject: [PATCH 050/104] Change the alt attribute of main image --- Cakes-Co/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cakes-Co/index.html b/Cakes-Co/index.html index d4c1c6f2..55035c4f 100644 --- a/Cakes-Co/index.html +++ b/Cakes-Co/index.html @@ -61,7 +61,7 @@

Welcome

an black and gold cake
From fd7723c001956cc0a65877222dc3e9f27af52f83 Mon Sep 17 00:00:00 2001 From: Priscilla Mac-Gatus Date: Mon, 23 Sep 2024 22:15:21 +0200 Subject: [PATCH 051/104] Created a collective div for main tag section 1 --- Cakes-Co/index.html | 34 ++++++++++++++++++---------------- 1 file changed, 18 insertions(+), 16 deletions(-) diff --git a/Cakes-Co/index.html b/Cakes-Co/index.html index 55035c4f..b1092ba8 100644 --- a/Cakes-Co/index.html +++ b/Cakes-Co/index.html @@ -46,23 +46,25 @@
-

Welcome

-
-

- Thank you for visiting ShelbyCakes, where we craft beautiful, custom - cakes for every special occasion. From birthdays to weddings, our - delicious creations are designed to bring your cake visions to life. - Explore our flavors and designs, and let us sweeten your celebrations - with a touch of joy! -

-
+
+

Welcome

+
+

+ Thank you for visiting ShelbyCakes, where we craft beautiful, custom + cakes for every special occasion. From birthdays to weddings, our + delicious creations are designed to bring your cake visions to life. + Explore our flavors and designs, and let us sweeten your + celebrations with a touch of joy! +

+
-
- a beautiful cake +
+ a beautiful cake +
From 902cf3142373d883b993eb792a0990d337eb174e Mon Sep 17 00:00:00 2001 From: Priscilla Mac-Gatus Date: Mon, 23 Sep 2024 22:34:41 +0200 Subject: [PATCH 052/104] applied css font and adjusted the size of image.Deleted a div --- Cakes-Co/index.html | 34 ++++++++++++++++------------------ Cakes-Co/style.css | 15 +++++++++++++++ 2 files changed, 31 insertions(+), 18 deletions(-) diff --git a/Cakes-Co/index.html b/Cakes-Co/index.html index b1092ba8..55035c4f 100644 --- a/Cakes-Co/index.html +++ b/Cakes-Co/index.html @@ -46,25 +46,23 @@
-
-

Welcome

-
-

- Thank you for visiting ShelbyCakes, where we craft beautiful, custom - cakes for every special occasion. From birthdays to weddings, our - delicious creations are designed to bring your cake visions to life. - Explore our flavors and designs, and let us sweeten your - celebrations with a touch of joy! -

-
+

Welcome

+
+

+ Thank you for visiting ShelbyCakes, where we craft beautiful, custom + cakes for every special occasion. From birthdays to weddings, our + delicious creations are designed to bring your cake visions to life. + Explore our flavors and designs, and let us sweeten your celebrations + with a touch of joy! +

+
-
- a beautiful cake -
+
+ a beautiful cake
diff --git a/Cakes-Co/style.css b/Cakes-Co/style.css index ed8a9cbe..7e5cedb7 100644 --- a/Cakes-Co/style.css +++ b/Cakes-Co/style.css @@ -29,3 +29,18 @@ header { } /* ------------MAIN---------*/ + +/* -----------------SECTION 1-------------------*/ + +main h1 { + font-size: 30px; +} + +main p { + font-size: 21px; +} + +.main-image { + width: 100%; + height: 400px; +} From 226e181d0522f6b8ad643604a43227ffe9107bdb Mon Sep 17 00:00:00 2001 From: Priscilla Mac-Gatus Date: Mon, 23 Sep 2024 22:37:02 +0200 Subject: [PATCH 053/104] Added comment to divide main into 2 sections --- Cakes-Co/index.html | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Cakes-Co/index.html b/Cakes-Co/index.html index 55035c4f..ba769950 100644 --- a/Cakes-Co/index.html +++ b/Cakes-Co/index.html @@ -46,6 +46,7 @@
+

Welcome

@@ -64,6 +65,7 @@

Welcome

alt="a beautiful cake" />
+
From 647990b78518173fdee0ac89f1d6a0b1afb864e6 Mon Sep 17 00:00:00 2001 From: Priscilla Mac-Gatus Date: Mon, 23 Sep 2024 22:49:13 +0200 Subject: [PATCH 054/104] Inserted 4 img tags with a div in section 2 --- Cakes-Co/index.html | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/Cakes-Co/index.html b/Cakes-Co/index.html index ba769950..7e83c96a 100644 --- a/Cakes-Co/index.html +++ b/Cakes-Co/index.html @@ -66,6 +66,20 @@

Welcome

/>
+
+ + + + +
From ff6b10dc905c56c4867f8728913e4eaeb8df06a4 Mon Sep 17 00:00:00 2001 From: Priscilla Mac-Gatus Date: Mon, 23 Sep 2024 23:07:08 +0200 Subject: [PATCH 055/104] Applied css properties to section 2 alignment and positioning --- Cakes-Co/style.css | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/Cakes-Co/style.css b/Cakes-Co/style.css index 7e5cedb7..a0e19ddf 100644 --- a/Cakes-Co/style.css +++ b/Cakes-Co/style.css @@ -32,6 +32,10 @@ header { /* -----------------SECTION 1-------------------*/ +main { + padding: 7px; +} + main h1 { font-size: 30px; } @@ -42,5 +46,22 @@ main p { .main-image { width: 100%; - height: 400px; +} +/* -----------------SECTION 2-------------------*/ + +.image-of-four { + box-sizing: border-box; + width: 100%; + display: grid; + grid-template-columns: 1fr 1fr; + grid-template-rows: 1fr 1fr; + row-gap: 20px; + column-gap: 20px; + margin-top: 20px; + margin-bottom: 40px; +} + +.image-of-four img { + width: 100%; + height: 100%; } From 4a64010bc905e220aa7d422b6e586a9ec734493e Mon Sep 17 00:00:00 2001 From: Priscilla Mac-Gatus Date: Mon, 23 Sep 2024 23:10:32 +0200 Subject: [PATCH 056/104] Added a footer to the body tag with p tags --- Cakes-Co/index.html | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/Cakes-Co/index.html b/Cakes-Co/index.html index 7e83c96a..5af52256 100644 --- a/Cakes-Co/index.html +++ b/Cakes-Co/index.html @@ -81,5 +81,20 @@

Welcome

/>
- + + + +
+
+

Contact Us

+

📞 907-657-432

+

✉️ shelbycakes@gmail.com

+

📍DownTown St. 267

+
+ +

© (2024) Priscilla. All Rights Reserved.

+ + + + From ab95fb7b5d41e3c1689677b4b20bfea7e5fb9a0c Mon Sep 17 00:00:00 2001 From: Priscilla Mac-Gatus Date: Mon, 23 Sep 2024 23:26:15 +0200 Subject: [PATCH 057/104] Inserted a closing tag for the footer. --- Cakes-Co/index.html | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/Cakes-Co/index.html b/Cakes-Co/index.html index 5af52256..91a43606 100644 --- a/Cakes-Co/index.html +++ b/Cakes-Co/index.html @@ -81,10 +81,10 @@

Welcome

/>
- - -
+
+ +

Contact Us

📞 907-657-432

@@ -93,8 +93,6 @@

Welcome

© (2024) Priscilla. All Rights Reserved.

- - - - +
+ From e2b3f085babeff2f578b51901228a69be577406e Mon Sep 17 00:00:00 2001 From: Priscilla Mac-Gatus Date: Mon, 23 Sep 2024 23:53:37 +0200 Subject: [PATCH 058/104] Applied css style to the footer, adjust css property parameters in the header --- Cakes-Co/index.html | 4 ++-- Cakes-Co/style.css | 38 +++++++++++++++++++++++++++++++++++++- 2 files changed, 39 insertions(+), 3 deletions(-) diff --git a/Cakes-Co/index.html b/Cakes-Co/index.html index 91a43606..fd4c8346 100644 --- a/Cakes-Co/index.html +++ b/Cakes-Co/index.html @@ -84,7 +84,7 @@

Welcome

-
+

Contact Us

📞 907-657-432

@@ -92,7 +92,7 @@

Welcome

📍DownTown St. 267

-

© (2024) Priscilla. All Rights Reserved.

+

© (2024) Priscilla. All Rights Reserved.

diff --git a/Cakes-Co/style.css b/Cakes-Co/style.css index a0e19ddf..c95cd771 100644 --- a/Cakes-Co/style.css +++ b/Cakes-Co/style.css @@ -1,9 +1,13 @@ /* ------------HEADER---------*/ +body { + margin: 0px; +} + header { display: flex; justify-content: space-between; - background-color: beige; + background-color: #d1cfe2; width: 100%; } @@ -11,6 +15,7 @@ header { display: grid; grid-template-rows: 1fr 1fr; justify-items: end; + padding-right: 10px; } .header-logo img { @@ -18,14 +23,22 @@ header { border-radius: 50%; } +.header-menu { + width: 50px; + height: 50px; + padding-top: 20px; +} + .header-menu img { width: 50px; + background-color: #d4afb9; } .header-text { font-size: 35px; text-wrap: wrap; text-align: right; + color: grey; } /* ------------MAIN---------*/ @@ -34,6 +47,7 @@ header { main { padding: 7px; + background-color: #d4afb9; } main h1 { @@ -65,3 +79,25 @@ main p { width: 100%; height: 100%; } + +/* -----------------FOOTER-------------------*/ + +hr { + margin-top: 0px; + margin-bottom: 0px; +} + +footer { + background-color: #c2bfdf; + margin-top: 0; + height: 100%; +} + +.footer-box { + font-size: large; + margin-bottom: 0px; +} + +.copyright { + text-align: center; +} From eaff8168496df2bcbbe242b7ea4b7cce175e0304 Mon Sep 17 00:00:00 2001 From: Priscilla Mac-Gatus Date: Mon, 23 Sep 2024 23:56:19 +0200 Subject: [PATCH 059/104] Added alt attribute to section 2 images --- Cakes-Co/index.html | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Cakes-Co/index.html b/Cakes-Co/index.html index fd4c8346..92379c02 100644 --- a/Cakes-Co/index.html +++ b/Cakes-Co/index.html @@ -69,15 +69,19 @@

Welcome

maroon cake with flower decorations a cake with a wine class and flowers blueberry glass cake green coloured delicious doughnuts
From d13025ff164272e55160c7f55bc1717f50300633 Mon Sep 17 00:00:00 2001 From: Priscilla Mac-Gatus Date: Tue, 24 Sep 2024 00:06:32 +0200 Subject: [PATCH 060/104] Adjust css style in header and main and footer tags --- Cakes-Co/style.css | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/Cakes-Co/style.css b/Cakes-Co/style.css index c95cd771..33585099 100644 --- a/Cakes-Co/style.css +++ b/Cakes-Co/style.css @@ -2,6 +2,7 @@ body { margin: 0px; + background-color: #a79aaf; } header { @@ -18,6 +19,10 @@ header { padding-right: 10px; } +.header-logo { + margin: 10px; +} + .header-logo img { width: 150px; border-radius: 50%; @@ -38,7 +43,7 @@ header { font-size: 35px; text-wrap: wrap; text-align: right; - color: grey; + color: rgb(95, 88, 88); } /* ------------MAIN---------*/ @@ -52,10 +57,12 @@ main { main h1 { font-size: 30px; + color: rgb(95, 88, 88); } main p { font-size: 21px; + color: rgb(46, 44, 44); } .main-image { @@ -88,7 +95,7 @@ hr { } footer { - background-color: #c2bfdf; + background-color: #a79aaf; margin-top: 0; height: 100%; } From e735d051785239c9a402c584c092c2b47df1e007 Mon Sep 17 00:00:00 2001 From: Priscilla Mac-Gatus Date: Tue, 24 Sep 2024 10:08:40 +0200 Subject: [PATCH 061/104] Applied cs header styling to desktop media queries --- Cakes-Co/style.css | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/Cakes-Co/style.css b/Cakes-Co/style.css index 33585099..6dc87e7c 100644 --- a/Cakes-Co/style.css +++ b/Cakes-Co/style.css @@ -108,3 +108,45 @@ footer { .copyright { text-align: center; } + +/* -----------------MEDIA QUERIES(768px)-Medium-------------------*/ +@media (min-width: 768px) { + header { + display: flex; + justify-content: space-between; + background-color: #d1cfe2; + width: 100%; + } + + .header-img-text { + display: grid; + grid-template-rows: 1fr; + padding-right: 10px; + align-items: end; + } + + .header-logo { + margin: 10px; + } + + .header-logo img { + width: 150px; + border-radius: 50%; + } + + .header-menu { + display: none; + } + + .header-menu img { + width: 50px; + background-color: #d4afb9; + } + + .header-text { + font-size: 35px; + text-wrap: wrap; + text-align: right; + color: rgb(95, 88, 88); + } +} From b9746ebbe45e143ba90b2dc6ff146c263f0437f3 Mon Sep 17 00:00:00 2001 From: Priscilla Mac-Gatus Date: Tue, 24 Sep 2024 10:14:02 +0200 Subject: [PATCH 062/104] Created a nav bar list and applied display properties to default screen --- Cakes-Co/index.html | 12 ++++++++++++ Cakes-Co/style.css | 6 ++++++ 2 files changed, 18 insertions(+) diff --git a/Cakes-Co/index.html b/Cakes-Co/index.html index 92379c02..a8ce4851 100644 --- a/Cakes-Co/index.html +++ b/Cakes-Co/index.html @@ -46,6 +46,18 @@
+ + + +

Welcome

diff --git a/Cakes-Co/style.css b/Cakes-Co/style.css index 6dc87e7c..9aa45b5d 100644 --- a/Cakes-Co/style.css +++ b/Cakes-Co/style.css @@ -48,6 +48,12 @@ header { /* ------------MAIN---------*/ +/* ------------NAV BAR---------*/ + +nav { + display: none; +} + /* -----------------SECTION 1-------------------*/ main { From d4025088309d02f518a0f4fa8ab207665853a6c5 Mon Sep 17 00:00:00 2001 From: Priscilla Mac-Gatus Date: Tue, 24 Sep 2024 10:16:01 +0200 Subject: [PATCH 063/104] Added a div to the nav tag with a class --- Cakes-Co/index.html | 16 +++++++++------- Cakes-Co/style.css | 4 ++++ 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/Cakes-Co/index.html b/Cakes-Co/index.html index a8ce4851..78011ccb 100644 --- a/Cakes-Co/index.html +++ b/Cakes-Co/index.html @@ -49,13 +49,15 @@ diff --git a/Cakes-Co/style.css b/Cakes-Co/style.css index 9aa45b5d..346f259f 100644 --- a/Cakes-Co/style.css +++ b/Cakes-Co/style.css @@ -155,4 +155,8 @@ footer { text-align: right; color: rgb(95, 88, 88); } + + nav { + display: inline-block; + } } From f45863723ea11c7c4b6d0470c948b683b9be8e24 Mon Sep 17 00:00:00 2001 From: Priscilla Mac-Gatus Date: Tue, 24 Sep 2024 12:22:19 +0200 Subject: [PATCH 064/104] Added div and class to the nav tag, section1. Applied style properties to body, header, main tags --- Cakes-Co/index.html | 63 ++++++++++++++++++++++++++------------------- Cakes-Co/style.css | 37 ++++++++++++++++++++++++-- 2 files changed, 71 insertions(+), 29 deletions(-) diff --git a/Cakes-Co/index.html b/Cakes-Co/index.html index 78011ccb..e0d3d6cc 100644 --- a/Cakes-Co/index.html +++ b/Cakes-Co/index.html @@ -47,37 +47,46 @@
- - - -

Welcome

-
-

- Thank you for visiting ShelbyCakes, where we craft beautiful, custom - cakes for every special occasion. From birthdays to weddings, our - delicious creations are designed to bring your cake visions to life. - Explore our flavors and designs, and let us sweeten your celebrations - with a touch of joy! -

-
-
- a beautiful cake +
+ + +
+

Welcome

+
+

+ Thank you for visiting ShelbyCakes, where we craft beautiful, + custom cakes for every special occasion. From birthdays to + weddings, our delicious creations are designed to bring your cake + visions to life. Explore our flavors and designs, and let us + sweeten your celebrations with a touch of joy! +

+ +
+ + + + +
+ a beautiful cake +
diff --git a/Cakes-Co/style.css b/Cakes-Co/style.css index 346f259f..cfb9219e 100644 --- a/Cakes-Co/style.css +++ b/Cakes-Co/style.css @@ -117,6 +117,10 @@ footer { /* -----------------MEDIA QUERIES(768px)-Medium-------------------*/ @media (min-width: 768px) { + body { + box-sizing: border-box; + } + header { display: flex; justify-content: space-between; @@ -155,8 +159,37 @@ footer { text-align: right; color: rgb(95, 88, 88); } + /* -----------------MAIN-------------------*/ + .nav-heading-text-image-box { + display: grid; + grid-template-rows: 0.5fr 0.5fr; + background-color: yellow; + } - nav { - display: inline-block; + .heading-text-image-box { + display: flex; + flex-direction: row-reverse; + background-color: orange; + box-sizing: border-box; + } + + .main-image { + width: 500px; + height: 500px; + } + + .heading-text { + width: 80%; + } + .heading-text h1 { + text-align: right; + padding: 10px; + } + + .main-text p { + text-wrap: wrap; + font-size: 20px; + text-align: right; + padding: 10px; } } From d9a88c3abd4a88b17cb9117841b7436a623630dc Mon Sep 17 00:00:00 2001 From: Priscilla Mac-Gatus Date: Tue, 24 Sep 2024 13:26:23 +0200 Subject: [PATCH 065/104] Applied css style to section 2.Adjusted css style to section1 and body --- Cakes-Co/style.css | 31 ++++++++++++++++++++++++++----- 1 file changed, 26 insertions(+), 5 deletions(-) diff --git a/Cakes-Co/style.css b/Cakes-Co/style.css index cfb9219e..824cc0e1 100644 --- a/Cakes-Co/style.css +++ b/Cakes-Co/style.css @@ -119,6 +119,7 @@ footer { @media (min-width: 768px) { body { box-sizing: border-box; + padding: 10px; } header { @@ -160,16 +161,18 @@ footer { color: rgb(95, 88, 88); } /* -----------------MAIN-------------------*/ + + /* -----------------SECTION 1------------------*/ + .nav-heading-text-image-box { display: grid; - grid-template-rows: 0.5fr 0.5fr; - background-color: yellow; + background-color: #d4afb9; + padding-bottom: 0px; } .heading-text-image-box { display: flex; flex-direction: row-reverse; - background-color: orange; box-sizing: border-box; } @@ -183,13 +186,31 @@ footer { } .heading-text h1 { text-align: right; - padding: 10px; } .main-text p { text-wrap: wrap; - font-size: 20px; + font-size: 25px; text-align: right; padding: 10px; } + + /* -----------------SECTION 2------------------*/ + + .image-of-four { + box-sizing: border-box; + width: 100%; + height: 40%; + margin-top: 50px; + padding: 20px; + display: grid; + grid-template-columns: 0.5fr 0.5fr 0.5fr 0.5fr; + grid-template-rows: 0fr 0fr 0fr 0fr; + column-gap: 30px; + } + + .image-of-four img { + width: 100%; + height: 100%; + } } From 4082338e925539de8cac63361ade73ca4104071d Mon Sep 17 00:00:00 2001 From: Priscilla Mac-Gatus Date: Tue, 24 Sep 2024 13:44:29 +0200 Subject: [PATCH 066/104] Change placement of the info-contact outside the div and changed class.Applied footer styling --- Cakes-Co/index.html | 4 +++- Cakes-Co/style.css | 20 ++++++++++++++++++++ 2 files changed, 23 insertions(+), 1 deletion(-) diff --git a/Cakes-Co/index.html b/Cakes-Co/index.html index e0d3d6cc..d26e2e9b 100644 --- a/Cakes-Co/index.html +++ b/Cakes-Co/index.html @@ -112,8 +112,10 @@

Welcome

+ +

Contact Us

-

Contact Us

+

📞 907-657-432

✉️ shelbycakes@gmail.com

📍DownTown St. 267

diff --git a/Cakes-Co/style.css b/Cakes-Co/style.css index 824cc0e1..a7360ef2 100644 --- a/Cakes-Co/style.css +++ b/Cakes-Co/style.css @@ -213,4 +213,24 @@ footer { width: 100%; height: 100%; } + + /* -----------------FOOTER-----------------*/ + + footer { + background-color: #a79aaf; + margin-top: 0; + height: 100%; + } + + .footer-box { + display: flex; + flex-direction: row; + justify-content: center; + font-size: large; + margin-bottom: 0px; + } + + .copyright { + text-align: center; + } } From c30b4f195e0e9fae20581958d91ced7508adc71b Mon Sep 17 00:00:00 2001 From: Priscilla Mac-Gatus Date: Tue, 24 Sep 2024 13:47:34 +0200 Subject: [PATCH 067/104] Applied css style to info-contact to default style --- Cakes-Co/style.css | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Cakes-Co/style.css b/Cakes-Co/style.css index a7360ef2..47fa78ad 100644 --- a/Cakes-Co/style.css +++ b/Cakes-Co/style.css @@ -100,6 +100,11 @@ hr { margin-bottom: 0px; } +.info-contact { + font-size: larger; + font-weight: 800; +} + footer { background-color: #a79aaf; margin-top: 0; From 00f0de1b7c7e2a84f72a1a5322d5dd989696b5c4 Mon Sep 17 00:00:00 2001 From: Priscilla Mac-Gatus Date: Tue, 24 Sep 2024 13:59:53 +0200 Subject: [PATCH 068/104] Applied css style to the footer text --- Cakes-Co/style.css | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/Cakes-Co/style.css b/Cakes-Co/style.css index 47fa78ad..96106f57 100644 --- a/Cakes-Co/style.css +++ b/Cakes-Co/style.css @@ -221,6 +221,11 @@ footer { /* -----------------FOOTER-----------------*/ + .info-contact { + text-align: center; + margin-bottom: 10px; + } + footer { background-color: #a79aaf; margin-top: 0; @@ -233,6 +238,12 @@ footer { justify-content: center; font-size: large; margin-bottom: 0px; + padding: 20px; + } + + .footer-box p { + padding-left: 30px; + text-align: center; } .copyright { From 17cd14788bc32b1637b70c59b5c7e06fdc4eb42f Mon Sep 17 00:00:00 2001 From: Priscilla Mac-Gatus Date: Tue, 24 Sep 2024 14:02:38 +0200 Subject: [PATCH 069/104] Adjusted margin value of section 1 text --- Cakes-Co/style.css | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Cakes-Co/style.css b/Cakes-Co/style.css index 96106f57..dd64b334 100644 --- a/Cakes-Co/style.css +++ b/Cakes-Co/style.css @@ -64,11 +64,13 @@ main { main h1 { font-size: 30px; color: rgb(95, 88, 88); + margin: 10px; } main p { font-size: 21px; color: rgb(46, 44, 44); + margin: 10px; } .main-image { From ded6bbe2621471cd06758b1d9658679f03e5796c Mon Sep 17 00:00:00 2001 From: Priscilla Mac-Gatus Date: Tue, 24 Sep 2024 14:16:27 +0200 Subject: [PATCH 070/104] Applied css style to nav bar --- Cakes-Co/style.css | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/Cakes-Co/style.css b/Cakes-Co/style.css index dd64b334..004ae2a1 100644 --- a/Cakes-Co/style.css +++ b/Cakes-Co/style.css @@ -169,6 +169,26 @@ footer { } /* -----------------MAIN-------------------*/ + nav { + display: flex; + flex-direction: row; + justify-content: end; + padding: 30px; + } + + nav li { + color: rgb(95, 88, 88); + list-style-type: none; + display: inline-block; + padding-left: 20px; + font-weight: 600; + font-size: 16px; + } + + nav li:hover { + color: #a79aaf; + } + /* -----------------SECTION 1------------------*/ .nav-heading-text-image-box { From 194d229f6a8f1a7e19f608d40f50f5f3bc43f195 Mon Sep 17 00:00:00 2001 From: Priscilla Mac-Gatus Date: Tue, 24 Sep 2024 14:33:24 +0200 Subject: [PATCH 071/104] Copied and pasted complete css style for media queries of medium screen to section for large screen and adjusted paragraph size --- Cakes-Co/style.css | 155 ++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 154 insertions(+), 1 deletion(-) diff --git a/Cakes-Co/style.css b/Cakes-Co/style.css index 004ae2a1..5559f4d3 100644 --- a/Cakes-Co/style.css +++ b/Cakes-Co/style.css @@ -123,7 +123,7 @@ footer { } /* -----------------MEDIA QUERIES(768px)-Medium-------------------*/ -@media (min-width: 768px) { +@media (min-width: 900px) { body { box-sizing: border-box; padding: 10px; @@ -215,11 +215,164 @@ footer { text-align: right; } + .main-text p { + text-wrap: wrap; + font-size: 30px; + text-align: right; + padding: 10px; + } + + /* -----------------SECTION 2------------------*/ + + .image-of-four { + box-sizing: border-box; + width: 100%; + height: 40%; + margin-top: 50px; + padding: 20px; + display: grid; + grid-template-columns: 0.5fr 0.5fr 0.5fr 0.5fr; + grid-template-rows: 0fr 0fr 0fr 0fr; + column-gap: 30px; + } + + .image-of-four img { + width: 100%; + height: 100%; + } + + /* -----------------FOOTER-----------------*/ + + .info-contact { + text-align: center; + margin-bottom: 10px; + } + + footer { + background-color: #a79aaf; + margin-top: 0; + height: 100%; + } + + .footer-box { + display: flex; + flex-direction: row; + justify-content: center; + font-size: large; + margin-bottom: 0px; + padding: 20px; + } + + .footer-box p { + padding-left: 30px; + text-align: center; + } + + .copyright { + text-align: center; + } +} +/* -----------------MEDIA QUERIES (900) LARGE-------------------*/ +@media (min-width: 900px) { + body { + box-sizing: border-box; + padding: 10px; + } + + header { + display: flex; + justify-content: space-between; + background-color: #d1cfe2; + width: 100%; + } + + .header-img-text { + display: grid; + grid-template-rows: 1fr; + padding-right: 10px; + align-items: end; + } + + .header-logo { + margin: 10px; + } + + .header-logo img { + width: 150px; + border-radius: 50%; + } + + .header-menu { + display: none; + } + + .header-menu img { + width: 50px; + background-color: #d4afb9; + } + + .header-text { + font-size: 35px; + text-wrap: wrap; + text-align: right; + color: rgb(95, 88, 88); + } + /* -----------------MAIN-------------------*/ + + nav { + display: flex; + flex-direction: row; + justify-content: end; + padding: 30px; + } + + nav li { + color: rgb(95, 88, 88); + list-style-type: none; + display: inline-block; + padding-left: 20px; + font-weight: 600; + font-size: 16px; + } + + nav li:hover { + color: #a79aaf; + } + + /* -----------------SECTION 1------------------*/ + + .nav-heading-text-image-box { + display: grid; + background-color: #d4afb9; + padding-bottom: 0px; + } + + .heading-text-image-box { + display: flex; + flex-direction: row-reverse; + align-items: center; + box-sizing: border-box; + } + + .main-image { + width: 500px; + height: 500px; + } + + .heading-text { + width: 80%; + } + .heading-text h1 { + text-align: right; + color: darkslategray; + } + .main-text p { text-wrap: wrap; font-size: 25px; text-align: right; padding: 10px; + color: dimgray; } /* -----------------SECTION 2------------------*/ From ae9f116e278cad89241b5088514a6632be8a095f Mon Sep 17 00:00:00 2001 From: Priscilla Mac-Gatus Date: Tue, 24 Sep 2024 14:36:23 +0200 Subject: [PATCH 072/104] Adjusted the font color and size for main paragraph text in large screen --- Cakes-Co/style.css | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Cakes-Co/style.css b/Cakes-Co/style.css index 5559f4d3..98e0b42b 100644 --- a/Cakes-Co/style.css +++ b/Cakes-Co/style.css @@ -364,15 +364,15 @@ footer { } .heading-text h1 { text-align: right; - color: darkslategray; + color: rgb(41, 70, 70); } .main-text p { text-wrap: wrap; - font-size: 25px; + font-size: 30px; text-align: right; padding: 10px; - color: dimgray; + color: rgb(63, 63, 63); } /* -----------------SECTION 2------------------*/ From 4799a78ba45e3afd55bf1d4645cb82115ba557e6 Mon Sep 17 00:00:00 2001 From: Priscilla Mac-Gatus Date: Tue, 24 Sep 2024 14:51:34 +0200 Subject: [PATCH 073/104] Adjusted css properties of the nav bar --- Cakes-Co/style.css | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/Cakes-Co/style.css b/Cakes-Co/style.css index 98e0b42b..ed5794f1 100644 --- a/Cakes-Co/style.css +++ b/Cakes-Co/style.css @@ -324,15 +324,23 @@ footer { flex-direction: row; justify-content: end; padding: 30px; + border: 1px solid cornsilk; + background-color: #e0d1d6; + margin-bottom: 30px; + margin-top: 5px; + height: 40px; + + box-shadow: 3px 2px 3px #d1cfe2; } nav li { color: rgb(95, 88, 88); list-style-type: none; display: inline-block; - padding-left: 20px; - font-weight: 600; + padding-bottom: 10px; + font-weight: 700; font-size: 16px; + text-shadow: 2px 2px 2px cornsilk; } nav li:hover { From 57dbb10ba51761e926165b0fda131e5d0663cecc Mon Sep 17 00:00:00 2001 From: Priscilla Mac-Gatus Date: Tue, 24 Sep 2024 14:56:18 +0200 Subject: [PATCH 074/104] Adjusted the background color of nav, header and main tags --- Cakes-Co/style.css | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/Cakes-Co/style.css b/Cakes-Co/style.css index ed5794f1..cabaf051 100644 --- a/Cakes-Co/style.css +++ b/Cakes-Co/style.css @@ -308,7 +308,6 @@ footer { .header-menu img { width: 50px; - background-color: #d4afb9; } .header-text { @@ -347,11 +346,15 @@ footer { color: #a79aaf; } + main { + background-color: white; + } + /* -----------------SECTION 1------------------*/ .nav-heading-text-image-box { display: grid; - background-color: #d4afb9; + background-color: #a39196; padding-bottom: 0px; } From b01453c6d6d7d0aa2f9ab28ec3d8fc4d9c69e210 Mon Sep 17 00:00:00 2001 From: Priscilla Mac-Gatus Date: Tue, 24 Sep 2024 15:02:59 +0200 Subject: [PATCH 075/104] Adjusted color and size property of main heading --- Cakes-Co/index.html | 2 +- Cakes-Co/style.css | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Cakes-Co/index.html b/Cakes-Co/index.html index d26e2e9b..16d44d7c 100644 --- a/Cakes-Co/index.html +++ b/Cakes-Co/index.html @@ -65,7 +65,7 @@
-

Welcome

+

Welcome to ShelbyCakes

Thank you for visiting ShelbyCakes, where we craft beautiful, diff --git a/Cakes-Co/style.css b/Cakes-Co/style.css index cabaf051..721b5aa1 100644 --- a/Cakes-Co/style.css +++ b/Cakes-Co/style.css @@ -339,7 +339,7 @@ footer { padding-bottom: 10px; font-weight: 700; font-size: 16px; - text-shadow: 2px 2px 2px cornsilk; + text-shadow: 4px 2px 5px cornsilk; } nav li:hover { @@ -375,7 +375,9 @@ footer { } .heading-text h1 { text-align: right; - color: rgb(41, 70, 70); + font-size: 70px; + padding: 15px; + color: rgb(52, 50, 53); } .main-text p { From 8afa7973945778209fc42bec40b60513d9a23399 Mon Sep 17 00:00:00 2001 From: Priscilla Mac-Gatus Date: Tue, 24 Sep 2024 15:12:44 +0200 Subject: [PATCH 076/104] Applied css background colors to main default --- Cakes-Co/style.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Cakes-Co/style.css b/Cakes-Co/style.css index 721b5aa1..273b7459 100644 --- a/Cakes-Co/style.css +++ b/Cakes-Co/style.css @@ -58,12 +58,12 @@ nav { main { padding: 7px; - background-color: #d4afb9; + background-color: #a39196; } main h1 { font-size: 30px; - color: rgb(95, 88, 88); + color: rgb(52, 50, 53); margin: 10px; } From 40ce80a9d2bff771becb8486df7e126140529d21 Mon Sep 17 00:00:00 2001 From: Priscilla Mac-Gatus Date: Tue, 24 Sep 2024 15:14:54 +0200 Subject: [PATCH 077/104] Adjusted margin property of images in mobile screen --- Cakes-Co/style.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cakes-Co/style.css b/Cakes-Co/style.css index 273b7459..948978b2 100644 --- a/Cakes-Co/style.css +++ b/Cakes-Co/style.css @@ -86,7 +86,7 @@ main p { grid-template-rows: 1fr 1fr; row-gap: 20px; column-gap: 20px; - margin-top: 20px; + margin-top: 50px; margin-bottom: 40px; } From f3e3e776f94d54dd90ac2d7b71a8780bfff9ce8a Mon Sep 17 00:00:00 2001 From: Priscilla Mac-Gatus Date: Tue, 24 Sep 2024 21:24:38 +0200 Subject: [PATCH 078/104] Applied border radius to the images in desktop mode --- Cakes-Co/style.css | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Cakes-Co/style.css b/Cakes-Co/style.css index 948978b2..413813e7 100644 --- a/Cakes-Co/style.css +++ b/Cakes-Co/style.css @@ -206,6 +206,7 @@ footer { .main-image { width: 500px; height: 500px; + border-radius: 15px; } .heading-text { @@ -239,6 +240,7 @@ footer { .image-of-four img { width: 100%; height: 100%; + border-radius: 15px; } /* -----------------FOOTER-----------------*/ From 76052ace5815a5df59d96304645a3effa781e0a1 Mon Sep 17 00:00:00 2001 From: Priscilla Mac-Gatus Date: Tue, 24 Sep 2024 21:40:58 +0200 Subject: [PATCH 079/104] Corrected the error in the first breakpoint --- Cakes-Co/style.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cakes-Co/style.css b/Cakes-Co/style.css index 413813e7..f50959cc 100644 --- a/Cakes-Co/style.css +++ b/Cakes-Co/style.css @@ -123,7 +123,7 @@ footer { } /* -----------------MEDIA QUERIES(768px)-Medium-------------------*/ -@media (min-width: 900px) { +@media (min-width: 768px) { body { box-sizing: border-box; padding: 10px; From 503b4ccc14bb4d86d9f7040f7e987b0efb27a2b1 Mon Sep 17 00:00:00 2001 From: Priscilla Mac-Gatus Date: Thu, 26 Sep 2024 16:01:11 +0200 Subject: [PATCH 080/104] Added the requirements in aa comment in form. --- Form-Controls/index.html | 58 ++++++++++++++++++++++------------------ 1 file changed, 32 insertions(+), 26 deletions(-) diff --git a/Form-Controls/index.html b/Form-Controls/index.html index 4344b144..ed7f584f 100644 --- a/Form-Controls/index.html +++ b/Form-Controls/index.html @@ -1,28 +1,34 @@ - - - - My form exercise - - - - - -

-

Product Pick

-
-
-
- - -
- -
-
- -

By HOMEWORK SOLUTION

-
- - - \ No newline at end of file + + + + My form exercise + + + + + +
+

Product Pick

+
+
+
+ + + +
+
+
+ +

By Priscilla

+
+ + From ff31b6c46d1a815d87825e3d3e398fe0711c502b Mon Sep 17 00:00:00 2001 From: Priscilla Mac-Gatus Date: Thu, 26 Sep 2024 16:09:13 +0200 Subject: [PATCH 081/104] Added a name field with a label and input in a div for fullname. Added new word to workspace --- .vscode/settings.json | 6 ++---- Form-Controls/index.html | 42 ++++++++++++++++++++++++++++++++-------- 2 files changed, 36 insertions(+), 12 deletions(-) diff --git a/.vscode/settings.json b/.vscode/settings.json index 83dffe16..a3b3444e 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1,5 +1,3 @@ { - "cSpell.words": [ - "Wireframe" - ] -} \ No newline at end of file + "cSpell.words": ["fullname", "Wireframe"] +} diff --git a/Form-Controls/index.html b/Form-Controls/index.html index ed7f584f..a8cc70c1 100644 --- a/Form-Controls/index.html +++ b/Form-Controls/index.html @@ -16,14 +16,40 @@

Product Pick

- + + + + + + + +

Confirm Your Name and Email

+ +
+ + +
+ + + + + + + + + + + + + +
From ae248802110310056822507e0abc9a38716e2418 Mon Sep 17 00:00:00 2001 From: Priscilla Mac-Gatus Date: Thu, 26 Sep 2024 16:18:10 +0200 Subject: [PATCH 082/104] Created an email field with a heading,input and label tags in a div --- Form-Controls/index.html | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Form-Controls/index.html b/Form-Controls/index.html index a8cc70c1..9b8f74bf 100644 --- a/Form-Controls/index.html +++ b/Form-Controls/index.html @@ -37,6 +37,12 @@

Confirm Your Name and Email

+ + + From 711abba2ca350fc3d63a2329a52ce498173bd671 Mon Sep 17 00:00:00 2001 From: Priscilla Mac-Gatus Date: Thu, 26 Sep 2024 16:29:46 +0200 Subject: [PATCH 083/104] Inserted a color field section of an h3 tag, 3 colors with radio button options in div tags and comment per color --- Form-Controls/index.html | 62 ++++++++++++++++++++++++++-------------- 1 file changed, 40 insertions(+), 22 deletions(-) diff --git a/Form-Controls/index.html b/Form-Controls/index.html index 9b8f74bf..5951e524 100644 --- a/Form-Controls/index.html +++ b/Form-Controls/index.html @@ -8,17 +8,17 @@ - -
+ +

Product Pick

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

Confirm Your Name and Email

-

Confirm Your Name and Email

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

Choose Shirt Color

+
+ +
+ + +
+ +
+ + +
+ +
+ + +
+
From b2446d92ff22e99fe94e6aeddc44553230cc8fd2 Mon Sep 17 00:00:00 2001 From: Priscilla Mac-Gatus Date: Thu, 26 Sep 2024 16:38:00 +0200 Subject: [PATCH 084/104] Added a size section.Each size with a div an input and label, and a comment. --- Form-Controls/index.html | 41 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/Form-Controls/index.html b/Form-Controls/index.html index 5951e524..06d48506 100644 --- a/Form-Controls/index.html +++ b/Form-Controls/index.html @@ -67,6 +67,47 @@

Choose Shirt Color

+ +

Choose Shirt Size

+ +
+ + +
+ + +
+ +
+ + +
+ + +
+ + +
+ + +
+ + +
+ + +
+ + +
+ + +
+ + +
+
+ From 636a41f31e37441183d9d11316ea3dabd1da205d Mon Sep 17 00:00:00 2001 From: Priscilla Mac-Gatus Date: Thu, 26 Sep 2024 16:41:32 +0200 Subject: [PATCH 085/104] Added a delivery date and button field with label and input tags --- Form-Controls/index.html | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/Form-Controls/index.html b/Form-Controls/index.html index 06d48506..e493b820 100644 --- a/Form-Controls/index.html +++ b/Form-Controls/index.html @@ -107,6 +107,18 @@

Choose Shirt Size

+ +

Select Delivery Date

+
+ + +
+ + + +
+ +
From 015e43767b79e92716867fd81f8896083e4a06af Mon Sep 17 00:00:00 2001 From: Priscilla Mac-Gatus Date: Thu, 26 Sep 2024 16:43:17 +0200 Subject: [PATCH 086/104] Replaced XTRA with EXTRA --- Form-Controls/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Form-Controls/index.html b/Form-Controls/index.html index e493b820..84d89fb9 100644 --- a/Form-Controls/index.html +++ b/Form-Controls/index.html @@ -75,7 +75,7 @@

Choose Shirt Size

- +
From f10a0323073bb21312d4255b8c7e7547b3fbb82e Mon Sep 17 00:00:00 2001 From: Priscilla Mac-Gatus Date: Thu, 26 Sep 2024 16:48:52 +0200 Subject: [PATCH 087/104] Applied css font style to heading h1 --- Form-Controls/styles.css | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Form-Controls/styles.css b/Form-Controls/styles.css index e69de29b..76ae854b 100644 --- a/Form-Controls/styles.css +++ b/Form-Controls/styles.css @@ -0,0 +1,4 @@ +h1 { + font-size: 50px; + text-align: center; +} From c1e5c2cd6cc97dfe43d56c62e2afa89b84951245 Mon Sep 17 00:00:00 2001 From: Priscilla Mac-Gatus Date: Thu, 26 Sep 2024 16:53:05 +0200 Subject: [PATCH 088/104] Applied display properties to the body tags --- Form-Controls/styles.css | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Form-Controls/styles.css b/Form-Controls/styles.css index 76ae854b..5dfeb864 100644 --- a/Form-Controls/styles.css +++ b/Form-Controls/styles.css @@ -1,3 +1,9 @@ +body { + display: flex; + flex-direction: column; + align-items: center; +} + h1 { font-size: 50px; text-align: center; From 42dbaf37bee5ed8b148d2c9ca5bca7153d0e697c Mon Sep 17 00:00:00 2001 From: Priscilla Mac-Gatus Date: Thu, 26 Sep 2024 16:55:13 +0200 Subject: [PATCH 089/104] Applied font properties to h3 tags --- Form-Controls/styles.css | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Form-Controls/styles.css b/Form-Controls/styles.css index 5dfeb864..f7a63e3e 100644 --- a/Form-Controls/styles.css +++ b/Form-Controls/styles.css @@ -8,3 +8,8 @@ h1 { font-size: 50px; text-align: center; } + +h3 { + font-size: 25px; + padding-bottom: 20px; +} From 1ba4bc83779ce9a2186b1b46f68a9f0153924818 Mon Sep 17 00:00:00 2001 From: Priscilla Mac-Gatus Date: Thu, 26 Sep 2024 16:59:16 +0200 Subject: [PATCH 090/104] Inserted an hr tag between header and main and applied css font style to the label tags --- Form-Controls/index.html | 5 ++++- Form-Controls/styles.css | 4 ++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/Form-Controls/index.html b/Form-Controls/index.html index 84d89fb9..068f3aa4 100644 --- a/Form-Controls/index.html +++ b/Form-Controls/index.html @@ -11,7 +11,10 @@

Product Pick

-
+ + +
+
diff --git a/Form-Controls/styles.css b/Form-Controls/styles.css index f7a63e3e..0c3f002e 100644 --- a/Form-Controls/styles.css +++ b/Form-Controls/styles.css @@ -13,3 +13,7 @@ h3 { font-size: 25px; padding-bottom: 20px; } + +label { + font-size: 23px; +} From 145e51ad3ce60aa0c55ea5ee6b6cdc144cd69923 Mon Sep 17 00:00:00 2001 From: Priscilla Mac-Gatus Date: Thu, 26 Sep 2024 17:06:18 +0200 Subject: [PATCH 091/104] Added css property to fullname and email.Adjusted margin value of h3 elements --- Form-Controls/styles.css | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/Form-Controls/styles.css b/Form-Controls/styles.css index 0c3f002e..eb9a29dd 100644 --- a/Form-Controls/styles.css +++ b/Form-Controls/styles.css @@ -11,9 +11,21 @@ h1 { h3 { font-size: 25px; - padding-bottom: 20px; + margin-top: 50px; } label { font-size: 23px; } + +#fullname { + width: 250px; + height: 30px; + margin-bottom: 15px; +} + +#email { + width: 250px; + height: 30px; + padding-left: 50px; +} From 2e5bf09dfb75684cd89a4bc2cd696c202a2b45b3 Mon Sep 17 00:00:00 2001 From: Priscilla Mac-Gatus Date: Thu, 26 Sep 2024 17:12:42 +0200 Subject: [PATCH 092/104] Applied css border properties to form and input elements --- Form-Controls/index.html | 3 ++- Form-Controls/styles.css | 12 +++++++++++- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/Form-Controls/index.html b/Form-Controls/index.html index 068f3aa4..ebb848d6 100644 --- a/Form-Controls/index.html +++ b/Form-Controls/index.html @@ -11,9 +11,10 @@

Product Pick

+
-
+
diff --git a/Form-Controls/styles.css b/Form-Controls/styles.css index eb9a29dd..c8598152 100644 --- a/Form-Controls/styles.css +++ b/Form-Controls/styles.css @@ -4,6 +4,12 @@ body { align-items: center; } +form { + border: 3px solid grey; + width: 100%; + padding: 30px; +} + h1 { font-size: 50px; text-align: center; @@ -11,13 +17,17 @@ h1 { h3 { font-size: 25px; - margin-top: 50px; + margin-top: 5px; } label { font-size: 23px; } +input { + margin-bottom: 15px; +} + #fullname { width: 250px; height: 30px; From b8402840b2f719ba79d6cdf95aaf652a7130a2bb Mon Sep 17 00:00:00 2001 From: Priscilla Mac-Gatus Date: Thu, 26 Sep 2024 17:31:18 +0200 Subject: [PATCH 093/104] Removed hr tag, adjusted border properties of form, corrected margin properties of h1, applied css properties to the date,button and footer --- Form-Controls/index.html | 2 +- Form-Controls/styles.css | 20 +++++++++++++++++++- 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/Form-Controls/index.html b/Form-Controls/index.html index ebb848d6..648b83db 100644 --- a/Form-Controls/index.html +++ b/Form-Controls/index.html @@ -11,7 +11,7 @@

Product Pick

-
+
diff --git a/Form-Controls/styles.css b/Form-Controls/styles.css index c8598152..751c14ee 100644 --- a/Form-Controls/styles.css +++ b/Form-Controls/styles.css @@ -5,12 +5,13 @@ body { } form { - border: 3px solid grey; + border: 1px double grey; width: 100%; padding: 30px; } h1 { + margin-top: 2px; font-size: 50px; text-align: center; } @@ -39,3 +40,20 @@ input { height: 30px; padding-left: 50px; } + +#date { + font-size: 18px; + color: grey; + padding: 5px; +} + +.submit { + width: 100px; + height: 30px; + margin: 25px; + font-size: 19px; +} + +footer h2 { + font-size: 17px; +} From c830082eab91c97705d9ff8d2518ffdd97894613 Mon Sep 17 00:00:00 2001 From: Priscilla Mac-Gatus Date: Thu, 26 Sep 2024 17:32:02 +0200 Subject: [PATCH 094/104] Corrected error with extra extra large id --- Form-Controls/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Form-Controls/index.html b/Form-Controls/index.html index 648b83db..22edd77f 100644 --- a/Form-Controls/index.html +++ b/Form-Controls/index.html @@ -107,7 +107,7 @@

Choose Shirt Size

- +
From 3e029c3527f367da2db5debc6595853dcb1ab0a1 Mon Sep 17 00:00:00 2001 From: Priscilla Mac-Gatus Date: Thu, 26 Sep 2024 17:34:59 +0200 Subject: [PATCH 095/104] Added an autocomplete to the email input --- Form-Controls/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Form-Controls/index.html b/Form-Controls/index.html index 22edd77f..365a492a 100644 --- a/Form-Controls/index.html +++ b/Form-Controls/index.html @@ -43,7 +43,7 @@

Confirm Your Name and Email

From 61cb690712560a403dcfdba960df8cdd451a375a Mon Sep 17 00:00:00 2001 From: Priscilla Mac-Gatus Date: Thu, 26 Sep 2024 18:27:35 +0200 Subject: [PATCH 096/104] Applied css background property to body and form tags, adjusted color property of heading tags --- Form-Controls/styles.css | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/Form-Controls/styles.css b/Form-Controls/styles.css index 751c14ee..c6c23b81 100644 --- a/Form-Controls/styles.css +++ b/Form-Controls/styles.css @@ -2,23 +2,32 @@ body { display: flex; flex-direction: column; align-items: center; + background-image: url("https://i.pinimg.com/736x/60/20/6d/60206d5bdac65259ed1bd1c202dee4e3.jpg"); + background-position: center; + background-size: cover, 10px; + background-repeat: no-repeat; } form { border: 1px double grey; width: 100%; padding: 30px; + background-color: hsl(32, 74%, 63%); + box-shadow: 5px 2px 5px grey; + border-radius: 5px; } h1 { margin-top: 2px; font-size: 50px; text-align: center; + color: white; } h3 { font-size: 25px; margin-top: 5px; + color: rgb(78, 78, 78); } label { From cda345f30b7520db806460abb6e0d8bfa29645f4 Mon Sep 17 00:00:00 2001 From: Priscilla Mac-Gatus Date: Thu, 26 Sep 2024 18:36:58 +0200 Subject: [PATCH 097/104] Changed heading tags and date text color --- Form-Controls/index.html | 2 +- Form-Controls/styles.css | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/Form-Controls/index.html b/Form-Controls/index.html index 365a492a..2082ea39 100644 --- a/Form-Controls/index.html +++ b/Form-Controls/index.html @@ -33,7 +33,7 @@

Product Pick

-

Confirm Your Name and Email

+

Confirm Your Name and Email

diff --git a/Form-Controls/styles.css b/Form-Controls/styles.css index c6c23b81..e7666020 100644 --- a/Form-Controls/styles.css +++ b/Form-Controls/styles.css @@ -52,7 +52,6 @@ input { #date { font-size: 18px; - color: grey; padding: 5px; } From 3c5d04487c721d0ef210d648536688d6817fece7 Mon Sep 17 00:00:00 2001 From: Priscilla Mac-Gatus Date: Thu, 26 Sep 2024 18:38:06 +0200 Subject: [PATCH 098/104] Applied css properties to h2 --- Form-Controls/styles.css | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Form-Controls/styles.css b/Form-Controls/styles.css index e7666020..13b0d70a 100644 --- a/Form-Controls/styles.css +++ b/Form-Controls/styles.css @@ -24,6 +24,12 @@ h1 { color: white; } +h2 { + font-size: 25px; + margin-top: 5px; + color: rgb(78, 78, 78); +} + h3 { font-size: 25px; margin-top: 5px; From 3fcca1f39bf5ca51998f1a420f686dd14c93a41d Mon Sep 17 00:00:00 2001 From: Priscilla Mac-Gatus Date: Thu, 26 Sep 2024 19:37:16 +0200 Subject: [PATCH 099/104] Applied color and margin css properties to the form, heading, label and footer --- Form-Controls/styles.css | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/Form-Controls/styles.css b/Form-Controls/styles.css index 13b0d70a..1e0463e5 100644 --- a/Form-Controls/styles.css +++ b/Form-Controls/styles.css @@ -9,11 +9,9 @@ body { } form { - border: 1px double grey; width: 100%; padding: 30px; - background-color: hsl(32, 74%, 63%); - box-shadow: 5px 2px 5px grey; + background-color: rgba(82, 58, 22, 0.7); border-radius: 5px; } @@ -22,22 +20,24 @@ h1 { font-size: 50px; text-align: center; color: white; + text-shadow: 2px 2px 6px black; } h2 { font-size: 25px; margin-top: 5px; - color: rgb(78, 78, 78); + color: rgb(255, 255, 255); } h3 { font-size: 25px; margin-top: 5px; - color: rgb(78, 78, 78); + color: rgb(245, 240, 240); } label { font-size: 23px; + color: orange; } input { @@ -69,5 +69,6 @@ input { } footer h2 { - font-size: 17px; + margin-top: 40px; + font-size: 19px; } From f232e4e77ae95e27c11b47edaeb99bd91e935693 Mon Sep 17 00:00:00 2001 From: Priscilla Mac-Gatus Date: Thu, 26 Sep 2024 19:44:12 +0200 Subject: [PATCH 100/104] Applied css font and color properties to the input elements --- Form-Controls/styles.css | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Form-Controls/styles.css b/Form-Controls/styles.css index 1e0463e5..41a202f9 100644 --- a/Form-Controls/styles.css +++ b/Form-Controls/styles.css @@ -42,6 +42,8 @@ label { input { margin-bottom: 15px; + accent-color: rgb(7, 7, 7); + font-size: 20px; } #fullname { From 89e83baaff61022f1b358ef53f9df94789b49d24 Mon Sep 17 00:00:00 2001 From: Priscilla Mac-Gatus Date: Thu, 26 Sep 2024 19:53:27 +0200 Subject: [PATCH 101/104] Applied css font, color and border properties to the body, button and footer --- Form-Controls/styles.css | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/Form-Controls/styles.css b/Form-Controls/styles.css index 41a202f9..db0d8c36 100644 --- a/Form-Controls/styles.css +++ b/Form-Controls/styles.css @@ -1,4 +1,5 @@ body { + font-family: Georgia, "Times New Roman", Times, serif; display: flex; flex-direction: column; align-items: center; @@ -64,13 +65,19 @@ input { } .submit { - width: 100px; - height: 30px; + width: 130px; + height: 35px; margin: 25px; font-size: 19px; + background-color: white; + color: black; + border: 1px solid rgb(231, 202, 140); + border-radius: 4px; } footer h2 { margin-top: 40px; font-size: 19px; + color: black; + font-weight: 800; } From 69228650802f9089b430f1af10c3cdbbeef62dc4 Mon Sep 17 00:00:00 2001 From: Priscilla Mac-Gatus Date: Thu, 26 Sep 2024 21:00:44 +0200 Subject: [PATCH 102/104] changed test shadow of h1 heading tag --- Form-Controls/styles.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Form-Controls/styles.css b/Form-Controls/styles.css index db0d8c36..08e7a8eb 100644 --- a/Form-Controls/styles.css +++ b/Form-Controls/styles.css @@ -21,7 +21,7 @@ h1 { font-size: 50px; text-align: center; color: white; - text-shadow: 2px 2px 6px black; + text-shadow: 2px 2px 6px orange; } h2 { From be0e924fd29e28a3fbae1d8c60f216f4651b9340 Mon Sep 17 00:00:00 2001 From: Priscilla Mac-Gatus Date: Thu, 26 Sep 2024 21:07:23 +0200 Subject: [PATCH 103/104] Changed the text properties of the header --- Form-Controls/styles.css | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/Form-Controls/styles.css b/Form-Controls/styles.css index 08e7a8eb..9054e229 100644 --- a/Form-Controls/styles.css +++ b/Form-Controls/styles.css @@ -20,11 +20,10 @@ h1 { margin-top: 2px; font-size: 50px; text-align: center; - color: white; - text-shadow: 2px 2px 6px orange; + color: black; + text-shadow: 2px 2px 7px white; } - -h2 { +s h2 { font-size: 25px; margin-top: 5px; color: rgb(255, 255, 255); From eb48b6f4ba54acdc6ad3e05f9196e755a219b7aa Mon Sep 17 00:00:00 2001 From: Priscilla Mac-Gatus Date: Thu, 26 Sep 2024 22:35:04 +0200 Subject: [PATCH 104/104] Added a font color to h2 --- Form-Controls/styles.css | 1 + 1 file changed, 1 insertion(+) diff --git a/Form-Controls/styles.css b/Form-Controls/styles.css index 9054e229..67319ee7 100644 --- a/Form-Controls/styles.css +++ b/Form-Controls/styles.css @@ -1,5 +1,6 @@ body { font-family: Georgia, "Times New Roman", Times, serif; + color: white; display: flex; flex-direction: column; align-items: center;