diff --git a/Wireframe/branch.png b/Wireframe/branch.png new file mode 100644 index 000000000..94d545894 Binary files /dev/null and b/Wireframe/branch.png differ diff --git a/Wireframe/git-branch.html b/Wireframe/git-branch.html new file mode 100644 index 000000000..f19c259d4 --- /dev/null +++ b/Wireframe/git-branch.html @@ -0,0 +1,41 @@ + + + + + + + Git Branches + + + + + +
+

README Files, Wireframes, and Git Branches

+

Core concepts used in modern web development

+
+ +
+
+
+

What is a branch in Git?

+

+ A Git branch is a separate line of development within a repository. + It allows developers to work on features or fixes independently. +

+

+ Once changes are complete, branches can be merged back into the + main branch, keeping the project stable and organized. +

+ ← Back to Home +
+
+
+ + + + + + \ No newline at end of file diff --git a/Wireframe/index.html b/Wireframe/index.html index 0e014e535..32c79bb69 100644 --- a/Wireframe/index.html +++ b/Wireframe/index.html @@ -1,33 +1,69 @@ - - - - Wireframe - - - -
-

Wireframe

-

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

-
-
-
- -

Title

+ + + + + README, Wireframes, and Git Branches + + + + +
+

README Files, Wireframes, and Git Branches

+

Core concepts used in modern web development

+
+ +
+ + +
+ Developer writing project documentation +
+

What is the purpose of a README file?

- Lorem ipsum dolor sit amet consectetur adipisicing elit. Quisquam, - voluptates. Quisquam, voluptates. + A README file introduces a project and explains how to install, + use, and understand it so others can quickly get started.

- Read more + Read More +
+
+ + +
+ + +
+ Website wireframe sketches +
+

What is the purpose of a wireframe?

+

+ A wireframe is a low-fidelity layout used to plan the structure + and functionality of a webpage before visual design begins. +

+ Read More +
-
-
-

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

-
- + +
+ Git branching diagram on screen +
+

What is a branch in Git?

+

+ A Git branch allows developers to work on new features or fixes + independently without impacting the main project. +

+ Read More +
+
+ + +
+ + + + + diff --git a/Wireframe/more-readme.html b/Wireframe/more-readme.html new file mode 100644 index 000000000..9215fac69 --- /dev/null +++ b/Wireframe/more-readme.html @@ -0,0 +1,37 @@ + + + + + + + README Files + + + + + +
+

README Files, Wireframes, and Git Branches

+

Core concepts used in modern web development

+
+ +
+
+
+

What is the purpose of a README file?

+

+ README files help developers collaborate more effectively and allow + users to understand a project without reading the source code. +

+ ← Back to Home +
+
+
+ + + + + + diff --git a/Wireframe/readme.png b/Wireframe/readme.png new file mode 100644 index 000000000..e3d14a39c Binary files /dev/null and b/Wireframe/readme.png differ diff --git a/Wireframe/style.css b/Wireframe/style.css index be835b6c7..3bff4d46a 100644 --- a/Wireframe/style.css +++ b/Wireframe/style.css @@ -1,89 +1,110 @@ -/* 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 */ +* { + box-sizing: border-box; +} + body { - background: var(--paper); - color: var(--ink); - font: var(--font); + margin: 0; + font-family: Arial, Helvetica, sans-serif; + background-color: #f4f4f4; + color: #222; + line-height: 1.6; + + /* Sticky footer layout */ + display: flex; + flex-direction: column; + min-height: 100vh; +} + +.page-header { + text-align: center; + padding: 2rem 1rem; +} + +.page-header h1 { + margin-bottom: 0.5rem; +} + +.subtitle { + color: #555; +} + +.content { + max-width: 1100px; + margin: 0 auto; + padding: 1rem; + flex: 1; + /* pushes footer to bottom */ +} + +.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; } -a { - padding: var(--space); - border: var(--line); - max-width: fit-content; + +.card { + background-color: #fff; + border: 2px solid #000; + margin-bottom: 2rem; +} + +.featured { + width: 100%; } -img, -svg { + +.article-image { width: 100%; + height: 220px; + /* aligned image height */ object-fit: cover; + /* prevents distortion */ + display: block; } -/* ====== 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; + +.card-body { + padding: 1rem; } -/* ====== 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; - } + +.card-body h2 { + margin-top: 0; +} + +.button { + display: inline-block; + padding: 0.5rem 1rem; + border: 2px solid #000; + text-decoration: none; + color: #000; + font-weight: bold; +} + +.button:hover, +.button:focus { + background-color: #000; + color: #fff; } -/* ====== 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; + +.card-grid { display: grid; - grid-template-columns: var(--space) 1fr var(--space); - > * { - grid-column: 2/3; - } - > img { - grid-column: span 3; - } + grid-template-columns: repeat(2, 1fr); + gap: 2rem; } + +.page-footer { + background: #918d8d; + color: rgb(39, 37, 37); + text-align: center; + padding: 1rem; +} + +@media (max-width: 768px) { + .card-grid { + grid-template-columns: 1fr; + } +} \ No newline at end of file diff --git a/Wireframe/wireframe.html b/Wireframe/wireframe.html new file mode 100644 index 000000000..2d83b45ea --- /dev/null +++ b/Wireframe/wireframe.html @@ -0,0 +1,41 @@ + + + + + + + Wireframes + + + + + +
+

README Files, Wireframes, and Git Branches

+

Core concepts used in modern web development

+
+ +
+
+
+

What is the purpose of a wireframe?

+

+ Wireframes are simple visual guides that represent the structure of + a webpage or application. +

+

+ They allow designers and developers to plan layout, navigation, + and functionality before writing code or applying visual styles. +

+ ← Back to Home +
+
+
+ + + + + +