Skip to content

Commit

Permalink
Navbar works on the return page
Browse files Browse the repository at this point in the history
  • Loading branch information
arc12012 committed Dec 3, 2016
1 parent 04defd1 commit 50489cb
Showing 1 changed file with 12 additions and 12 deletions.
24 changes: 12 additions & 12 deletions html/webpages/returnPage.html
Original file line number Diff line number Diff line change
Expand Up @@ -50,42 +50,42 @@
div.sidebar{
display: inline-block;
border-right-style: solid;
height: 100%;
width: 200px;
height: 100vh;
background-color: #E9EAEB;
}

ul.nav{
padding: 0px;
}
</style>
<nav class="navbar navbar-inverse navbar-fixed-top" id = "navbar">
<nav class="navbar navbar-inverse navbar-fixed-top" id = "navbaruniversal">
</nav>
</head>
<body>
<div class="col-sm-3 col-md-2 sidebar">
<ul class="nav nav-sidebar">
<h4>Filter by Time Ordered</h4>
<li clsas = "option"><a href="#">All devices</a></li>
<li class = "option"><a href="#">Past month</a></li>
<li class = "option"><a href="#">1-3 months ago</a></li>
<li class = "option"><a href="#">3-5 months ago</a></li>
<li class="option"><a href="#">5+ months ago</a></li>
<li class = "option"><a href="#">5+ months ago</a></li>
</ul>
</div>
<div class="displayDevice">
<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>
<div class="imgContainer">
<img src="../imgs/iphone.png" class="device">name
</div>
<div class="deviceInfo">
<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="deviceInfo">
<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>
Expand Down

0 comments on commit 50489cb

Please sign in to comment.