27-attritbutes-complete

Author: ayadtarraf

week-2/18-git-merge/readme.md

@@ -43,9 +43,10 @@ Now edit the `style.css` file and change the colour of the links in your message
 
 Next, you will need to push the `orange_links` branches. When you have a _new_ branch, you have to add extra information to the _first_ `push` command:
 
-```shell
+````shell
 git push -u origin orange_links
-```
+```gi
+
 
 When you have successfully pushed your `orange_links` branch, you should see the following in your GitHub repository.
 
@@ -72,3 +73,4 @@ Now that you've created the pull request, make some final checks and then merge
 ![Screenshot of the open pull request screen in GitHub](/images/18/pull-request-3.png)
 
 Congratulations! You have now changed the colour of the links and merged those changes to your `master` branch.
+````

week-2/18-git-merge/styles.css

@@ -4,4 +4,3 @@
   font-weight: 700;
   text-decoration: none;
 }
-.link

week-3/27-attributes/index.html

@@ -42,30 +42,30 @@ <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" />
+                <input type="text" name="billing-address-2" id="billing-address-2" required />
               </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>
-                <input type="text" name="delivery-address-2" id="delivery-address-2" />
+                <input type="text" name="delivery-address-2" id="delivery-address-2" required />
               </p>
               <p>
                 <label for="delivery-address-postcode">Postcode</label>
@@ -77,11 +77,22 @@ <h2 class="checkout__title">Checkout</h2>
               </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
+                  value="United Kingdom"
+                  type="text"
+                  name="delivery-country"
+                  id="delivery-country"
+                  readonly
+                />
               </p>
               <fieldset>
                 <legend>Delivery Options</legend>