From 53f0cfb17a446f27f714820bd04595d4378ec731 Mon Sep 17 00:00:00 2001 From: FarancisGH Date: Mon, 26 Jan 2026 21:58:09 +0000 Subject: [PATCH 1/6] Modifications made on the wireframe design and layout. --- Wireframe/index.html | 39 +++++++++++++-------- Wireframe/style.css | 83 ++++++++++++++------------------------------ 2 files changed, 51 insertions(+), 71 deletions(-) diff --git a/Wireframe/index.html b/Wireframe/index.html index 0e014e535..0d7f5b976 100644 --- a/Wireframe/index.html +++ b/Wireframe/index.html @@ -7,27 +7,38 @@ -
-

Wireframe

+
+

ReadMe, Wireframe and Branches

- This is the default, provided code and no changes have been made yet. + Below we will be discussing on what the purpose of a Readme file is, the purpose of a wireframe and what a branch is and what a branch in git is. But first, lets look at this image.

-
+
- -

Title

+ Image of a ReadMe file +

ReadMe

- Lorem ipsum dolor sit amet consectetur adipisicing elit. Quisquam, - voluptates. Quisquam, voluptates. + A ReadMe file is a document that provides essential information about a project, software, or repository. It serves as a guide for users and developers, offering details such as installation instructions, usage guidelines, features, and licensing information. The primary purpose of a ReadMe file is to help users understand what the project is about, how to use it effectively, and how to contribute if applicable.

- Read more + Click to learn more +
+
+ Image of a wireframe +

Wireframe

+

+ A wireframe is a visual representation or blueprint of a website, application, or user interface. It outlines the basic structure, layout, and functionality of a design without focusing on detailed aesthetics. Wireframes are typically created in the early stages of the design process to help designers, developers, and stakeholders visualize the overall structure and flow of a project. They often include placeholders for content, navigation elements, and interactive features, allowing for easy communication and collaboration among team members before moving on to more detailed design and development phases. +

+ Click to learn more +
+
+ Image of git branches +

Branches

+

+ In version control systems like Git, a branch is a separate line of development that allows multiple developers to work on different features or fixes simultaneously without affecting the main codebase. Branches enable teams to isolate changes, experiment with new ideas, and collaborate more effectively. When a feature or fix is complete, the changes made in the branch can be merged back into the main branch (often called "main" or "master"). This process helps maintain a clean and stable codebase while allowing for parallel development efforts. +

