diff --git a/Wireframe/git_branch.png b/Wireframe/git_branch.png new file mode 100644 index 000000000..bc746a80f Binary files /dev/null and b/Wireframe/git_branch.png differ diff --git a/Wireframe/index.html b/Wireframe/index.html index 0e014e535..cd52a9da9 100644 --- a/Wireframe/index.html +++ b/Wireframe/index.html @@ -3,31 +3,65 @@ - Wireframe + Wireframe Exercise +
-

Wireframe

-

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

+

Wireframe Exercise

+

Understanding key concepts used in web development

+
-
- -

Title

-

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

- Read more -
+
+

Articles

+ + +
+ README file example +

What Is the Purpose of a README File?

+

+ A README file explains what a project does, how to use it, and how + others can contribute. +

+ + Read more + +
+ + +
+ Website wireframe example +

What Is the Purpose of a Wireframe?

+

+ A wireframe is a visual guide that represents the layout and structure + of a webpage before design and development. +

+ Read more +
+ + +
+ Git branching diagram +

What Is a Branch in Git?

+

+ A Git branch allows developers to work on features or fixes without + affecting the main codebase. +

+ + Read more + +
+
+ diff --git a/Wireframe/placeholder.svg b/Wireframe/placeholder.svg deleted file mode 100644 index ac36a0abc..000000000 --- a/Wireframe/placeholder.svg +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/Wireframe/readme.png b/Wireframe/readme.png new file mode 100644 index 000000000..d90b87e51 Binary files /dev/null and b/Wireframe/readme.png differ diff --git a/Wireframe/style.css b/Wireframe/style.css index be835b6c7..ebd81aebf 100644 --- a/Wireframe/style.css +++ b/Wireframe/style.css @@ -1,89 +1,107 @@ -/* 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 ====== */ +/* ====== 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; + --paper: #ffffff; + --ink: #000000; + --font: 100%/1.5 system-ui, sans-serif; + --space: clamp(8px, 2vw, 16px); + --line: 2px solid #000; + --container: 1000px; +} + +/* ====== Base ====== */ +* { + box-sizing: border-box; } -/* ====== Base Elements ====== - General rules for basic HTML elements in any context */ + body { + margin: 0; background: var(--paper); color: var(--ink); font: var(--font); } -a { - padding: var(--space); - border: var(--line); - max-width: fit-content; -} -img, -svg { + +img { 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; + height: auto; + object-fit: contain; } -footer { - position: fixed; - bottom: 0; + +/* ====== Header ====== */ +header { text-align: center; + padding: calc(var(--space) * 2); } -/* ====== 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 Layout ====== */ main { + max-width: var(--container); + margin: 0 auto calc(var(--space) * 6) auto; + padding: var(--space); +} + +/* ====== Articles Grid ====== */ +.articles { display: grid; grid-template-columns: 1fr 1fr; - gap: var(--space); - > *:first-child { - grid-column: span 2; - } + gap: calc(var(--space) * 2); +} + +/* First article spans full width */ +.articles > article:first-of-type { + 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 Card ====== */ 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; - } +} + +article > * { + grid-column: 2 / 3; +} + +article > img { + grid-column: 1 / -1; + border-bottom: var(--line); +} + +article h3 { + margin-top: var(--space); +} + +a { + display: inline-block; + margin-top: var(--space); + padding: var(--space); + border: var(--line); + text-decoration: none; + color: inherit; + max-width: fit-content; +} + +/* ====== Footer ====== */ +footer { + position: fixed; + bottom: 0; + width: 100%; + padding: var(--space); + text-align: center; + background-color: #eee; + border-top: var(--line); +} + +/* ====== Accessibility ====== */ +.visually-hidden { + position: absolute; + width: 1px; + height: 1px; + padding: 0; + margin: -1px; + overflow: hidden; + clip: rect(0, 0, 0, 0); + white-space: nowrap; + border: 0; } diff --git a/Wireframe/wireframe.png b/Wireframe/wireframe.png index 731f01503..9356ac2f2 100644 Binary files a/Wireframe/wireframe.png and b/Wireframe/wireframe.png differ