search

sgruhier / foundation_rails_helper

Rails Helper for Zurb Fondation framework
MIT License
153 stars 84 forks source link

Adding closable keyword option to display_flash_messages #141

Closed jeffse closed 8 years ago

jeffse commented 8 years ago

Adding the optional keyword option 'closable' to the display_flash_messages method that accepts a boolean true/false, defaulting to true. If false, suppresses the close buttons on the callouts.

jeffse commented 8 years ago

I wanted to be able to use the display_flash_messages but found the close buttons to be not quite right for my project. This adds the 'closable' option to the method.

dsandstrom commented 8 years ago

Thanks, looks good.

dgmstuart commented 8 years ago

Hi @jeffse - the foundation-6 branch has been cleaned up a bit - could you rebase on top of it?

dgmstuart commented 8 years ago

Context: here are the docs: http://foundation.zurb.com/sites/docs/close-button.html

jeffse commented 8 years ago

Thanks for your git help, @dgmstuart! I'm still a relative newbie to git, but I think I was able to finally resolve everything here.

I changed display_flash_messages to use keyword arguments, and added some documentation in the comments of the method at least.

dgmstuart commented 8 years ago

@jeffse looks like we're getting closer, but there are now 26 commits on this branch - most of which are previous commits by other people. We need this branch to ONLY contain your commits which are for this feature - I think it's only these two:

...and actually you're probably better off squashing those two into one.

The step in my instructions which is supposed to get rid of all the other commits is this one, during the rebase:

You'll want to delete all of the lines except the ones relating to commits which you've created

did you try that?

dgmstuart commented 8 years ago

@jeffse actually it looks like your master and foundation-6 branches are way behind the ones on this repo - you'll need to follow my instructions from the beginning to get them up-to-date.

jeffse commented 8 years ago

I already spent two hours doing a bunch of manual merges from what I thought were correct. I really think it's better for me to trash this branch, fork off a brand-new copy, and make my changes there.

dgmstuart commented 8 years ago

@jeffse sorry to hear that. Best of luck with your new branch.