diff --git a/README.md b/README.md index 4bf50fe..2e61138 100644 --- a/README.md +++ b/README.md @@ -17,6 +17,7 @@ with gender/age inputs. page 3 (reservations page): input name, contact info, date, time. ##Wire Frames ##User Stories + ##Project Management strategy and tools Waffle for issues Slack for Instant Messaging. diff --git a/food.css b/food.css index d12eccc..5934073 100644 --- a/food.css +++ b/food.css @@ -28,6 +28,10 @@ input { /*@keyframes rotate { 100% { transform:rotate(360deg); } }*/ +.address:hover { + cursor: pointer; +} + .button { border: 5px solid black; width: 150px; diff --git a/googleMap.js b/googleMap.js index a51a479..6c59135 100644 --- a/googleMap.js +++ b/googleMap.js @@ -6,7 +6,7 @@ function mapMarker(event) { var mapGeo = new google.maps.Geocoder(); for(var i = 0; i < allLocations.length; i++) { if(address === allLocations[i].address) { - mapGeo.geocode( { 'address': address}, function(results, status) { + mapGeo.geocode( { 'address': address + ', Seattle, WA'}, function(results, status) { if (status == 'OK') { // map.setCenter(results[0].geometry.location); new google.maps.Marker({ diff --git a/index.html b/index.html index a4f9b3f..1ea982c 100644 --- a/index.html +++ b/index.html @@ -16,8 +16,6 @@

Seattle Outreach Services

Find me some food!

- - - + diff --git a/newLocation.css b/newLocation.css index d3267fe..22c0b42 100644 --- a/newLocation.css +++ b/newLocation.css @@ -1,17 +1,34 @@ body { - background-color: #9f7e69; + background-color: #A7CCED; font-family: 'Work Sans', sans-serif; } +body::after { + content: ""; + background-image: url(assets/working/png/skyline1.jpg); + background-size: 100% 100%; + opacity: 0.1; + top: 0; + left: 0; + right: 0; + bottom: 0; + position: absolute; + z-index: -1; +} + header { width: 50%; margin: 0 auto; - background-color: #ffeee2; + background-color: #7489A1; border-radius: 8px; - border: 2px solid #d2bba0; + border: 2px solid #304D6D; margin-bottom: 20px; } +fieldset { + padding: 5px; +} + nav { margin-bottom: 10px; } @@ -19,9 +36,9 @@ nav { main { width: 50%; margin: 0 auto; - background-color: #ffeee2; + /*background-color: #7489A1;*/ border-radius: 8px; - border: 2px solid #d2bba0; + border: 2px solid #304D6D; } .headerText { @@ -30,7 +47,8 @@ main { .mainPageLink { text-decoration: none; - background-color: #d2bba0; + color: #0A223C; + /*background-color: #304D6D;*/ } #confirmationContainer { @@ -41,8 +59,9 @@ main { #form { width: 60%; margin: 0 auto; - background-color: #ffeee2; border-radius: 8px; - border: 2px solid #d2bba0; + box-shadow: inset 0 0 30px #7489A1; + border: 2px solid #304D6D; margin-top: 40px; + padding: 10px; } diff --git a/newLocation.js b/newLocation.js index 7a3c4da..43430d0 100644 --- a/newLocation.js +++ b/newLocation.js @@ -6,39 +6,47 @@ function newLocationFormSubmit(event) { var hood = event.target.hood.value; var address = event.target.address.value; var days = [ ]; + var displayDays = [ ]; var mondayStatus = function() { if(document.querySelector('.monday').checked) { days.push(1); + displayDays.push('Monday'); } }; var tuesdayStatus = function() { if(document.querySelector('.tuesday').checked) { days.push(2); + displayDays.push('Tuesday'); } }; var wednesdayStatus = function() { if(document.querySelector('.wednesday').checked) { days.push(3); + displayDays.push('Wednesday'); } }; var thursdayStatus = function() { if(document.querySelector('.thursday').checked) { days.push(4); + displayDays.push('Thursday'); } }; var fridayStatus = function() { if(document.querySelector('.friday').checked) { days.push(5); + displayDays.push('Friday'); } }; var saturdayStatus = function() { if(document.querySelector('.saturday').checked) { days.push(6); + displayDays.push('Saturday'); } }; var sundayStatus = function() { if(document.querySelector('.sunday').checked) { days.push(7); + displayDays.push('Sunday'); } }; mondayStatus(); @@ -55,7 +63,7 @@ function newLocationFormSubmit(event) { 'name' : name, 'hood' : hood, 'address' : address, - 'days' : days, + 'days' : displayDays.join(', '), 'openTime' : openTime, 'closeTime' : closeTime, 'restrictions' : restrictions,