From ce36dda97f5cd6d3fc4d80ad779d9c23ad280ab7 Mon Sep 17 00:00:00 2001 From: Yonatan Teklemariam Date: Fri, 22 May 2026 20:50:47 +0100 Subject: [PATCH 1/2] Resolve merge conflict in style.css --- Wireframe/style.css | 246 ++++++++++++++++++++++++++++++-------------- 1 file changed, 167 insertions(+), 79 deletions(-) diff --git a/Wireframe/style.css b/Wireframe/style.css index be835b6c7..fca879680 100644 --- a/Wireframe/style.css +++ b/Wireframe/style.css @@ -1,89 +1,177 @@ -/* 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 */ +* { + margin: 0; + padding: 0; + box-sizing: border-box; + font-family: 'Arial', sans-serif; +} + +html, +body { + height: 100%; +} + body { - background: var(--paper); - color: var(--ink); - font: var(--font); + background-color: #3c3f72; + color: #080000; + font-family: 'Arial', sans-serif; + line-height: 1.5; + font-size: 1em; + display: flex; + flex-direction: column; +} + +.page-header { + background-color: #d0bee3; + color: #1a082c; + text-align: center; + text-shadow: 2px 2px 4px rgba(225, 226, 237, 0.982); + margin-bottom: 40px; + padding: 30px; + font-size: 1.5em; } -a { - padding: var(--space); - border: var(--line); - max-width: fit-content; + +.page-header h1 { + font-size: 2em; + margin-bottom: 5px; } -img, -svg { + +.hero .placeholder { width: 100%; - object-fit: cover; + height: 600px; + background-color: #d0bee3; + border: 2px dashed #1a082c; + border-radius: 10px; + margin-bottom: 20px; + +} + +.hero { + margin-right: 20px; + margin-left: 20px; +} + +.main-article { + flex: 1; + background: white; + padding-top: 45px; + padding-left: 15px; + padding-right: 15px; + padding-bottom: 15px; + border: 2px solid #000; + border-radius: 10px; + margin-bottom: 20px; + text-align: justify; + margin-right: 20px; + margin-left: 20px; + +} + +.main-article p, +.small-article p { + font-size: 1.2em; } -/* ====== 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; + + +.small-article h3 { + font-size: 1em; + color: #350763; + margin-bottom: 15px; + text-shadow: 2px 2px 4px rgba(225, 226, 237, 0.982); +} + + +.main-article h2 { + color: #350763; + margin-bottom: 15px; + text-shadow: 2px 2px 4px rgba(225, 226, 237, 0.982); } + +.btn { + display: inline-block; + padding: 4px 14px; + background-color: #350763; + color: white; + text-decoration: none; + border-radius: 5px; + margin-top: 10px; + font-size: 1.2em; + font-weight: bold; +} + +.btn:hover { + background-color: #c3e7fb; + color: #1a082c; +} + +.small-articles { + display: flex; + gap: 20px; + margin-bottom: 20px; + margin-right: 20px; + margin-left: 20px; + text-align: justify; + + +} + +.small-article { + flex: 1; + background: white; + padding: 15px; + border: 2px solid #000; + border-radius: 10px; +} + +.small-article h3 { + color: #350763; + margin-bottom: 10px; + font-size: 1.2em; +} + +.placeholder-small { + width: 100%; + height: 450px; + background-color: #d0bee3; + border: 2px dashed #1a082c; + border-radius: 10px; + margin-bottom: 15px; +} + footer { - position: fixed; - bottom: 0; + background-color: #d0bee3; + color: #1a082c; text-align: center; + text-shadow: 2px 2px 4px rgba(225, 226, 237, 0.982); + padding: 10px 15px; + line-height: 1.3; + font-size: 1em; + margin-top: auto; + } -/* ====== 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; - } -} -/* ====== 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); - text-align: left; - display: grid; - grid-template-columns: var(--space) 1fr var(--space); - > * { - grid-column: 2/3; - } - > img { - grid-column: span 3; - } + +footer p { + font-weight: bold; } + +.footer-note { + font-size: 22px; + color: #1a082c; + margin-bottom: 5px; + text-shadow: 2px 2px 4px rgba(210, 213, 244, 0.982); + padding-top: 10px; + padding-bottom: 10px; + padding-left: 15px; + padding-right: 15px; + border-bottom: none; + <<<<<<< HEAD + /* optional: remove the thick bar */ + =======>>>>>>>59daf8a (Updated wireframe HTML and CSS) border-radius: 10px; + + +} + +.footer-note a:hover { + color: #c6e9e9; + text-shadow: 2px 2px 4px rgba(25, 32, 112, 0.982); + +} \ No newline at end of file From aad4ec40590db4603d1817ba687b9ebb9c98f3a7 Mon Sep 17 00:00:00 2001 From: Yonatan Teklemariam Date: Fri, 22 May 2026 20:53:06 +0100 Subject: [PATCH 2/2] Resolve merge conflict in index.html --- Wireframe/index.html | 126 ++++++++++++++++++++++++++++++++----------- 1 file changed, 95 insertions(+), 31 deletions(-) diff --git a/Wireframe/index.html b/Wireframe/index.html index 0e014e535..958d5c0eb 100644 --- a/Wireframe/index.html +++ b/Wireframe/index.html @@ -1,33 +1,97 @@ - - - - Wireframe - - - -
-

Wireframe

-

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

-
-
-
- -

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

-
- - + + + + + My Wireframe Design + + + + + + +
+

Basics of Web Development Designs

+

README files, wireframes, and Git branches explained clearly

+
+ + +
+ readme diagram +
+ + +
+

What is the purpose of a README file?

+

A README file explains what a project is, how it works, and how to use it. It usually includes + installation + steps, usage instructions, and important notes. The purpose is to help anyone understand the project quickly + without reading the entire codebase. + A README.md is an important document in a repository that introduces the project and explains its purpose, setup, + and usage to help users and developers understand and contribute to it. + Uses Markdown (.md) for formatted documentation and is usually the first file users read in a project. + Provides a project overview, installation instructions, configuration details, and usage examples such as code or + command-line commands. + May include license information, contributor credits, and appears well-formatted on platforms like GitHub. + A README file is meant to act as the front door to a project, giving anyone who encounters it a clear and + immediate understanding of what the project is about and how to interact with it. It explains the project’s + purpose, its goals, and the problems it aims to solve, while also guiding users through installation, usage, and + any important requirements. A strong README also helps future contributors by documenting decisions, structure, + and expectations, making collaboration smoother and reducing confusion. It becomes a reference point that keeps + the project understandable even months or years later, ensuring that the work remains accessible not only to + others but also to the original creator when returning after a long break. +

+

+ Read More +
+ + +
+ +
+ wireframe diagram +

What is the purpose of a wireframe?

+

A wireframe is a simple visual layout that shows the structure of a webpage before design or + coding begins. It + helps developers and designers plan where elements should go and how the page should flow.

+ Read More +
+ + +
+ git branching diagram +

What is a branch in Git?

+

A Git branch is a separate version of your project where you can work on new features without + affecting the + main code. Branches allow safe experimentation and make collaboration easier. Therefore.

+ Read More +
+ +
+ + + + + + \ No newline at end of file