Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 17 additions & 17 deletions week-1/3-semantic-html/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -11,33 +11,33 @@
</head>

<body>
<div class="site-wrapper">
<div class="site-header">
<div class="site-header__title">Messages</div>
</div>
<div class="messages">
<div class="message">
<div class="message__author">Won</div>
<article class="site-wrapper">
<header role="banner" class="site-header">
<article class="site-header__title">Messages</article>
</header>
<main role="main" class="messages">
<article class="message">
<article class="message__author">Won</article>
<p class="message__content">Where should we meet later?</p>
<span class="message__time">Mar 25, 2018 7:25pm</span>
</div>
<div class="message">
<div class="message__author">Luke</div>
</article>
<article class="message">
<article class="message__author">Luke</article>
<p class="message__content">
Let's meet at the iCafe in Merchant City. https://goo.gl/maps/aza4h9nUBhn
</p>
<span class="message__time">Mar 25, 2018 7:35pm</span>
</div>
<div class="message">
<div class="message__author">Won</div>
</article>
<article class="message">
<article class="message__author">Won</article>
<p class="message__content">
Ok! https://media.giphy.com/media/l41K4KlVE8dgozf8I/giphy.gif
</p>
<span class="message__time">Mar 25, 2018 7:38pm</span>
</div>
</div>
<div id="result" class="result"></div>
</div>
</article>
</main>
<article id="result" class="result"></article>
</article>
<script defer src="/js/3-result.js"></script>
</body>
</html>
Binary file added week-2.zip
Binary file not shown.
4 changes: 3 additions & 1 deletion week-3/19-search/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,9 @@
<body>
<div class="site-wrapper">
<main>
<p>Delete this line and add your form.</p>
<form method="GET" action="https://www.google.com/search">
<input type="text" name="q" />
</form>
</main>
</div>
</body>
Expand Down
3 changes: 2 additions & 1 deletion week-3/20-labels/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,8 @@
<main>
<form method="GET" action="https://www.google.com/search">
<!-- Add a label here -->
<input type="text" name="q" />
<label for="search-input">Search on Google</label>
<input type="text" name="q" id="search-input" />
</form>
</main>
</div>
Expand Down
2 changes: 1 addition & 1 deletion week-3/21-buttons/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<form method="GET" action="https://www.google.com/search">
<label for="search-input">Search on Google</label>
<input type="text" name="q" id="search-input" />
<!-- Add a submit button here -->
<!-- Add a submit button here --><button type="submit">Search</button>
</form>
</main>
</div>
Expand Down
11 changes: 9 additions & 2 deletions week-3/22-checkout/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,15 @@ <h1 class="shopping-basket__title">Your Shopping Basket</h1>
<div class="checkout">
<h2 class="checkout__title">Checkout</h2>
<form method="GET" id="checkout-form" class="checkout__form">
<!-- Add the form fields here -->

<label for="customer-name">Customer name</label>
<!-- Add the form fields here --><input name="customer-name" id="customer-name" />text
<p>Contact info</p>
<label for="customer-email">Customer email</label>
<input name="customer-email" id="customer-email" />email
<p>More info</p>
<label for="customer-phone">Customer phone</label>
<input name="customer-phone" id="customer-phone" />tel
<p>done</p>
<button type="submit">Complete Purchase</button>
</form>
</div>
Expand Down
5 changes: 5 additions & 0 deletions week-3/23-comments/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,11 @@ <h1>Our t-shirts are amazing!</h1>
<p>Add your comments and let us know what you think!</p>

<!-- Your comment form goes here -->
<form method="get">
<label for="add-comment">Add Your Message</label>
<textarea id="add-comment"></textarea>
<button>Send Comment</button>
</form>
</div>
</main>
</div>
Expand Down
13 changes: 12 additions & 1 deletion week-3/24-dietary/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,18 @@ <h1>Codi Summit</h1>

<form>
<!-- Your multiple choice goes here -->
<button type="submit">Submit</button>
<fieldset>
<legend>Please select all of your dietary requirements</legend>

