From a59df31790f9939e021b2eebcc415ef71eb86657 Mon Sep 17 00:00:00 2001 From: FarancisGH Date: Sat, 24 Jan 2026 20:24:35 +0000 Subject: [PATCH 1/5] Modifications done on the wireframe html and css files to improve layout and design. --- Wireframe/index.html | 57 +++++++++++----- Wireframe/style.css | 158 +++++++++++++++++++++---------------------- index.html | 57 ++++++---------- 3 files changed, 140 insertions(+), 132 deletions(-) diff --git a/Wireframe/index.html b/Wireframe/index.html index 0e014e535..21ccc5226 100644 --- a/Wireframe/index.html +++ b/Wireframe/index.html @@ -7,27 +7,48 @@ -
-

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 +
+

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. It often includes sections like an overview, prerequisites, installation steps, usage examples, and contact information for support.

- 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. +
-
-

- This is the default, provided code and no changes have been made yet. -

-
- - + + + \ No newline at end of file diff --git a/Wireframe/style.css b/Wireframe/style.css index be835b6c7..8e327202c 100644 --- a/Wireframe/style.css +++ b/Wireframe/style.css @@ -1,89 +1,89 @@ -/* 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; - --container: 1280px; -} -/* ====== Base Elements ====== - General rules for basic HTML elements in any context */ body { - background: var(--paper); - color: var(--ink); - font: var(--font); + margin: 0; + padding: 0; + font-family: Arial, sans-serif; } -a { - padding: var(--space); - border: var(--line); - max-width: fit-content; +main { + display: flex; + flex-direction: column; + gap: 20px; + max-width: 900px; + margin: 0 auto; + padding: 20px; } -img, -svg { +.sectionGroup { + display: flex; + flex-direction: row; + gap: 20px; +} +.section1 { width: 100%; - object-fit: cover; + display: flex; + flex-direction: column; + border: solid green; + align-items: left; + justify-content: center; + padding: 5px; + } -/* ====== 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; + +#section1link { + color: #0066cc; + text-decoration: none; + position: relative; + left: 2px; } -footer { - position: fixed; - bottom: 0; - text-align: center; +.section2 { + width: 50%; + display: flex; + flex-direction: column; + border: solid orange; + align-items: left; + justify-content: center; + padding: 5px; + } -/* ====== 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; - grid-template-columns: 1fr 1fr; - gap: var(--space); - > *:first-child { - grid-column: span 2; - } +#section2link { + color: #0066cc; + text-decoration: none; + position: relative; + left: 2px; } -/* ====== 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); + +.section3 { + width: 50%; + display: flex; + flex-direction: column; + border: solid purple; + align-items: left; + justify-content: center; + padding: 5px; + +} +#section3link { + color: #0066cc; + text-decoration: none; + position: left; + left: 2px; +} + +img { + display: block; + max-width: 100%; + height: auto; + margin: 20px auto; +} +h1, h2 { text-align: left; - display: grid; - grid-template-columns: var(--space) 1fr var(--space); - > * { - grid-column: 2/3; - } - > img { - grid-column: span 3; - } } +a { + margin-top: 10px; + color: #0066cc; + text-decoration: none; + position: relative; + left : 40px; +} + +a:hover { + text-decoration: underline; +} \ No newline at end of file diff --git a/index.html b/index.html index 80aa49666..0e014e535 100644 --- a/index.html +++ b/index.html @@ -3,44 +3,31 @@ - Coursework - + Wireframe + -

🧐 CYF Coursework Disposable Branch Previews

+
+

Wireframe

+

+ This is the default, provided code and no changes have been made yet. +

+
-
    -
  1. -

    Project 1: Wireframe

    -

    - Mentors: - open the assignment in a tab -

    -
    2. -
  2. -

    Project 2: Form Controls

    -

    - Mentors: - open the assignment in a tab -

    -
    3. -
+
+ +

Title

+

+ Lorem ipsum dolor sit amet consectetur adipisicing elit. Quisquam, + voluptates. Quisquam, voluptates. +

+ Read more +
- +
+

+ This is the default, provided code and no changes have been made yet. +

+
From ef2670ad9b08c9d6a72e7348fe0f3a5786f3b39c Mon Sep 17 00:00:00 2001 From: FarancisGH Date: Sat, 24 Jan 2026 22:09:49 +0000 Subject: [PATCH 2/5] Adjusting wireframe layout and styles --- Wireframe/index.html | 4 ---- Wireframe/style.css | 7 ------- 2 files changed, 11 deletions(-) diff --git a/Wireframe/index.html b/Wireframe/index.html index 21ccc5226..112137b57 100644 --- a/Wireframe/index.html +++ b/Wireframe/index.html @@ -14,10 +14,7 @@ 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

ReadMe

@@ -49,6 +46,5 @@

Branches

- \ No newline at end of file diff --git a/Wireframe/style.css b/Wireframe/style.css index 8e327202c..47319ad78 100644 --- a/Wireframe/style.css +++ b/Wireframe/style.css @@ -24,9 +24,7 @@ main { align-items: left; justify-content: center; padding: 5px; - } - #section1link { color: #0066cc; text-decoration: none; @@ -41,7 +39,6 @@ main { align-items: left; justify-content: center; padding: 5px; - } #section2link { color: #0066cc; @@ -49,7 +46,6 @@ main { position: relative; left: 2px; } - .section3 { width: 50%; display: flex; @@ -58,7 +54,6 @@ main { align-items: left; justify-content: center; padding: 5px; - } #section3link { color: #0066cc; @@ -66,7 +61,6 @@ main { position: left; left: 2px; } - img { display: block; max-width: 100%; @@ -83,7 +77,6 @@ a { position: relative; left : 40px; } - a:hover { text-decoration: underline; } \ No newline at end of file From 291e3470ebbef45fc970452488691c3c1873f0eb Mon Sep 17 00:00:00 2001 From: FarancisGH Date: Sat, 24 Jan 2026 22:57:42 +0000 Subject: [PATCH 3/5] Adding wireframe HTML and CSS files for project layout --- Wireframe/index.html | 1 + Wireframe/style.css | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/Wireframe/index.html b/Wireframe/index.html index 112137b57..6e48495c8 100644 --- a/Wireframe/index.html +++ b/Wireframe/index.html @@ -1,4 +1,5 @@ + diff --git a/Wireframe/style.css b/Wireframe/style.css index 47319ad78..c41a42fa5 100644 --- a/Wireframe/style.css +++ b/Wireframe/style.css @@ -21,7 +21,6 @@ main { display: flex; flex-direction: column; border: solid green; - align-items: left; justify-content: center; padding: 5px; } From 9f18fff31929c52d9e1040734da6c168c98f36bc Mon Sep 17 00:00:00 2001 From: FarancisGH Date: Sun, 25 Jan 2026 20:20:59 +0000 Subject: [PATCH 4/5] Adjusted some spacing in commit message for Feature/Wireframe --- Form-Controls/index.html | 2 +- Wireframe/index.html | 54 +++++++++++++++++++- index.html | 104 ++++++++++++++++++++++++++++++++------- 3 files changed, 141 insertions(+), 19 deletions(-) diff --git a/Form-Controls/index.html b/Form-Controls/index.html index 65a866cdb..fff86ab9c 100644 --- a/Form-Controls/index.html +++ b/Form-Controls/index.html @@ -24,4 +24,4 @@

Product Pick

By HOMEWORK SOLUTION

- + \ No newline at end of file diff --git a/Wireframe/index.html b/Wireframe/index.html index 6e48495c8..9bebb730a 100644 --- a/Wireframe/index.html +++ b/Wireframe/index.html @@ -1,51 +1,103 @@ + + + + + + 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 +
+

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. It often includes sections like an overview, prerequisites, installation steps, usage examples, and contact information for support. +

+ 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. +
+ +
+ - \ No newline at end of file + + + + \ No newline at end of file diff --git a/index.html b/index.html index 0e014e535..9bebb730a 100644 --- a/index.html +++ b/index.html @@ -1,33 +1,103 @@ + + + + + + + Wireframe + + + -
-

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 + +
+ +

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. It often includes sections like an overview, prerequisites, installation steps, usage examples, and contact information for support. +

- 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. + +
+
+
-
-

- This is the default, provided code and no changes have been made yet. -

-
- + + + + + \ No newline at end of file From d175bc8b30410543cd549db2baa5be27a6e9a47b Mon Sep 17 00:00:00 2001 From: FarancisGH Date: Sun, 25 Jan 2026 20:54:54 +0000 Subject: [PATCH 5/5] Made changes to Wireframe/index.html and index.html --- Wireframe/index.html | 5 +- index.html | 127 ++++++++++++------------------------------- 2 files changed, 36 insertions(+), 96 deletions(-) diff --git a/Wireframe/index.html b/Wireframe/index.html index 9bebb730a..6d3e2eff7 100644 --- a/Wireframe/index.html +++ b/Wireframe/index.html @@ -95,9 +95,6 @@

Branches

- - - + - \ No newline at end of file diff --git a/index.html b/index.html index 9bebb730a..1c533a107 100644 --- a/index.html +++ b/index.html @@ -1,103 +1,46 @@ - - - - - - - - Wireframe - - - + Coursework + - - +

🧐 CYF Coursework Disposable Branch Previews

- -
- -

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 - -
- -

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. It often includes sections like an overview, prerequisites, installation steps, usage examples, and contact information for support. - -

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

Wireframe

- +
    +
  1. +

    Project 1: 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. - + Mentors: + open the assignment in a tab

    - - 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. - -
- - - + +
  • +

    Project 2: Form Controls

    +

    + Mentors: + open the assignment in a tab +

    +
    • +
    - - - - - - \ No newline at end of file + + + \ No newline at end of file