|
1 | 1 | <!DOCTYPE html> |
2 | 2 | <html lang="en"> |
| 3 | +<<<<<<< Updated upstream |
3 | 4 | <head> |
4 | 5 | <meta charset="UTF-8" /> |
5 | 6 | <meta name="viewport" content="width=device-width, initial-scale=1.0" /> |
@@ -30,4 +31,74 @@ <h2>Title</h2> |
30 | 31 | </p> |
31 | 32 | </footer> |
32 | 33 | </body> |
| 34 | +======= |
| 35 | + <head> |
| 36 | + <meta charset="UTF-8" /> |
| 37 | + <meta name="viewport" content="width=device-width, initial-scale=1.0" /> |
| 38 | + <title>Wireframe</title> |
| 39 | + <link rel="stylesheet" href="style.css" /> |
| 40 | + </head> |
| 41 | + <body> |
| 42 | + <header> |
| 43 | + <h1>Workflow</h1> |
| 44 | + <p> |
| 45 | + Together, a README, wireframe, and Git branch form a basic web |
| 46 | + development workflow: the README explains the project, the |
| 47 | + wireframe plans the design and structure, and Git branches help |
| 48 | + developers work on feature safely without affecting the main |
| 49 | + code. |
| 50 | + </p> |
| 51 | + </header> |
| 52 | + <main> |
| 53 | + <div class="firstrow"> |
| 54 | + <article> |
| 55 | + <img src="Readme.png" alt="Readme file example" id="readmeimg" /> |
| 56 | + <h2>README files</h2> |
| 57 | + <p> |
| 58 | + A README file explains a project to other developers and |
| 59 | + users. It usually includes the project purpose, installation |
| 60 | + steps, usage instructions, features and other important |
| 61 | + information so anyone can quickly understand and work with |
| 62 | + the project. |
| 63 | + </p> |
| 64 | + <a |
| 65 | + href="https://docs.github.com/en/repositories/managing-your-repositorys-settings-and-features/customizing-your-repository/about-readmes" |
| 66 | + >Read more</a |
| 67 | + > |
| 68 | + </article> |
| 69 | + </div> |
| 70 | + <div class="secondrow"> |
| 71 | + <article> |
| 72 | + <img src="Wireframe.png" alt="Wireframe example" /> |
| 73 | + <h2>Wireframe</h2> |
| 74 | + <p> |
| 75 | + A wireframe isa simple visual layout used to plan the |
| 76 | + structure, content, and use experience of a website or |
| 77 | + application before development begins. |
| 78 | + </p> |
| 79 | + <a |
| 80 | + href="https://www.figma.com/resource-library/what-is-wireframing" |
| 81 | + >Read more</a |
| 82 | + > |
| 83 | + </article> |
| 84 | + <article> |
| 85 | + <img src="GitBranch.png" alt="Git branching example" /> |
| 86 | + <h2>Git Branching</h2> |
| 87 | + <p> |
| 88 | + Git branching allows developers to work on new features |
| 89 | + or fixes separately without affecting the main project |
| 90 | + code until the changes are ready to merge |
| 91 | + </p> |
| 92 | + <a |
| 93 | + href="https://www.atlassian.com/git/tutorials/using-branches" |
| 94 | + >Read more</a |
| 95 | + > |
| 96 | + </article> |
| 97 | + </div> |
| 98 | + </main> |
| 99 | + <footer> |
| 100 | + <p>This website was coded by Szidonia Bodo</p> |
| 101 | + </footer> |
| 102 | + </body> |
| 103 | +>>>>>>> Stashed changes |
33 | 104 | </html> |
0 commit comments