From 946b76b5ffb7bd5e2e823208a960740911bba8b5 Mon Sep 17 00:00:00 2001 From: Dana Kulp Date: Sat, 5 Nov 2016 08:25:25 -0700 Subject: [PATCH 1/6] Worked on matching the styling on the location suggestion pages to the reservation pages. --- newLocation.css | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/newLocation.css b/newLocation.css index d3267fe..0e32568 100644 --- a/newLocation.css +++ b/newLocation.css @@ -1,17 +1,21 @@ body { - background-color: #9f7e69; + background-color: #A7CCED; font-family: 'Work Sans', sans-serif; } 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 +23,10 @@ nav { main { width: 50%; margin: 0 auto; - background-color: #ffeee2; + background-color: #7489A1; border-radius: 8px; - border: 2px solid #d2bba0; + border: 2px solid #304D6D; + padding: 5px; } .headerText { @@ -30,7 +35,7 @@ main { .mainPageLink { text-decoration: none; - background-color: #d2bba0; + background-color: #304D6D; } #confirmationContainer { @@ -41,8 +46,8 @@ main { #form { width: 60%; margin: 0 auto; - background-color: #ffeee2; + background-color: #7489A1; border-radius: 8px; - border: 2px solid #d2bba0; + border: 2px solid #304D6D; margin-top: 40px; } From 6789a986d5df3f8db6e50f3d68a4b00afebcc4cf Mon Sep 17 00:00:00 2001 From: Dana Kulp Date: Sat, 5 Nov 2016 09:50:49 -0700 Subject: [PATCH 2/6] Changed some styling. Also fixed issue with mapping. --- googleMap.js | 2 +- newLocation.css | 22 ++++++++++++++++++---- style.css | 1 + 3 files changed, 20 insertions(+), 5 deletions(-) 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/newLocation.css b/newLocation.css index 0e32568..22ecbfc 100644 --- a/newLocation.css +++ b/newLocation.css @@ -3,6 +3,19 @@ body { 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; @@ -23,10 +36,9 @@ nav { main { width: 50%; margin: 0 auto; - background-color: #7489A1; + /*background-color: #7489A1;*/ border-radius: 8px; border: 2px solid #304D6D; - padding: 5px; } .headerText { @@ -35,7 +47,8 @@ main { .mainPageLink { text-decoration: none; - background-color: #304D6D; + color: #0A223C; + /*background-color: #304D6D;*/ } #confirmationContainer { @@ -46,8 +59,9 @@ main { #form { width: 60%; margin: 0 auto; - background-color: #7489A1; + /*background-color: #7489A1;*/ border-radius: 8px; border: 2px solid #304D6D; margin-top: 40px; + padding: 10px; } diff --git a/style.css b/style.css index f507f46..8e1940f 100644 --- a/style.css +++ b/style.css @@ -62,6 +62,7 @@ cite { /*@keyframes rotate { 100% { transform:rotate(360deg); } }*/ + .button { border: 5px solid black; width: 150px; From 32447a6bbb52034e4dc5df5c356309dd92d49325 Mon Sep 17 00:00:00 2001 From: Dana Kulp Date: Sat, 5 Nov 2016 10:03:36 -0700 Subject: [PATCH 3/6] Added pointer to address class on food.html to show that it is clickable. --- food.css | 4 ++++ style.css | 1 - 2 files changed, 4 insertions(+), 1 deletion(-) 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/style.css b/style.css index 8e1940f..f507f46 100644 --- a/style.css +++ b/style.css @@ -62,7 +62,6 @@ cite { /*@keyframes rotate { 100% { transform:rotate(360deg); } }*/ - .button { border: 5px solid black; width: 150px; From 814c06458183300f9e3db55e972555e1722c4ce3 Mon Sep 17 00:00:00 2001 From: Dana Kulp Date: Sat, 5 Nov 2016 10:09:03 -0700 Subject: [PATCH 4/6] Added box shadow to form on suggestion page. --- newLocation.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/newLocation.css b/newLocation.css index 22ecbfc..22c0b42 100644 --- a/newLocation.css +++ b/newLocation.css @@ -59,8 +59,8 @@ main { #form { width: 60%; margin: 0 auto; - /*background-color: #7489A1;*/ border-radius: 8px; + box-shadow: inset 0 0 30px #7489A1; border: 2px solid #304D6D; margin-top: 40px; padding: 10px; From 9050c387641c85354da539b1a238c70d4c842f11 Mon Sep 17 00:00:00 2001 From: Dana Kulp Date: Sat, 5 Nov 2016 10:18:33 -0700 Subject: [PATCH 5/6] Fixed display of open days on new location confirmation page. --- newLocation.js | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) 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, From f9c385b818ae1e9b3f2bea70b37cceaff7644379 Mon Sep 17 00:00:00 2001 From: Dana Kulp Date: Sat, 5 Nov 2016 10:49:33 -0700 Subject: [PATCH 6/6] Removed script reference from index.html page to eliminate error message. --- README.md | 1 + index.html | 4 +--- 2 files changed, 2 insertions(+), 3 deletions(-) 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/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!

- - - +