+ Click to learn more.
- + diff --git a/Wireframe/style.css b/Wireframe/style.css index be835b6c7..e782959b1 100644 --- a/Wireframe/style.css +++ b/Wireframe/style.css @@ -1,89 +1,58 @@ -/* Here are some starter styles -You can edit these or replace them entirely -It's showing you a common way to organise CSS -And includes solutions to common problems -As well as useful links to learn more */ - -/* ====== Design Palette ====== - This is our "design palette". - It sets out the colours, fonts, styles etc to be used in this design - At work, a designer will give these to you based on the corporate brand, but while you are learning - You can design it yourself if you like - Inspect the starter design with Devtools - Click on the colour swatches to see what is happening - I've put some useful CSS you won't have learned yet - For you to explore and play with if you are interested - https://web.dev/articles/min-max-clamp - https://scrimba.com/learn-css-variables-c026 -====== Design Palette ====== */ :root { --paper: oklch(7 0 0); --ink: color-mix(in oklab, var(--color) 5%, black); --font: 100%/1.5 system-ui; --space: clamp(6px, 6px + 2vw, 15px); - --line: 1px solid; + --line: 3px solid; word-spacing: 1px; --container: 1280px; + padding: 50px; + width: 100%; +} + +.header { + text-align: center; + margin-bottom: 0px; + width : 90%; } -/* ====== Base Elements ====== - General rules for basic HTML elements in any context */ body { background: var(--paper); color: var(--ink); font: var(--font); + padding: 10px; + width: 100%; } a { - padding: var(--space); + padding: 15px; + border-radius: 5px; border: var(--line); max-width: fit-content; } -img, -svg { - width: 100%; - object-fit: cover; -} -/* ====== Site Layout ====== -Setting the overall rules for page regions -https://www.w3.org/WAI/tutorials/page-structure/regions/ -*/ -main { - max-width: var(--container); - margin: 0 auto calc(var(--space) * 4) auto; -} -footer { - position: fixed; - bottom: 0; - text-align: center; -} -/* ====== Articles Grid Layout ==== -Setting the rules for how articles are placed in the main element. -Inspect this in Devtools and click the "grid" button in the Elements view -Play with the options that come up. -https://developer.chrome.com/docs/devtools/css/grid -https://gridbyexample.com/learn/ -*/ main { display: grid; + padding: 50px; + border : 50px solid var(--paper); + color: black; grid-template-columns: 1fr 1fr; gap: var(--space); > *:first-child { grid-column: span 2; } } -/* ====== Article Layout ====== -Setting the rules for how elements are placed in the article. -Now laying out just the INSIDE of the repeated card/article design. -Keeping things orderly and separate is the key to good, simple CSS. -*/ article { - border: var(--line); - padding-bottom: var(--space); + border: var(--line); + width: 100%; + border-radius: 12px; + padding-bottom: 20px; text-align: left; + padding: 7px; display: grid; - grid-template-columns: var(--space) 1fr var(--space); + grid: template columns 1fr; var(--space) 2fr var(--space); > * { - grid-column: 2/3; + grid-column: 1; } > img { - grid-column: span 3; + grid-column: span 100%; + width: 400px; + justify-self: center; } } From 23b2dc63aaad4142a7a411822fbb90ef07bf931b Mon Sep 17 00:00:00 2001 From: FarancisGH Date: Sat, 7 Feb 2026 16:12:04 +0000 Subject: [PATCH 2/6] Editing and adjustments done on the html and css files as requested. --- Wireframe/index.html | 102 ++++++++++++++++++++++++++----------------- Wireframe/style.css | 39 +++++++++++------ 2 files changed, 88 insertions(+), 53 deletions(-) diff --git a/Wireframe/index.html b/Wireframe/index.html index 0d7f5b976..35911ba45 100644 --- a/Wireframe/index.html +++ b/Wireframe/index.html @@ -1,44 +1,68 @@ - - - - Wireframe - - - -
-

ReadMe, Wireframe and Branches

+ + + + + Wireframe + + + + +
+

ReadMe, Wireframe and Branches

+

+ Below we will be discussing on what the purpose of a Readme file is, + the purpose of a wireframe and what a branch is and what a branch + in git is. But first, lets look at this image. +

+
+
+
+ Image of a ReadMe file +

ReadMe

+

+ A ReadMe file is a document that provides essential information about a project, software, or repository. It + serves as a guide for users and developers, offering details such as installation instructions, usage + guidelines, features, and licensing information. The primary purpose of a ReadMe file is to help users + understand what the project is about, how to use it effectively, and how to contribute if applicable. +

+ Click to learn more +
+
+ Image of a wireframe +

Wireframe

- Below we will be discussing on what the purpose of a Readme file is, the purpose of a wireframe and what a branch is and what a branch in git is. But first, lets look at this image. + A wireframe is a visual representation or blueprint of a website, application, or user interface. It outlines + the basic structure, layout, and functionality of a design without focusing on detailed aesthetics. Wireframes + are typically created in the early stages of the design process to help designers, developers, and stakeholders + visualize the overall structure and flow of a project. They often include placeholders for content, navigation + elements, and interactive features, allowing for easy communication and collaboration among team members before + moving on to more detailed design and development phases.

-
-
-
- Image of a ReadMe file -

ReadMe

-

- A ReadMe file is a document that provides essential information about a project, software, or repository. It serves as a guide for users and developers, offering details such as installation instructions, usage guidelines, features, and licensing information. The primary purpose of a ReadMe file is to help users understand what the project is about, how to use it effectively, and how to contribute if applicable. -

