Skip to content

Style suggestion page #39

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

Merged
Hasnake merged 6 commits into from
Nov 5, 2016
Merged

Style suggestion page #39

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
946b76b
Worked on matching the styling on the location suggestion pages to th…
dkulp23 Nov 5, 2016
6789a98
Changed some styling. Also fixed issue with mapping.
dkulp23 Nov 5, 2016
32447a6
Added pointer to address class on food.html to show that it is clicka…
dkulp23 Nov 5, 2016
814c064
Added box shadow to form on suggestion page.
dkulp23 Nov 5, 2016
9050c38
Fixed display of open days on new location confirmation page.
dkulp23 Nov 5, 2016
f9c385b
Removed script reference from index.html page to eliminate error mess…
dkulp23 Nov 5, 2016
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
1 change: 1 addition & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
4 changes: 4 additions & 0 deletions food.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,10 @@ input {

/*@keyframes rotate { 100% { transform:rotate(360deg); } }*/

.address:hover {
cursor: pointer;
}

.button {
border: 5px solid black;
width: 150px;
Expand Down
2 changes: 1 addition & 1 deletion googleMap.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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({
Expand Down
4 changes: 1 addition & 3 deletions index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,6 @@ <h1 id="SOS">Seattle Outreach Services</h1>
<p id="foodCaption">Find me some food!</p>
<img src="assets/working/png/burgershake.png" class="button" id="food" onClick="window.location='food.html'">
</div>

<script type="text/javascript" src="data.js"></script>
<script type="text/javascript" src="app.js"></script>

</body>
</html>
35 changes: 27 additions & 8 deletions newLocation.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,27 +1,44 @@
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;
}

main {
width: 50%;
margin: 0 auto;
background-color: #ffeee2;
/*background-color: #7489A1;*/
border-radius: 8px;
border: 2px solid #d2bba0;
border: 2px solid #304D6D;
}

.headerText {
Expand All @@ -30,7 +47,8 @@ main {

.mainPageLink {
text-decoration: none;
background-color: #d2bba0;
color: #0A223C;
/*background-color: #304D6D;*/
}

#confirmationContainer {
Expand All @@ -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;
}
10 changes: 9 additions & 1 deletion newLocation.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand All @@ -55,7 +63,7 @@ function newLocationFormSubmit(event) {
'name' : name,
'hood' : hood,
'address' : address,
'days' : days,
'days' : displayDays.join(', '),
'openTime' : openTime,
'closeTime' : closeTime,
'restrictions' : restrictions,
Expand Down