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.

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

Amend location page to include styling #53

Merged
merged 2 commits into from
Feb 19, 2017

Conversation

hminnovation
Copy link
Contributor

Including style amending the tags (to page.operating_hours) and html tags.

@hminnovation
Copy link
Contributor Author

hminnovation commented Feb 19, 2017

@shacker would you be able to check that this branch is:

  • styled as per Location styling #32
  • that the map behaves as expected. When you scroll down the page the scroll shouldn't be trapped by the map, but otherwise the map should behave as a google map would normally (e.g. if you double click the map it'll zoom, if you click and drag the map it'll move)

@shacker
Copy link
Contributor

shacker commented Feb 19, 2017

When I check out this branch, map works great - doesn't trap mouse scroll, but still interactive. The display is as shown here, and does not match #32.

screenshot 2017-02-19 13 46 45

@hminnovation hminnovation mentioned this pull request Feb 19, 2017
3 tasks
@hminnovation
Copy link
Contributor Author

Have you included an introduction when you populated the page?

@shacker
Copy link
Contributor

shacker commented Feb 19, 2017

Ah yes, that's much nicer. I'll get intros into all of the locations.

That still leaves the styling of the hours at bottom left of the map, like this (all the way up against the left edge of the viewport):

screenshot 2017-02-19 14 03 15

@hminnovation
Copy link
Contributor Author

hminnovation commented Feb 19, 2017

Those lines from the template shouldn't be there

At line 83 there was

    {% if page.is_open %}
      Open Now!
    {% else %}
      Currently Closed
    {% endif %}

    {% for hours in page.operating_hours %}
        <li>{{ hours }}</li>
    {% endfor %}

but that is deleted in commit 0d5ce5a so it's odd that it's still appearing on your local version.

The page should (minus the odd black line that the screen capture tool added) look like
screencapture-localhost-8000-location-index-page-location-1487196676466

@shacker shacker merged commit 68180bf into master Feb 19, 2017
@shacker shacker deleted the 51-location-styling-missing-styles branch February 19, 2017 22:27
@shacker
Copy link
Contributor

shacker commented Feb 19, 2017

Thank you!

@hminnovation hminnovation mentioned this pull request Feb 20, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants