@@ -13,86 +13,94 @@ <h1>Wireframe To Web Code</h1>
1313 Wireframes, README & Git branches, explained.
1414 </ p >
1515 </ header >
16+
1617 < main >
1718 < article >
1819 < img src ="wireframe.png " alt ="Picture of an example wireframe " />
20+
1921 < h2 > Wireframe</ h2 >
22+
2023 < p >
2124 A wireframe is a plan outlining the basic structure of the elements of a website, webpage or digital interface -
2225 its purpose is to give the viewer a rough idea of how content will be displayed and function in the final product,
2326 such as banners, navigation bars, buttons, images, and articles.
24- In essence, a wireframe is the architectural "blueprint" of a web document.
25- </ p >
27+ In essence, a wireframe is the architectural "blueprint" of a web document.
28+ </ p >
29+
2630 < a href ="https://www.figma.com/resource-library/what-is-wireframing/ "> Read more</ a >
2731 </ article >
2832 </ main >
2933
30- < main >
34+
3135 < article >
3236 < img src ="README-File-Example.jpg " alt ="Picture of an example README file " />
33- < h2 > README</ h2 >
37+
38+ < h2 > README</ h2 > ]
39+
3440 < p >
3541 The purpose of a README file is to provide important information for a project or piece of software.
3642 This may include things such as:
37-
38- < ul > installation instructions</ ul >
39-
40- < ul > Version info</ ul >
41-
42- < ul > System requirements</ ul >
43-
44- < ul > A basic description of the software</ ul >
45-
46- < ul > Troubleshooting and support contact info</ ul >
47-
48- < ul > Copyright and licensing info</ ul >
43+ </ p >
4944
50- < ul > Source links</ ul >
45+ < ul >
46+ < li > instructions</ li >
47+
48+ < li > Version info</ li >
49+
50+ < li > System requirements</ li >
51+
52+ < li > A basic description of the software</ li >
53+
54+ < li > Troubleshooting and support contact info</ li >
55+
56+ < li > Copyright and licensing info</ li >
57+
58+ < li > Source links</ li >
59+ </ ul >
5160
52- README files are commonly written in Markdown (.md) plaintext format.
53- </ p >
61+ < p >
62+ README files are commonly written in Markdown (.md), plaintext format.
63+ </ p >
5464 < a href ="https://www.makeareadme.com/ "> Read more</ a >
5565 </ article >
56- </ main >
5766
58- < main >
67+
5968 < article >
6069 < img src ="CYF-Git-Branch-Example.png " alt ="Picture of CYF Example Git Branch Diagram " />
70+
6171 < h2 > Git Branches</ h2 >
62- < p >
6372
64- < ul > In Git, repositories take the form of "branches."</ ul >
73+ < ul >
74+ < li > In Git, repositories take the form of "branches."</ li >
6575
66- < ul > The default branch is called "main" - this represents the original code, developmental history and
67- final version of a project.</ ul >
76+ < li > The default branch is called "main" - this represents the original code, developmental history and
77+ final version of a project.</ li >
6878
69- < ul > Branches create a copy off of "main" to work on specific issues or parts of a project in isolation.</ ul >
79+ < li > Branches create a copy off of "main" to work on specific issues or parts of a project in isolation.</ li >
7080
71- < ul > Individual edits made and saved to a repository are called "commits."</ ul >
81+ < li > Individual edits made and saved to a repository are called "commits."</ li >
7282
73- < ul > Essentially, a "branch" is a specific sequence of "commits" representing a specific version of a project.</ ul >
83+ < li > Essentially, a "branch" is a specific sequence of "commits" representing a specific version of a project.</ li >
7484
75- < ul > Once finalised, a branch can be merged with the "main" via a "Pull Request"</ ul >
76-
77- < br >
85+ < li > Once finalised, a branch can be merged with the "main" via a "Pull Request"</ li >
86+ </ ul >
7887
79- Branches themselves can also be branched. This allows edits and issues to be specified even further.
88+ < p >
89+ Branches themselves can also be branched. This allows edits and issues to be specified even further.
90+ </ p >
8091
81- < br >
82-
83- As an example: A user is working on their own branch of a project and identifies issues with two specific areas of code,
84- but the rest of the project is otherwise fine. Individual branches could be created to focus on addressing these problems
85- separately, without worry of accidentally making any drastic changes to the overall project.
92+ < p >
93+ As an example: A user is working on their own branch of a project and identifies issues with two specific ares of code,
94+ but the rest of the project is otherwise fine. Individual branches could be created to focus on addressing these
95+ problems separately, without worry of accidentally making any drastic changes to the overall project.
96+ </ p >
8697
87- </ p >
8898 < a href ="https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/about-branches ">
89- Read more</ a >
99+ Read more
100+ </ a >
90101 </ article >
91- </ main >
102+
92103 < footer >
93- < p >
94- This is the default, provided code and no changes have been made yet.
95- </ p >
96104 </ footer >
97105 </ body >
98106</ html >
0 commit comments