Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

HW12-AnqiLi #5

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

HW12-AnqiLi #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
33 changes: 24 additions & 9 deletions lab/css/style.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,16 @@ body {
.map {
position: absolute;
right: 0px;
left: 340px;
left: 450px;
height: 100%;
top: 0;
}

.sidebar {
position: absolute;
left: 0px;
width: 340px;
width: 450px;
height:100%;
top: 0;
bottom: 0;
overflow-y: auto;
Expand All @@ -42,7 +43,7 @@ body {
position: fixed;
bottom: 0;
left: 0;
width: 340px;
width: 450px;
background-color: #fff;
padding: 20px;
}
Expand Down Expand Up @@ -74,13 +75,27 @@ Media Queries
============= */

@media screen and (min-width: 480px) and (max-width: 800px) {
/*.item {
background-color: blue;
}*/
map {
position: absolute;
right: 0px;
left: 475px; /* Increasing number of pixels makes map smaller */
height: 100%;
top: 0;
}
sidebar {
position: absolute;
left: 0px;
width: 475px;
top: 0;
bottom: 0;
overflow-y: auto;
padding: 20px;
padding-bottom: 60px;
}
}

@media screen and (max-width: 479px) {
/*.item {
background-color: red;
}*/
sidebar {
display:none;
}
}
177 changes: 141 additions & 36 deletions lab/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@
<meta charset="utf-8">
<!-- CSS Imports -->
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/leaflet/1.3.1/leaflet.css" integrity="sha256-iYUgmrapfDGvBrePJPrMWQZDcObdAcStKBpjP3Az+3s=" crossorigin="anonymous" />
<link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/css/bootstrap.min.css" integrity="sha384-ggOyR0iXCbMQv3Xipma34MD+dH/1fQ784/j6cY/iJTQUOhcWr7x9JvoRxT2MZw1T" crossorigin="anonymous">

<!-- Place framework CSS code here. -->
<link rel="stylesheet" href="css/reset.css" />
<link rel="stylesheet" href="css/style.css" />
Expand All @@ -13,44 +15,146 @@
<!-- Sidebar -->
<div class="sidebar">
<nav class="navbar navbar-default">
<div class="container-fluid clearfix">
<div class="topright-button" style="float: right">
[Add New]
</div>
<div class="navbar-header">
<a href="#">Manufacturers</a>
</div>
</div>
</nav>
<div class="item">
<h2 class="item-heading">Tandy’s Basketweavers</h2>
<div>490 Freedom Drive<br>
Philadelphia, PA 19425</div>
</div>
<div class="item">
<h2 class="item-heading">Basket Case</h2>
<div>400 S 46th Street<br>
Philadelphia, PA 19144</div>
</div>
<div class="item">
<h2 class="item-heading">Bas-kids: Baskets 4 Kids</h2>
<div>2558 Walnut Street<br>
Philadelphia, PA 19107</div>
</div>
<div class="item">
<h2 class="item-heading">Bask in the Glory</h2>
<div>2501 Walnut Street<br>
Philadelphia, PA 19107</div>
</div>
<div class="item">
<h2 class="item-heading">Basket Ball</h2>
<div>2542 Walnut Street<br>
Philadelphia, PA 19107</div>
</div>
<div class="sort">
Sort by <span class="sort-option selected">A–Z</span> <span class="sort-option">Inventory</span>
<div class="container-fluid clearfix">
<div class="navbar-header">
<h2 class="item-heading">Manufacturers&nbsp;</h2>
</div>
<div class="btn-group">
<button class="btn btn-info btn-sm" type="button">
Add New
</button>
<button type="button" class="btn btn-sm btn-info dropdown-toggle dropdown-toggle-split" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
<span class="sr-only">Toggle Dropdown</span>
</button>
<div class="dropdown-menu">
<a class="dropdown-item" href="#">View History</a>
<div class="dropdown-divider"></div>
<a class="dropdown-item" href="#">Email All Manufacturers</a>
</div>
</div>
<br> <br> <br>

<div class="input-group mb-3">
<input type="text" class="form-control" aria-label="Search" aria-describedby="basic-addon2">
<div class="input-group-append">
<span class="input-group-text" id="basic-addon2">Search</span>
</div>
</div>
</div>
</nav>

<div class="item">
<h2 class="item-heading">Tandy’s Basketweavers</h2>
<div>490 Freedom Drive<br>
Philadelphia, PA 19425</div>

<button type="button" class="btn btn-danger btn-sm" data-toggle="modal" data-target="#basicExampleModal">Low Inventory</button>

<div class="modal fade" id="basicExampleModal" tabindex="-1" role="dialog" aria-labelledby="exampleModalLabel"
aria-hidden="true">
<div class="modal-dialog" role="document">
<div class="modal-content">
<div class="modal-header">
<p class="modal-title" id="exampleModalLabel">Manufacturer</p>
<button type="button" class="close" data-dismiss="modal" aria-label="Close">
<span aria-hidden="true">&times;</span>
</button>
</div>
<div class="modal-body">

<div class="p-1 mb-3 bg-danger text-white" role="alert">
This manufacturer has low inventory
</div>

<div class="btn-group" role="group" aria-label="Basic example">
<h5><strong>Tandy’s Basketweavers</strong></h5> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
<button type="button" class="btn btn-outline-secondary btn-sm" data-toggle="tooltip">Edit</button>
<button type="button" class="btn btn-outline-secondary btn-sm">Delete</button>
<button type="button" class="btn btn-outline-secondary btn-sm">Export</button>
</div>
<br><br>


<div class="row">
<div class="col-sm-4">
<h7><strong>Address</strong></h8>
<p><font size="2">490 Freedom Drive Philadelphia, PA 19425</font></p>
</div>
<div class="col-sm-3">
<h7><strong>Contact</strong></h7>
<p><font size="2">Dave Javies <br> Senior Weaver <br> [email protected]</font></p>
</div>
<div class="col-sm-5">
<p><font size="7" color="#4BAFC8">324</font><br><font size="2.5" align="center">Baskets sold in past 7 days</font></p>
</div>
</div>
<br>

<h5><strong>Sales</strong></h5>
<br>
<table class="table">
<thead>
<tr>
<th scope="col">First Name</th>
<th scope="col">Last Name</th>
<th scope="col">Purcase</th>
</tr>
</thead>
<tbody>
<tr>
<td>Mark</td>
<td>Otto</td>
<td>Fruit Basket</td>
</tr>
<tr>
<td>Jacob</td>
<td>Thornton</td>
<td>Gift Basket</td>
</tr>
<tr>
<td>Larry</td>
<td>the Bird</td>
<td>Easter Basket</td>
</tr>
</tbody>
</table>

</div>
</div>
</div>
</div>

</div>
<div class="item">
<h2 class="item-heading">Basket Case</h2>
<div>400 S 46th Street<br>
Philadelphia, PA 19144</div>
</div>
<div class="item">
<h2 class="item-heading">Bas-kids: Baskets 4 Kids</h2>
<div>2558 Walnut Street<br>
Philadelphia, PA 19107</div>
</div>
<div class="item">
<h2 class="item-heading">Bask in the Glory</h2>
<div>2501 Walnut Street<br>
Philadelphia, PA 19107</div>
</div>
<div class="item">
<h2 class="item-heading">Basket Ball</h2>
<div>2542 Walnut Street<br>
Philadelphia, PA 19107</div>
</div>
<div class="sort">
<strong> Sort by </strong> <span class="sort-option">A–Z</span> <span class="sort-option">Inventory</span>
</div>





</div>

<!-- Map -->
<div id="map" class="map"></div>
<!-- Javascript Imports -->
Expand All @@ -59,5 +163,6 @@ <h2 class="item-heading">Basket Ball</h2>
<script src="https://cdnjs.cloudflare.com/ajax/libs/leaflet/1.3.1/leaflet.js" integrity="sha256-CNm+7c26DTTCGRQkM9vp7aP85kHFMqs9MhPEuytF+fQ=" crossorigin="anonymous"></script>
<!-- Place framework JS code here. -->
<script src="js/setup.js"></script>
<script src="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/js/bootstrap.min.js" integrity="sha384-JjSmVgyd0p3pXB1rRibZUAYoIIy6OrQ6VrjIEaFf/nJGzIxFDsf4x0xIM+B07jRM" crossorigin="anonymous"></script>
</body>
</html>