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.

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

Jump to bottom

Hotfix/patreon update #398

Merged
merged 17 commits into from
Dec 28, 2017
Merged

Hotfix/patreon update #398

merged 17 commits into from
Dec 28, 2017

Conversation

KurtPrice
Copy link
Contributor

Context

Summary of Changes

  • Added a brief blurb and link to the patreon account to _footer.html.haml

@tkwidmer
Copy link
Contributor

I commented on the issue @KurtPrice, with a recommendation about adding a more visable button to the home page. And once you do that, i'll get this merged.

Thanks so much @KurtPrice

tkwidmer
tkwidmer requested changes Dec 20, 2017
View reviewed changes
Copy link
Contributor

@tkwidmer tkwidmer left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just want to see the bigger button in addition the footer text, to make it more visable.

@KurtPrice
Copy link
Contributor Author

Sounds good, I'll work on adding that. This is my first ruby project.

@tkwidmer tkwidmer temporarily deployed to refuge-staging-14-pr-398 December 20, 2017 22:48 Inactive
@tkwidmer
Copy link
Contributor

If you merge develop, I made a change that makes the footer more readable: #403

@tkwidmer tkwidmer temporarily deployed to refuge-staging-14-pr-398 December 20, 2017 23:32 Inactive
@tkwidmer
Copy link
Contributor

looks like the image itself needs to be commited into the assets/images directory

@KurtPrice
Copy link
Contributor Author

Wow, I don't know how I failed to commit that. I will merge in develop and add that image for sure this time.

@tkwidmer tkwidmer temporarily deployed to refuge-staging-14-pr-398 December 21, 2017 19:46 Inactive
@tkwidmer
Copy link
Contributor

Last comment, I promise.

can you update the code to the following

   .row.even-more-headroom
     .col-xs-6.col-sm-3.col-sm-offset-3
       = link_to image_tag("app-store.svg", role: "img"), "https://itunes.apple.com/us/app/refuge-restrooms/id968531953?mt=8"
     .col-xs-6.col-sm-3.col-sm-offset-3
        = link_to image_tag("play-store.png"), "https://play.google.com/store/apps/details?id=org.refugerestrooms"
   .row.more-headroom.splash-bottom-padding
     .col-xs-12.col-sm-6.col-sm-offset-3
      = link_to image_tag("patreon.png"), "https://patreon.com/refugerestrooms"

With this implementation the app store and play store logos will show up side by side, with the patreon link below them.

Thanks so much for your work on this!

@KurtPrice KurtPrice closed this Dec 22, 2017
@KurtPrice KurtPrice reopened this Dec 22, 2017
@tkwidmer
Copy link
Contributor

Specs are now failing, which seems unrelated. Code looks good to me.

@tkwidmer
Copy link
Contributor

I'm restarting the build, since the Cucumber tests sometimes fail intermittently

@tkwidmer tkwidmer temporarily deployed to refuge-staging-14-pr-398 December 27, 2017 20:34 Inactive
@KurtPrice
Copy link
Contributor Author

Awesome, thanks for the help, I was worried about what was causing it to fail. It looks pretty good to me!

@tkwidmer
Copy link
Contributor

@KurtPrice no problem. I noticed the problem, and figured I could just fix the issue instead of bothering you since i had said earlier it was going to be my last comment. ^.^ Thanks for contributing!

