Skip to content

Commit

Permalink
things changed
Browse files Browse the repository at this point in the history
  • Loading branch information
@etl12003
etl12003 committed Mar 5, 2017
1 parent c9f1051 commit 30fc458
Show file tree
Hide file tree
Showing 8 changed files with 102 additions and 150 deletions.
42 changes: 36 additions & 6 deletions html-ONLY-site/css/main.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -108,13 +108,20 @@ div.slide-menu{
display: flex;
flex-direction: column;
padding: 1rem;
padding-top: 5rem;
//padding-top: 5rem;
box-shadow: 5px 0px 8px rgba(0, 0, 0, 0.35);
}
div.slide-menu button{
position: fixed;
top: 0;
left: 0;
margin: 1rem 0;
text-align: left;
font-weight: 600;
font-size: 1.2rem;
}
div.slide-menu p{
//margin-top: rem;
}
div.slide-menu a{
//margin-top: 0rem;
}
div.close-menu{
position: fixed;
Expand All @@ -130,6 +137,23 @@ a.settings{
position: absolute;
bottom: 2rem;
}

div.well-preview{
position: fixed;
top: 4.7rem;
width: 95vw;
background-color: white;
border: 2px solid black;
margin: .5rem;
border-radius: 3px;
}
div.well-preview a{
position: absolute;
right: 2rem;
font-weight: 600;
text-decoration: none;
color: #65b2ff;
}
div.slide-menu a{
margin-bottom: 2rem;
text-decoration: none;
Expand Down Expand Up @@ -182,14 +206,17 @@ button {
main{
margin-top: 4.1rem;
}
form {
form, main.details {
display: flex;
flex-direction: column;

}
form ul, h2{
form ul, h2, main.details ul{
margin: 1rem
}
main.details li, main.details p{
margin: 0rem
}

label[for=well-picture] {
display: flex;
Expand Down Expand Up @@ -239,6 +266,7 @@ input[type=number].med-num{

textarea{
width: 100%;
height: 10rem;
}

li input[type=number] {
Expand Down Expand Up @@ -280,6 +308,8 @@ input[type=search]{
font-size: 1.2rem;
border-radius: 5px;
}
main.details{
}

/* ==========================================================================
Helper classes
Expand Down
5 changes: 4 additions & 1 deletion html-ONLY-site/css/well-card.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,10 @@ div.well-card h2{
border-bottom: none;
margin: 0;
}

div.well-card p{
border-bottom: none;
margin-top: .25rem;
}
div.well-card {
border-bottom: 2px solid #4d4d4d;
}
Expand Down
54 changes: 26 additions & 28 deletions html-ONLY-site/details.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,76 +35,74 @@
<button><a href="form.html"><img alt="edit" src="img/edit.svg" ></a></button>
</nav>

<main>
<h3 for="well-picture">
<main class="details">
<img src="img/add-img-icon.png"/>
</h3>
<input type="file" id="well-picture" accept="image/*">

<ul class="inputs" id="report-metadata">
<li><h3 for="well-completion-date">Date well completed</h3>
<p type="date" id="well-completion-date">date</p>
<li><h3>Date well completed</h3>
<p id="well-completion-date">date</p>
</li>

<li>
<h3 for="report-completion-date">Date of report</h3>
<p type="date" id="report-completion-date">date</p>
<h3>Date of report</h3>
<p id="report-completion-date">date</p>
</li>

<li>
<h3 for="permit-number">Permit number</h3>
<p type="number" min="1" id="permit-number" class="long-num">
<h3>Permit number</h3>
<p id="permit-number" class="long-num">364746</p>
</li>

<li>
<h3 for="registrant-number">Registrant number</h3>
<p type="number" min="1" id="registrant-number" class="long-num">
<h3>Registrant number</h3>
<p id="registrant-number" class="long-num">65146</p>
</li>

<li>
<h3 for="state-well-number">State well number</h3>
<p type="number" min="1" id="state-well-number" class="long-num">
<h3>State well number</h3>
<p id="state-well-number" class="long-num">380975</p>
</li>

<li>
<h3 for="other-number">Other number</h3>
<p type="number" min="1" id="other-number" class="long-num">
<h3>Other number</h3>
<p id="other-number" class="long-num">8960</p>
</li>
</ul>


<h2>Owner Info</h2>
<ul class="inputs" id="owner-info">
<li><h3 for="name">Name</h3>
<p type="text" id="name"></li>
<li><h3>Name</h3>
<p id="name">Joe</p>
</li>

<li>
<h3 for="address">Address</h3>
<p type="text" id="address">
<h3>Address</h3>
<p id="address">98 Street rd</p>
</li>

<li>
<h3 for="town">Town</h3>
<p type="text" id="town">
<h3>Town</h3>
<p id="town">Storrs</p>
</li>

<li>
<h3 for="zip-code">Zip code</h3>
<p type="number" min="1" id="zip-code" class="med-num">
<h3 >Zip code</h3>
<p id="zip-code" class="med-num">584758</p>
</li>
</ul>

<h2>Well location</h2>
<ul class="inputs" id="owner-info">

<li>
<h3 for="address">Address</h3>
<p type="text" id="address">
<h3>Address</h3>
<p type="text" id="address">4 Street rd</p>
</li>

<li>
<h3 for="town">Town</h3>
<p type="text" id="town">
<h3>Town</h3>
<p type="text" id="town">Storrs</p>
</li>

<li>
Expand Down
24 changes: 14 additions & 10 deletions html-ONLY-site/form.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -117,9 +117,12 @@ <h2>Well location</h2>
</li>

<li id="get-gps-local">
<label for="gps-coordinates">GPS coordinates</label>
<input type="text" id="gps-coordinates">
<button onclick="getLocation()"><img alt="get location" src="img/gps.svg"></button>
<label for="gps-coordinates">GPS coordinates <button onclick="getLocation()"><img alt="get location" src="img/gps.svg"></button></label>
<label for="gps-coordinates">Latitude</label>
<input type="text" id="gps-coordinates-latitude">
<label for="gps-coordinates">Longitude</label>
<input type="text" id="gps-coordinates-longitude">

</li>

<li>
Expand Down Expand Up @@ -208,6 +211,11 @@ <h2>Yield Test</h2>
<label for="yield-gpm">Yield</label>
<input type="number" min="1" id="yeld-gpm"> gallons per minute
</li>

<li>
<label for="yield-test-notes">Yield test notes</label>
<textarea id="yield-test-notes"></textarea>
</li>

</ul>

Expand Down Expand Up @@ -277,15 +285,11 @@ <h2>Screen Details</h2>

</ul>

<h2>Depth From Land To Surface</h2>
<ul class="inputs" id="depth-from-surface">
<h2>Other Notes</h2>
<ul class="inputs" id="notes">

<li>
<input type="number" min="1"> feet
<input type="text">
<input type="number" min="1"> feet
<input type="text">
<input type="number" min="1"> feet
<textarea id="notes"></textarea>
</li>

</ul>
Expand Down
21 changes: 18 additions & 3 deletions html-ONLY-site/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
<!-- Place favicon.ico in the root directory -->
<link rel="stylesheet" href="css/normalize.css">
<link rel="stylesheet" href="css/main.css">
<link rel="stylesheet" href="css/well-card.css">
<script src="js/vendor/modernizr-2.8.3.min.js"></script>
</head>

Expand All @@ -36,10 +37,16 @@

<div class="close-menu closed" id="close-menu" onclick="document.getElementById('menu').classList.toggle('closed'); document.getElementById('close-menu').classList.toggle('closed')"></div>
<div class="slide-menu closed" id="menu">
<p>Currntly signed in as:
<h3>my.name@ct.gov</h3>

<p>Currntly signed in as: <br>

</p>
<h3>my.name@ct.gov</h3>
<a href="#">Logout</a>

<button>Terrain</button>
<button>Satilite</button>

<a class="settings" href="#">Settings</a>

</div>
Expand All @@ -52,13 +59,21 @@ <h3>my.name@ct.gov</h3>
<script async defer
src="https://maps.googleapis.com/maps/api/js?key=AIzaSyCNSoPsxLd0LbvQaH9R6npO7jj-jKAXyQ4&callback=initMap">
</script>

<div class="well-preview well-card clearfix">
<div class="well-img"></div>
<div>
<h2>Well Name</h2>
<p>short well description</p>
<a href="details.html">DETAILS</a>
</div>
</div>

</main>

<nav class="bottom-nav">
<button><a href="index.html"><img src="img/map.svg" alt="menu" /></a></button>
<button><a href="wells-list.html"><img src="img/well.png" alt="menu" /></a></button>
<button><a href="problems.html"><img src="img/problem.svg" alt="menu" /></a></button>
</nav>

<nav class="fabs">
Expand Down
8 changes: 4 additions & 4 deletions html-ONLY-site/js/main.js
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
function initMap() {
var uluru = {lat: -25.363, lng: 131.044};
var location = {lat: 41.812013, lng: -72.249019};
var map = new google.maps.Map(document.getElementById('map'), {
zoom: 4,
center: uluru
zoom: 16,
center: location
});
var marker = new google.maps.Marker({
position: uluru,
position: location,
map: map
});
}
Expand Down
Loading

0 comments on commit 30fc458

Please sign in to comment.