From 4ac972bbdbd73628d8fde2e55a768193c38573dd Mon Sep 17 00:00:00 2001
From:  <adam.claxton@uconn.edu>
Date: Thu, 1 Dec 2016 21:54:54 -0500
Subject: [PATCH] Fixed return page navbar

---
 html/webpages/returnPage.html | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/html/webpages/returnPage.html b/html/webpages/returnPage.html
index 5099368..11208b3 100644
--- a/html/webpages/returnPage.html
+++ b/html/webpages/returnPage.html
@@ -31,6 +31,10 @@
       text-align: center;
     }
 
+    div.returnButtonContainer{
+      text-align: right;
+    }
+
     img.device{
       display: block;
     }
@@ -64,15 +68,15 @@
           <span class="icon-bar"></span>
           <span class="icon-bar"></span>
         </button>
-        <a class="navbar-brand" href="#"><img src="../imgs/synchrony-financial-logo-dlpx.png" style = "height: 100%"></a>
+        <a class="navbar-brand" href="#"><img src="../imgs/synchrony-financial-logo-dlpx.png" style = "height: 100%;"></a>
       </div>
       <div id="navbar" class="navbar-collapse collapse" aria-expanded="false">
         <ul class="nav navbar-nav navbar-right">
           <li><a href="homePage.html">Home</a></li>
           <li><a href="requestPage.html">Request Device</a></li>
-          <li><a href="#">Return Device</a></li>
+          <li><a href="returnPage.html">Return Device</a></li>
           <li><a href="listingPage.html">Device Listing</a></li>
-          <li><a href="#">User Information</a></li>
+          <li><a href="shoppingCart.html">Shopping Cart</a></li>
         </ul>
       </div>
     </div>
@@ -93,6 +97,7 @@ <h2>Devices to Be Returned</h2>
     <div id = "devContainer">
 
       <div class="deviceContainer">
+<div>
         <div class="imgContainer">
           <img src="../imgs/iphone.png" class="device">name
         </div>
@@ -100,8 +105,13 @@ <h2>Devices to Be Returned</h2>
           <p>Checked out: 4/28/2016</p>
           <p>You've had this device for 20 months, 5 days, 11 hours and 2 minutes</p>
         </div>
+</div>
+        <div class="returnButtonContainer">
+          <button class="returnButton" id="button1" type="button">Return</button>
+        </div>
       </div>
       <br>
     </div>
     <script src="../javascript/return.js" href></script>
+    <!-- <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.1.1/jquery.min.js"></script> -->
   </body>
\ No newline at end of file