diff --git a/Form-Controls/README.md b/Form-Controls/README.md index bfcdf6c0b..cc7c94258 100644 --- a/Form-Controls/README.md +++ b/Form-Controls/README.md @@ -35,13 +35,13 @@ Let's write out our testable criteria. Check each one off as you complete it. ### HTML -- [ ] My form is semantic html. -- [ ] All inputs have associated labels. -- [ ] My Lighthouse Accessibility score is 100. -- [ ] I require a valid name. I have defined a valid name as a text string of two characters or more. -- [ ] I require a valid email. -- [ ] I require one colour from a defined set of 3 colours. -- [ ] I require one size from a defined set of 6 sizes. +- [x] My form is semantic html. +- [x] All inputs have associated labels. +- [x] My Lighthouse Accessibility score is 100. +- [x] I require a valid name. I have defined a valid name as a text string of two characters or more. +- [x] I require a valid email. +- [x] I require one colour from a defined set of 3 colours. +- [x] I require one size from a defined set of 6 sizes. ## Resources diff --git a/Form-Controls/index.html b/Form-Controls/index.html index 65a866cdb..ddbf3cb01 100644 --- a/Form-Controls/index.html +++ b/Form-Controls/index.html @@ -1,27 +1,77 @@ - - - - My form exercise - - - - -
-

Product Pick

-
-
-
- - -
-
- - - + + + + + My form exercise + + + + + +
+

T-Shirt Order

+
+
+
+ +
+ Confirm Your Details + + + + + + + + +
+ + +
+ T-Shirt Colour + + + + + + +
+ + +
+ T-Shirt Size + + + +
+ + +
+
+ + + + \ No newline at end of file diff --git a/Wireframe/index.html b/Wireframe/index.html index 0e014e535..4fe30ece1 100644 --- a/Wireframe/index.html +++ b/Wireframe/index.html @@ -1,5 +1,6 @@ +<<<<<<< Updated upstream @@ -31,3 +32,99 @@

Title

+======= + + + + + CYF sprint 1 + + + + +
+

My First Program

+ +

What is the purpose of a README file?

+
+
+ +
+
+ ReadMe +

+ The purpose of a README file is to explain what a project is and how to use it. Furthermore, it helps anyone + who + read the project understand the project quickly. +

+ +
+ +
+
+
+
+
+ +
+
+ ReadMe +

+

What is the purpose of a wireframe?

+

+ + + + + +
+
+
+
+ ReadMe +

+

What is a branch in Git?

+

+ + + + + + +
+ +
+ + + + + +>>>>>>> Stashed changes diff --git a/Wireframe/style.css b/Wireframe/style.css index be835b6c7..28717089a 100644 --- a/Wireframe/style.css +++ b/Wireframe/style.css @@ -62,7 +62,7 @@ https://developer.chrome.com/docs/devtools/css/grid https://gridbyexample.com/learn/ */ main { - display: grid; + /* display: grid; */ grid-template-columns: 1fr 1fr; gap: var(--space); > *:first-child { @@ -74,6 +74,46 @@ 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. */ +<<<<<<< Updated upstream +======= +.Title { + text-align: center; + +} + +.article-boarding{ +border: 2px solid black; + border-radius: 5px; + margin: 0px 0px 0px 5px; + padding-bottom: 30px; + margin: auto; +} +.resize1{ + width: 500px; + align-content: center; + margin: auto; +} +.resize2{ + width: 500px; + height: 200px; + align-content: center; +} +.article-grid { + display: grid; + grid-template-columns: repeat(2, 1fr); + gap: 20px; +} +.article-row { + display: flex; + gap: 20px; + grid-template-columns: 1fr 1fr; + height: 920px; +} + +.article-row article { + flex: 1; +} +>>>>>>> Stashed changes article { border: var(--line); padding-bottom: var(--space); diff --git a/Wireframe/stylesheet.css b/Wireframe/stylesheet.css new file mode 100644 index 000000000..55caa7fe3 --- /dev/null +++ b/Wireframe/stylesheet.css @@ -0,0 +1,77 @@ +body { + margin: 0; + font-family: Arial, sans-serif; + background: #f5f5f5; +} + +/* Centered header */ +.header { + text-align: center; + padding: 30px 10px; +} + +/* Main centered container */ +.container { + width: 90%; + max-width: 1000px; + margin: auto; +} + +/* Featured article */ +.featured { + border: 1px solid #333; + background: #fff; + margin-bottom: 30px; +} + +.featured img { + width: 100%; + height: 260px; + object-fit: cover; +} + +.content { + padding: 20px; +} + +/* Two-column section */ +.grid { + display: grid; + grid-template-columns: 1fr 1fr; + gap: 25px; + margin-bottom: 40px; +} + +.card { + border: 1px solid #333; + background: #fff; +} + +.card img { + width: 100%; + height: 200px; + object-fit: cover; +} + +/* Button */ +button { + padding: 8px 14px; + border: 1px solid black; + background: white; + cursor: pointer; +} + +/* Footer */ +.footer { + text-align: center; + padding: 20px; + border-top: 1px solid #333; + background: #eee; +} + +/* Responsive */ +@media (max-width: 768px) { + .grid { + grid-template-columns: 1fr; + } +} \ No newline at end of file diff --git a/Wireframe/test1.HTML b/Wireframe/test1.HTML new file mode 100644 index 000000000..4d3ff2dbe --- /dev/null +++ b/Wireframe/test1.HTML @@ -0,0 +1,27 @@ + + + + + + Centralized Layout + + + + + + +
+

+

+
+ + +
+ + + + + + + +