- Click to learn more -
-
- Image of a wireframe -

Wireframe

-

- A wireframe is a visual representation or blueprint of a website, application, or user interface. It outlines the basic structure, layout, and functionality of a design without focusing on detailed aesthetics. Wireframes are typically created in the early stages of the design process to help designers, developers, and stakeholders visualize the overall structure and flow of a project. They often include placeholders for content, navigation elements, and interactive features, allowing for easy communication and collaboration among team members before moving on to more detailed design and development phases. -

- Click to learn more -
-
- Image of git branches -

Branches

-

- In version control systems like Git, a branch is a separate line of development that allows multiple developers to work on different features or fixes simultaneously without affecting the main codebase. Branches enable teams to isolate changes, experiment with new ideas, and collaborate more effectively. When a feature or fix is complete, the changes made in the branch can be merged back into the main branch (often called "main" or "master"). This process helps maintain a clean and stable codebase while allowing for parallel development efforts. -

- Click to learn more. -
-
- - + Click to learn + more + +
+ Image of git branches +

Branches

+

+ In version control systems like Git, a branch is a separate line of development that allows multiple developers + to work on different features or fixes simultaneously without affecting the main codebase. Branches enable teams + to isolate changes, experiment with new ideas, and collaborate more effectively. When a feature or fix is + complete, the changes made in the branch can be merged back into the main branch (often called "main" or + "master"). This process helps maintain a clean and stable codebase while allowing for parallel development + efforts. +

