generated from CodeYourFuture/Module-Template
-
-
Notifications
You must be signed in to change notification settings - Fork 419
London | 26-ITP-Jan | Boualem Larbi Djebbour | Sprint 1 | wireframe #1158
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
djebsoft
wants to merge
24
commits into
CodeYourFuture:main
Choose a base branch
from
djebsoft:feature/wireframe
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
24 commits
Select commit
Hold shift + click to select a range
d25e32f
Revise wireframe HTML content and headings
djebsoft 47093f6
Update wireframe image in index.html
djebsoft b42ca6e
Update images and text in index.html
djebsoft 9456100
Update footer with creator information
djebsoft 7bd7e9c
Fix HTML structure and update links with target attribute
djebsoft 06e6b23
Refactor CSS by removing comments and updating styles
djebsoft 2796607
Merge branch 'CodeYourFuture:main' into feature/wireframe
djebsoft 253277e
Refactor HTML structure and fix tags (indentation)
djebsoft 5d3d442
Fix HTML tags and update article sections
djebsoft 9e75b35
Remove unnecessary section tag from index.html
djebsoft a263d25
inhanced indentation
djebsoft 3a31ce3
Fix CSS formatting by adding closing brace
djebsoft 004cf3e
Increase padding in footer style
djebsoft 23b035d
Refactor CSS grid layout for articles section
djebsoft d34f2e0
Remove inline styles from images in index.html
djebsoft 9700ddf
Remove extra newline before closing html tag
djebsoft 10e0615
Refactor CSS with custom properties and layout adjustments
djebsoft 6de8c3a
Add styles for anchor tags and images
djebsoft a4363f3
Adjust image and SVG dimensions in style.css
djebsoft 5bc4b77
Change image and SVG width to 100%
djebsoft f06d3e7
Refactor header styles and adjust image dimensions
djebsoft 8d71317
Update container size and main padding
djebsoft ea45722
Adjust image size and header padding in CSS
djebsoft 316fe0e
Adjust padding and grid settings in style.css
djebsoft File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,33 +1,46 @@ | ||
| <!DOCTYPE html> | ||
| <html lang="en"> | ||
| <head> | ||
| <meta charset="UTF-8" /> | ||
| <meta name="viewport" content="width=device-width, initial-scale=1.0" /> | ||
| <title>Wireframe</title> | ||
| <link rel="stylesheet" href="style.css" /> | ||
| </head> | ||
| <body> | ||
| <header> | ||
| <h1>Wireframe</h1> | ||
| <p> | ||
| This is the default, provided code and no changes have been made yet. | ||
| </p> | ||
| </header> | ||
| <main> | ||
| <article> | ||
| <img src="placeholder.svg" alt="" /> | ||
| <h2>Title</h2> | ||
| <p> | ||
| Lorem ipsum dolor sit amet consectetur adipisicing elit. Quisquam, | ||
| voluptates. Quisquam, voluptates. | ||
| </p> | ||
| <a href="">Read more</a> | ||
| </article> | ||
| </main> | ||
| <footer> | ||
| <p> | ||
| This is the default, provided code and no changes have been made yet. | ||
| </p> | ||
| </footer> | ||
| </body> | ||
|
|
||
| <head> | ||
| <meta charset="UTF-8" /> | ||
| <meta name="viewport" content="width=device-width, initial-scale=1.0" /> | ||
| <title>Wireframe task</title> | ||
| <link rel="stylesheet" href="style.css" /> | ||
| </head> | ||
|
|
||
| <body> | ||
| <header> | ||
| <h1>Wireframe task</h1> | ||
| <p>what is wireframe, readme file and git branch ?</p> | ||
| </header> | ||
|
|
||
| <main> | ||
| <article> | ||
| <img src="https://www.nicepng.com/png/full/357-3576824_this-free-icons-png-design-of-readme-document.png" alt=""/> | ||
| <h2>Readme File</h2> | ||
| <p>a readme file demonstrates what the project does, why it is useful and how can a user get started with it.</p> | ||
| <a href="https://docs.github.com/en/repositories/managing-your-repositorys-settings-and-features/customizing-your-repository/about-readmes" | ||
| target="_self">Read more</a> | ||
| </article> | ||
|
|
||
| <article> | ||
| <img src="https://www.svgrepo.com/show/257406/wireframe.svg" alt=""/> | ||
| <h2>wireframe</h2> | ||
| <p>a wireframe is a simple visual guide (blue print) that represents the skeletal framework of a webpage.</p> | ||
| <a href="https://github.com/dwyl/learn-wireframing/blob/master/README.md" target="_self">Read more</a> | ||
| </article> | ||
|
|
||
| <article> | ||
| <img src="https://www.svgrepo.com/show/327279/git-branch.svg" alt=""/> | ||
| <h2>git branch</h2> | ||
| <p>a git branch is a separate independent copy of the source code within a version control system.</p> | ||
| <a href="https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/about-branches" | ||
| target="_self">Read more</a> | ||
| </article> | ||
| </main> | ||
|
|
||
| <footer> | ||
| <p>created by CYF with some changes made by Djebsoft</p> | ||
| </footer> | ||
| </body> | ||
| </html> |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,89 +1,69 @@ | ||
| /* 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); | ||
| --paper: oklash(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; | ||
| --container: 1280px | ||
| } | ||
| /* ====== Base Elements ====== | ||
| General rules for basic HTML elements in any context */ | ||
|
|
||
| body { | ||
| background: var(--paper); | ||
| color: var(--ink); | ||
| font: var(--font); | ||
| } | ||
|
|
||
| a { | ||
| padding: var(--space); | ||
| padding: var(-space); | ||
| border: var(--line); | ||
| max-width: fit-content; | ||
| } | ||
| img, | ||
| svg { | ||
| width: 100%; | ||
| width: 20%; | ||
| 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; | ||
| } | ||
| footer { | ||
| position: fixed; | ||
| bottom: 0; | ||
|
|
||
| header { | ||
| background-color: #d3d3d3; | ||
| padding: 1rem; | ||
| text-align: center; | ||
| } | ||
| /* ====== 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 { | ||
| padding-bottom: 1rem; | ||
| display: grid; | ||
| grid-template-columns: 1fr 1fr; | ||
| gap: var(--space); | ||
| > *:first-child { | ||
| grid-column: span 2; | ||
| max-width: var(--container); | ||
| margin: 0 auto calc(var(--space) * 4) auto; | ||
| > *: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; | ||
| grid-template-column: var(--space) 1fr var(--space); | ||
| border: var(--line); | ||
| } | ||
|
|
||
| > * { | ||
| grid-column: 2 / 3; | ||
|
|
||
| } | ||
|
|
||
| > img { | ||
| grid-column: span 3; | ||
| } | ||
|
|
||
| footer { | ||
| position: fixed; | ||
| bottom: 0; | ||
| width: 100%; | ||
| background-color: lightyellow; | ||
| text-align: center; | ||
| padding: 1rem; | ||
| border-top: 2px solid #aaa; | ||
| } | ||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.