diff --git a/Wireframe/git-branch.png b/Wireframe/git-branch.png new file mode 100644 index 000000000..c76f9c64c Binary files /dev/null and b/Wireframe/git-branch.png differ diff --git a/Wireframe/index.html b/Wireframe/index.html index 0e014e535..bb52dd4e6 100644 --- a/Wireframe/index.html +++ b/Wireframe/index.html @@ -1,4 +1,4 @@ - + @@ -6,27 +6,58 @@ Wireframe +

Wireframe

-

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

+

Learn about README files, wireframes, and Git branches.

+
- -

Title

+ Illustration promoting the creation of an effective README file +

What is a README File?

+

+ A README file explains what a project does, how to install it, how to + use it, and any important information developers need. It is usually + the first file people read when viewing a project. +

+ Read more +
+ +
+ Wireframe showing a webpage layout +

What is a Wireframe?

+

+ A wireframe is a digital diagram that shows the skeleton of a website. + It strips away visual elements like colors, fonts, and images to focus + entirely on where headers and content blocks live. +

+ Read more +
+ +
+ Illustration of branching in Git +

What is a Git Branch?

- Lorem ipsum dolor sit amet consectetur adipisicing elit. Quisquam, - voluptates. Quisquam, voluptates. + A branch in Git is an independent line of development. Branches allow + developers to work on new features, updates, or fixes without + affecting the main project. This helps keep changes organized and + separate until they are ready to be merged.

- Read more + Read more
diff --git a/Wireframe/readme.png b/Wireframe/readme.png new file mode 100644 index 000000000..83a4610ca Binary files /dev/null and b/Wireframe/readme.png differ diff --git a/Wireframe/style.css b/Wireframe/style.css index be835b6c7..acf3735db 100644 --- a/Wireframe/style.css +++ b/Wireframe/style.css @@ -1,21 +1,3 @@ -/* 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); @@ -24,8 +6,7 @@ As well as useful links to learn more */ --line: 1px solid; --container: 1280px; } -/* ====== Base Elements ====== - General rules for basic HTML elements in any context */ +/* ====== Base Elements ====== */ body { background: var(--paper); color: var(--ink); @@ -41,10 +22,7 @@ svg { width: 100%; object-fit: cover; } -/* ====== Site Layout ====== -Setting the overall rules for page regions -https://www.w3.org/WAI/tutorials/page-structure/regions/ -*/ +/* ====== Site Layout ====== */ main { max-width: var(--container); margin: 0 auto calc(var(--space) * 4) auto; @@ -52,15 +30,13 @@ main { footer { position: fixed; bottom: 0; - text-align: center; + left: 0; + width: 100%; + background: white; + border-top: 1px solid black; + z-index: 9999; } -/* ====== 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/ -*/ +/* ====== Articles Grid Layout ==== */ main { display: grid; grid-template-columns: 1fr 1fr; @@ -69,21 +45,28 @@ main { 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 Layout ====== */ 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; - } + row-gap: 0.5rem; +} + +article > * { + grid-column: 2 / 3; +} + +article > img { + grid-column: span 3; +} + +article h2 { + margin: 0; +} + +article p { + margin: 0.5rem 0 0 0; } diff --git a/Wireframe/wireframe.png b/Wireframe/wireframe.png index 731f01503..4cd6d9833 100644 Binary files a/Wireframe/wireframe.png and b/Wireframe/wireframe.png differ