<input type="checkbox" /><label>Halal</label> <input type="checkbox" /><label
>Kosher</label
>
<input type="checkbox" /><label>Vegetarian</label> <input type="checkbox" /><label
>Vegan</label
>
<input type="checkbox" /><label>Gluten Free</label>
<button type="submit">Submit</button>
</fieldset>
</form>
</main>
</div>
Expand Down
8 changes: 7 additions & 1 deletion week-3/25-shirt-size/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,13 @@ <h1 class="shopping-basket__title">Your Shopping Basket</h1>
</div>
</td>
<td>
Medium
<form>
<select>
<option>Small</option>
<option selected>Medium</option>
<option>Large</option>
</select>
</form>
</td>
<td>
1
Expand Down
6 changes: 6 additions & 0 deletions week-3/25-shirt-size/styles.css
Original file line number Diff line number Diff line change
@@ -1 +1,7 @@
/* Add your CSS below */
.screenreader {
clip: rect(1px, 1px, 1px, 1px);
position: absolute !important;
left: -2000px;
display: none;
}
34 changes: 34 additions & 0 deletions week-3/26-checkout-groups/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,40 @@ <h1 class="shopping-basket__title">Your Shopping Basket</h1>
<h2 class="checkout__title">Checkout</h2>
<form method="GET" id="checkout-form" class="checkout__form">
<!-- Add the form fields here -->
<fieldset>
<legend>Billing Address</legend>
<label>Address Line 1</label>
<input type="text" name="first address" />
</fieldset>
<fieldset>
<label>Address Line 2</label>
<input type="text" name="second address" />
</fieldset>
<fieldset>
<label>Postcode</label>
<input type="text" name="Postcode1" />
</fieldset>
<fieldset>
<label>City</label>
<input type="text" name="city1" />
</fieldset>
<fieldset>
<legend>Delivery Address</legend>
<label>Address Line 1</label>
<input type="text" name="1st address" />
</fieldset>
<fieldset>
<label>Address Line 2</label>
<input type="text" name="2nd address" />
</fieldset>
<fieldset>
<label>Postcode</label>
<input type="text" name="Postcode2" />
</fieldset>
<fieldset>
<label>City</label>
<input type="text" name="city2" />
</fieldset>

<button type="submit">Complete Purchase</button>
</form>
Expand Down
26 changes: 20 additions & 6 deletions week-3/27-attributes/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -42,26 +42,26 @@ <h2 class="checkout__title">Checkout</h2>
<legend>Billing Address</legend>
<p>
<label for="billing-address-1">Address Line 1</label>
<input type="text" name="billing-address-1" id="billing-address-1" />
<input type="text" name="billing-address-1" id="billing-address-1" required />
</p>
<p>
<label for="billing-address-2">Address Line 2</label>
<input type="text" name="billing-address-2" id="billing-address-2" />
</p>
<p>
<label for="billing-postcode">Postcode</label>
<input type="text" name="billing-postcode" id="billing-postcode" />
<input type="text" name="billing-postcode" id="billing-postcode" required />
</p>
<p>
<label for="billing-city">City</label>
<input type="text" name="billing-city" id="billing-city" />
<input type="text" name="billing-city" id="billing-city" required />
</p>
</fieldset>
<fieldset>
<legend>Delivery Address</legend>
<p>
<label for="delivery-address-1">Address Line 1</label>
<input type="text" name="delivery-address-1" id="delivery-address-1" />
<input type="text" name="delivery-address-1" id="delivery-address-1" required />
</p>
<p>
<label for="delivery-address-2">Address Line 2</label>
Expand All @@ -73,15 +73,27 @@ <h2 class="checkout__title">Checkout</h2>
type="text"
name="delivery-address-postcode"
id="delivery-address-postcode"
required
/>
</p>
<p>
<label for="delivery-address-city">City</label>
<input type="text" name="delivery-address-city" id="delivery-address-city" />
<input
type="text"
name="delivery-address-city"
id="delivery-address-city"
required
/>
</p>
<p>
<label for="delivery-country">Country</label>
<input type="text" name="delivery-country" id="delivery-country" />
<input
type="text"
name="delivery-country"
id="delivery-country"
value="United Kingdom"
readonly
/>
</p>
<fieldset>
<legend>Delivery Options</legend>
Expand All @@ -91,6 +103,8 @@ <h2 class="checkout__title">Checkout</h2>
name="delivery-option"
id="delivery-option"
value="standard"
checked
disabled
/>
Royal Mail
</label>
Expand Down
2 changes: 1 addition & 1 deletion week-3/28-git-conflict/styles.css
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/* Add your own CSS code below */
.link {
color: orangered;
color: fuchsia;
font-weight: 700;
text-decoration: none;
}