+ Click to learn more. +
+ + + + \ No newline at end of file diff --git a/Wireframe/style.css b/Wireframe/style.css index e782959b1..c3d3d29d5 100644 --- a/Wireframe/style.css +++ b/Wireframe/style.css @@ -4,32 +4,43 @@ --font: 100%/1.5 system-ui; --space: clamp(6px, 6px + 2vw, 15px); --line: 3px solid; word-spacing: 1px; - --container: 1280px; - padding: 50px; - width: 100%; + /* --container: 1280px; */ + /* padding: 50px; */ + --padding: 50px; + width: 80%; + margin-left: auto; + margin-right: auto; + } -.header { +header { text-align: center; - margin-bottom: 0px; width : 90%; + padding: 5%; + } body { + width: 100%; background: var(--paper); color: var(--ink); font: var(--font); - padding: 10px; - width: 100%; + /* overflow: hidden; */ + + /* padding: 10px; */ + /* overflow-x: hidden; */ + } + a { - padding: 15px; - border-radius: 5px; + padding: 1px; + border-radius: 10px; border: var(--line); - max-width: fit-content; + /* max-width: fit-content; */ } + main { display: grid; - padding: 50px; + /* padding: 50px; */ border : 50px solid var(--paper); color: black; grid-template-columns: 1fr 1fr; @@ -42,9 +53,9 @@ article { border: var(--line); width: 100%; border-radius: 12px; - padding-bottom: 20px; + /* padding-bottom: 20px; */ text-align: left; - padding: 7px; + padding: 1px; display: grid; grid: template columns 1fr; var(--space) 2fr var(--space); > * { @@ -55,4 +66,4 @@ article { width: 400px; justify-self: center; } -} +} \ No newline at end of file From 7a198865e5f237cd9c8151262f4d3974df87ee84 Mon Sep 17 00:00:00 2001 From: FarancisGH Date: Sat, 7 Feb 2026 19:10:55 +0000 Subject: [PATCH 3/6] Adjusments made on the html and css file. Adding footers and removing unnecessary attributes on my code. --- Wireframe/index.html | 13 +++++++++---- Wireframe/style.css | 11 ++++++++++- 2 files changed, 19 insertions(+), 5 deletions(-) diff --git a/Wireframe/index.html b/Wireframe/index.html index 35911ba45..3a727513f 100644 --- a/Wireframe/index.html +++ b/Wireframe/index.html @@ -9,7 +9,7 @@ -
+

ReadMe, Wireframe and Branches

Below we will be discussing on what the purpose of a Readme file is, @@ -28,9 +28,9 @@

ReadMe

guidelines, features, and licensing information. The primary purpose of a ReadMe file is to help users understand what the project is about, how to use it effectively, and how to contribute if applicable.

- Click to learn more + Click to learn more -
+
Image of a wireframe @@ -43,7 +43,7 @@

Wireframe

elements, and interactive features, allowing for easy communication and collaboration among team members before moving on to more detailed design and development phases.

- Click to learn + Click to learn more
@@ -63,6 +63,11 @@

Branches

+
+

+ Welcome to my first Webpage. +

+
\ No newline at end of file diff --git a/Wireframe/style.css b/Wireframe/style.css index c3d3d29d5..93b78b3d7 100644 --- a/Wireframe/style.css +++ b/Wireframe/style.css @@ -6,7 +6,7 @@ --line: 3px solid; word-spacing: 1px; /* --container: 1280px; */ /* padding: 50px; */ - --padding: 50px; + padding: 50px; width: 80%; margin-left: auto; margin-right: auto; @@ -64,6 +64,15 @@ article { > img { grid-column: span 100%; width: 400px; + height: 250px; justify-self: center; } +} +footer { + text-align: center; + padding: 15px; + position: fixed; + bottom: 0; + left: 0; + width: 100%; } \ No newline at end of file From ad14b483bdad33600b5b9dd2aaad2a6790d6a4d8 Mon Sep 17 00:00:00 2001 From: FarancisGH Date: Sat, 7 Feb 2026 23:13:25 +0000 Subject: [PATCH 4/6] adjustment done to prevent the footer from overlapping with the page content. --- Wireframe/style.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Wireframe/style.css b/Wireframe/style.css index 93b78b3d7..dbe048805 100644 --- a/Wireframe/style.css +++ b/Wireframe/style.css @@ -55,7 +55,7 @@ article { border-radius: 12px; /* padding-bottom: 20px; */ text-align: left; - padding: 1px; + padding: 5px; display: grid; grid: template columns 1fr; var(--space) 2fr var(--space); > * { @@ -71,7 +71,7 @@ article { footer { text-align: center; padding: 15px; - position: fixed; + position: center; bottom: 0; left: 0; width: 100%; From 34f1f08c4e3887f56e1f34be70687d0444196414 Mon Sep 17 00:00:00 2001 From: FarancisGH Date: Sat, 7 Feb 2026 23:18:26 +0000 Subject: [PATCH 5/6] Preventing the two articles below from overlapping --- Wireframe/style.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Wireframe/style.css b/Wireframe/style.css index dbe048805..699633105 100644 --- a/Wireframe/style.css +++ b/Wireframe/style.css @@ -55,7 +55,7 @@ article { border-radius: 12px; /* padding-bottom: 20px; */ text-align: left; - padding: 5px; + padding: 3px; display: grid; grid: template columns 1fr; var(--space) 2fr var(--space); > * { From 27845eb1d0828b3348004bcad6c1e42a1fd7f3cd Mon Sep 17 00:00:00 2001 From: FarancisGH Date: Sun, 8 Feb 2026 08:48:56 +0000 Subject: [PATCH 6/6] Adjusments made on my Footer. --- Wireframe/index.html | 2 +- Wireframe/style.css | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/Wireframe/index.html b/Wireframe/index.html index 3a727513f..53ec1df95 100644 --- a/Wireframe/index.html +++ b/Wireframe/index.html @@ -65,7 +65,7 @@

Branches

diff --git a/Wireframe/style.css b/Wireframe/style.css index 699633105..6ad77135e 100644 --- a/Wireframe/style.css +++ b/Wireframe/style.css @@ -70,9 +70,10 @@ article { } footer { text-align: center; - padding: 15px; - position: center; + padding: 1rem; + position: fixed; bottom: 0; left: 0; - width: 100%; + right: 0; + background-color: #e6dede; } \ No newline at end of file