@tkwidmer tkwidmer merged commit 74e2fc5 into RefugeRestrooms:develop Dec 28, 2017
tkwidmer added a commit that referenced this pull request Dec 28, 2017
@tkwidmer
Release 1.10.0 (#408)
b4f7cb7 
* css: Update `.navbar-brand` width (45px -> 16em)

Wider div.navbar-brand element prevents text overflowing to two lines.

This is for the "Refuge Restrooms" text at the top left of the page.

* Use suggested workaround to fix VO for older iOS

* Update README.md

* Update CONTRIBUTING.md

* Set piwik to use async tracking in production (#395)

This prevents the tracking script from blocking the loading of other
scripts, such as the Google Maps script.

* Bump bugnag version (#391)

Doesn't appear to have any breaking changes, but do please test against my tests. I didn't see anything, neither did my CI.

* Fix Footer being cut off #401 (#403)

* contributing.md: Add a step to install VirtualBox (#404)

VirtualBox is required in order to run our Vagrant setup.

(First-timers would get an error message about needing a "provider,"
but letting people know ahead of time to get VirtualBox is nicer.)

* Adds unit tests to check that there are ARIA labels on the search buttons (#407)

* add aria-label to search button

* add aria-label to search-by-location button

* Add tests for ARIA labels on search buttons (splash page)

* Hotfix/patreon update (#398)

* Added patreon link to the _footer.html.haml file for all pages

* Actually added patreon.png to app/assets/images/patreon.png

* Moved google-play image to the same area as the app store image.

* Added the patreon image with link to the index page. The patreon.png was also added to app/assets/images

* Changed code to make images side by side

* fixed syntax issue in haml

* Update to correct haml syntax

* remove second offset

* Label search buttons for screen readers (#383)

* add aria-label to search button

* add aria-label to search-by-location button
@Robertgriggs49 Robertgriggs49 mentioned this pull request Jan 5, 2018
Closed
5 tasks
DeeDeeG pushed a commit to DeeDeeG/refugerestrooms that referenced this pull request Oct 15, 2018
@KurtPrice @DeeDeeG
Hotfix/patreon update (RefugeRestrooms#398)
fd7e573 
* Added patreon link to the _footer.html.haml file for all pages

* Actually added patreon.png to app/assets/images/patreon.png

* Moved google-play image to the same area as the app store image.

* Added the patreon image with link to the index page. The patreon.png was also added to app/assets/images

* Changed code to make images side by side

* fixed syntax issue in haml

* Update to correct haml syntax

* remove second offset
DeeDeeG pushed a commit to DeeDeeG/refugerestrooms that referenced this pull request Oct 15, 2018
@tkwidmer @DeeDeeG
Release 1.10.0 (RefugeRestrooms#408)
e91bb0b 
* css: Update `.navbar-brand` width (45px -> 16em)

Wider div.navbar-brand element prevents text overflowing to two lines.

This is for the "Refuge Restrooms" text at the top left of the page.

* Use suggested workaround to fix VO for older iOS

* Update README.md

* Update CONTRIBUTING.md

* Set piwik to use async tracking in production (RefugeRestrooms#395)

This prevents the tracking script from blocking the loading of other
scripts, such as the Google Maps script.

* Bump bugnag version (RefugeRestrooms#391)

Doesn't appear to have any breaking changes, but do please test against my tests. I didn't see anything, neither did my CI.

* Fix Footer being cut off RefugeRestrooms#401 (RefugeRestrooms#403)

* contributing.md: Add a step to install VirtualBox (RefugeRestrooms#404)

VirtualBox is required in order to run our Vagrant setup.

(First-timers would get an error message about needing a "provider,"
but letting people know ahead of time to get VirtualBox is nicer.)

* Adds unit tests to check that there are ARIA labels on the search buttons (RefugeRestrooms#407)

* add aria-label to search button

* add aria-label to search-by-location button

* Add tests for ARIA labels on search buttons (splash page)

* Hotfix/patreon update (RefugeRestrooms#398)

* Added patreon link to the _footer.html.haml file for all pages

* Actually added patreon.png to app/assets/images/patreon.png

* Moved google-play image to the same area as the app store image.

* Added the patreon image with link to the index page. The patreon.png was also added to app/assets/images

* Changed code to make images side by side

* fixed syntax issue in haml

* Update to correct haml syntax

* remove second offset

* Label search buttons for screen readers (RefugeRestrooms#383)

* add aria-label to search button

* add aria-label to search-by-location button
DeeDeeG pushed a commit to DeeDeeG/refugerestrooms that referenced this pull request Nov 3, 2018
@KurtPrice @DeeDeeG
Hotfix/patreon update (RefugeRestrooms#398)
029d703 
* Added patreon link to the _footer.html.haml file for all pages

* Actually added patreon.png to app/assets/images/patreon.png

* Moved google-play image to the same area as the app store image.

* Added the patreon image with link to the index page. The patreon.png was also added to app/assets/images

* Changed code to make images side by side

* fixed syntax issue in haml

* Update to correct haml syntax

* remove second offset
DeeDeeG pushed a commit to DeeDeeG/refugerestrooms that referenced this pull request Nov 3, 2018
@tkwidmer @DeeDeeG
Release 1.10.0 (RefugeRestrooms#408)
89b3f27 
* css: Update `.navbar-brand` width (45px -> 16em)

Wider div.navbar-brand element prevents text overflowing to two lines.

This is for the "Refuge Restrooms" text at the top left of the page.

* Use suggested workaround to fix VO for older iOS

* Update README.md

* Update CONTRIBUTING.md

* Set piwik to use async tracking in production (RefugeRestrooms#395)

This prevents the tracking script from blocking the loading of other
scripts, such as the Google Maps script.

* Bump bugnag version (RefugeRestrooms#391)

Doesn't appear to have any breaking changes, but do please test against my tests. I didn't see anything, neither did my CI.

* Fix Footer being cut off RefugeRestrooms#401 (RefugeRestrooms#403)

* contributing.md: Add a step to install VirtualBox (RefugeRestrooms#404)

VirtualBox is required in order to run our Vagrant setup.

(First-timers would get an error message about needing a "provider,"
but letting people know ahead of time to get VirtualBox is nicer.)

* Adds unit tests to check that there are ARIA labels on the search buttons (RefugeRestrooms#407)

* add aria-label to search button

* add aria-label to search-by-location button

* Add tests for ARIA labels on search buttons (splash page)

* Hotfix/patreon update (RefugeRestrooms#398)

* Added patreon link to the _footer.html.haml file for all pages

* Actually added patreon.png to app/assets/images/patreon.png

* Moved google-play image to the same area as the app store image.

* Added the patreon image with link to the index page. The patreon.png was also added to app/assets/images

* Changed code to make images side by side

* fixed syntax issue in haml

* Update to correct haml syntax

* remove second offset

* Label search buttons for screen readers (RefugeRestrooms#383)

* add aria-label to search button

* add aria-label to search-by-location button
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@tkwidmer tkwidmer tkwidmer approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@KurtPrice @tkwidmer @mi-wood