Merge 37e5816 into e668077

akhilome · Sep 26, 2018 · 8c91f01 · 8c91f01
2 parents e668077 + 37e5816
commit 8c91f01
Show file tree

Hide file tree

Showing 9 changed files with 28 additions and 102 deletions.
diff --git a/ui/add-food.html b/ui/add-food.html
@@ -13,7 +13,6 @@
     <div class="site-title">
       <h2><a href="index.html">Kiakia Food</a></h2>
     </div>
-
     <nav>
       <a href="#" class="nav-mobile">☰ menu</a>
       <ul>
@@ -27,7 +26,6 @@ <h2><a href="index.html">Kiakia Food</a></h2>
   <div class="wrapper">    
     <section class="container">
       <h2>Add New Food Item</h2>
-
       <form>
         <input type="text" name="food-item" placeholder="Food Name" required>
         <input type="number" name="food-price" placeholder="Price" required>
@@ -40,7 +38,6 @@ <h2>Add New Food Item</h2>
     <div class="footer-left">
       <p>kiakia food</p>
     </div>
-
     <div class="footer-right">
       <p>&copy; 2018</p>
     </div>

diff --git a/ui/assets/main.css b/ui/assets/main.css
@@ -2,13 +2,12 @@ body {
   background: #fff;
   color: #333;
   font-family: 'Open Sans', sans-serif;
-  font-size: 16px;
+  font-size: 18px;
   line-height: 1.75;
   margin: 0;
 }
 
 /* Navigation */
-
 header {
   align-items: center;
   display: flex;
@@ -46,7 +45,6 @@ nav ul {
 }
 
 /* Buttons */
-
 button a {
   color: #fff;
 }
@@ -88,7 +86,6 @@ button.primary:hover {
 }
 
 /* Misc */
-
 a {
   color: #2a9971;
   text-decoration: none;
@@ -116,7 +113,6 @@ img.food {
 }
 
 /* Frontpage 2 */
-
 .outline {
   display: flex;
   flex-direction: column;
@@ -125,29 +121,27 @@ img.food {
 
 .outline h1 {
   font-size: 1.8rem;
+  font-family: 'Comfortaa', cursive;
   padding: 25px 15px;
   text-align: center;
 }
 
-.outline h1,
-.outline h2 {
-  font-family: 'Comfortaa', cursive;
+.outline-inner {
+  display: flex;
+  flex-wrap: wrap;
+  justify-content: space-evenly;
 }
 
-.outline-odd,
-.outline-even {
+.outline-inner > div {
   align-items: center;
   display: flex;
-  justify-content: space-around;
+  flex-direction: column;
+  justify-content: space-evenly;
   min-height: 480px;
-}
-
-.outline-even {
-  flex-direction: row-reverse;
+  text-align: center;
 }
 
 /* Frontpage 3 */
-
 .admin {
   align-items: center;
   background: #eee;
@@ -164,7 +158,6 @@ footer {
 }
 
 /* Wrapper */
-
 .wrapper {
   align-items: center;
   display: flex;
@@ -180,7 +173,6 @@ footer {
 }
 
 /* Form Elements */
-
 form {
   display: block;
 }
@@ -194,9 +186,14 @@ input {
   width: 180px;
 }
 
+input::placeholder {
+  font-size: 16px;
+}
+
 input[type="submit"] {
-  width: calc(100% - 20px);
   background: #1d6b4f;
+  margin: auto;
+  width: auto;
 }
 
 input[type="checkbox"] {
@@ -217,7 +214,6 @@ fieldset > div {
 }
 
 /* Order History */
-
 .order-history {
   display: flex;
   flex-wrap: wrap;
@@ -243,7 +239,6 @@ fieldset > div {
 }
 
 /* Admin Dashboard */
-
 .admin-orders,
 .admin-menu {
   display: flex;
@@ -274,18 +269,9 @@ fieldset > div {
 }
 
 /* Media Queries */
-
-@media only screen and (min-width: 720px) {
-  img.food {
-    width: 480px;
-  }
-}
-
 @media only screen and (max-width: 720px) {
-  .outline-odd,
-  .outline-even {
-    flex-direction: column;
-    text-align: center;
+  body {
+    font-size: 16px;
   }
 
   header {

diff --git a/ui/index.html b/ui/index.html
@@ -13,7 +13,6 @@
     <div class="site-title">
       <h2><a href="index.html">Kiakia Food</a></h2>
     </div>
-
     <nav>
       <a href="#" class="nav-mobile">☰ menu</a>
       <ul>
@@ -28,39 +27,21 @@ <h2><a href="index.html">Kiakia Food</a></h2>
     <h2>Quell Your Hunger in Minutes</h2>
     <a href="sign-up.html"><button class="btn-primary">Get Food ⟶</button></a>
   </section>
-  
+
   <section class="outline">
-    <h1>tasty treats you should NOT resist</h1>
-    <div class="outline-odd">
-      <div class="outline-copy">
-        <h2>Chicken Wings</h2>
-        <p>... spiced to perfection.</p>
-      </div>
-
-      <div>
-        <img class="food" src="assets/images/food-1.png" alt="Chicken Wings">
-      </div>
-    </div>
-
-    <div class="outline-even">
-      <div class="outline-copy">
-        <h2>Shrimps &amp; Prawns</h2>
-        <p>... with a slice of sweet orange and deeply satisfying chips.</p>
-      </div>
-
+    <h1>tasty treats you should not resist</h1>
+    <div class="outline-inner">
       <div>
         <img class="food" src="assets/images/food-2.png" alt="Shrimps">
+        <h3>Shrimps and Prawns</h3>
       </div>
-    </div>
-
-    <div class="outline-odd">
-      <div class="outline-copy">
-        <h2>Turkey Wings</h2>
-        <p>... that turn heads.</p>
+      <div>
+        <img class="food" src="assets/images/food-1.png" alt="Chicken Wings">
+        <h3>Chicken Wings</h3>
       </div>
-
       <div>
         <img class="food" src="assets/images/food-3.png" alt="Turkey Wings">
+        <h3>Turkey Wings</h3>
       </div>
     </div>
   </section>
@@ -77,7 +58,6 @@ <h2>Admin?</h2>
     <div class="footer-left">
       <p>kiakia food</p>
     </div>
-
     <div class="footer-right">
       <p>&copy; 2018</p>
     </div>

diff --git a/ui/menu.html b/ui/menu.html
@@ -13,7 +13,6 @@
     <div class="site-title">
       <h2><a href="index.html">Kiakia Food</a></h2>
     </div>
-
     <nav>
       <a href="#" class="nav-mobile">☰ menu</a>
       <ul>
@@ -65,16 +64,13 @@ <h3>Burger</h3>
       <a href="add-food.html"><div class="order-card order-card__admin order-card__admin--new">
         <h3>Add New Item</h3>
       </div></a>
-
     </section>
   </div>
 
-
   <footer>
     <div class="footer-left">
       <p>kiakia food</p>
     </div>
-
     <div class="footer-right">
       <p>&copy; 2018</p>
     </div>

diff --git a/ui/order-history.html b/ui/order-history.html
@@ -13,7 +13,6 @@
     <div class="site-title">
       <h2><a href="index.html">Kiakia Food</a></h2>
     </div>
-
     <nav>
       <a href="#" class="nav-mobile">☰ menu</a>
       <ul>
@@ -29,22 +28,18 @@ <h2><a href="index.html">Kiakia Food</a></h2>
         <h3>Burger</h3>
         <p>Purchased: 05-06-2018</p>
       </div>
-
       <div class="order-card">
         <h3>Shrimps</h3>
         <p>Purchased: 05-06-2018</p>
       </div>
-
       <div class="order-card">
         <h3>Spiced Turkey</h3>
         <p>Purchased: 01-06-2018</p>
       </div>
-
       <div class="order-card">
         <h3>Burger</h3>
         <p>Purchased: 30-05-2018</p>
       </div>
-
       <div class="order-card">
         <h3>Chicken & Chips</h3>
         <p>Purchased: 30-05-2018</p>
@@ -56,7 +51,6 @@ <h3>Chicken & Chips</h3>
     <div class="footer-left">
       <p>kiakia food</p>
     </div>
-
     <div class="footer-right">
       <p>&copy; 2018</p>
     </div>

diff --git a/ui/orders.html b/ui/orders.html
@@ -13,7 +13,6 @@
     <div class="site-title">
       <h2><a href="index.html">Kiakia Food</a></h2>
     </div>
-
     <nav>
       <a href="#" class="nav-mobile">☰ menu</a>
       <ul>
@@ -23,7 +22,6 @@ <h2><a href="index.html">Kiakia Food</a></h2>
     </nav>
   </header>
 
-
   <div class="wrapper">
     <h2>People Are Hungry!</h2>
     <section class="container admin-orders">
@@ -37,7 +35,6 @@ <h3>Spiced Turkey</h3>
             <button>Mark Done</button>
           </div>
         </div>
-
         <div class="order-card order-card__admin">
           <h3>Shrimps</h3>
           <p>Order Date: 01-06-2018</p>
@@ -48,7 +45,6 @@ <h3>Shrimps</h3>
             <button>Mark Done</button>
           </div>
         </div>
-
         <div class="order-card order-card__admin">
           <h3>Chicken & Chips</h3>
           <p>Order Date: 21-05-2018</p>
@@ -59,7 +55,6 @@ <h3>Chicken & Chips</h3>
             <button>Mark Done</button>
           </div>
         </div>
-
         <div class="order-card order-card__admin">
           <h3>Shrimps</h3>
           <p>Order Date: 20-05-2018</p>
@@ -70,7 +65,6 @@ <h3>Shrimps</h3>
             <button>Mark Done</button>
           </div>
         </div>
-
         <div class="order-card order-card__admin">
           <h3>Chicken & Chips</h3>
           <p>Order Date: 20-05-2018</p>
@@ -81,7 +75,6 @@ <h3>Chicken & Chips</h3>
             <button>Mark Done</button>
           </div>
         </div>
-
         <div class="order-card order-card__admin">
           <h3>Burger</h3>
           <p>Order Date: 20-05-2018</p>
@@ -95,12 +88,10 @@ <h3>Burger</h3>
     </section>
   </div>
 
-
   <footer>
     <div class="footer-left">
       <p>kiakia food</p>
     </div>
-
     <div class="footer-right">
       <p>&copy; 2018</p>
     </div>