search

MainStMission / food-pantry-manager

Other
10 stars 14 forks source link

Merge UI and Master #109

Closed tbrooke closed 11 years ago

tbrooke commented 11 years ago

I can go one of two ways on this I can merge master into my UI branch to add the pagination and pdf or just merge ui into master and just have one master -

I am leaning toward the latter to just add the UI to master - the only way I know to do this is to merge the two branches locally then push the combined branches to master - this will bypass a pull request and may break the build - but should be OK

If anyone thinks another way is better let me know if not I'll try to get this tomorrow

coreypurcell commented 11 years ago

I'm all for going back to standard twitter bootstrap. I never had the time to do the design the way I wanted it.

tbrooke commented 11 years ago

OK my UI is twitter bootstrap with simple form just designed a little different

I did put in ActiveAdmi on the backend which has it's own styling but that is just a gem

On Wed, Feb 27, 2013 at 12:12 PM, Corey Purcell notifications@github.comwrote:

I'm all for going back to standard twitter bootstrap. I never had the time to do the design the way I wanted it.

— Reply to this email directly or view it on GitHubhttps://github.com/MainStMission/food-pantry-manager/issues/109#issuecomment-14186015 .

tbrooke commented 11 years ago

I'll merge master into UI and leave master as is so we will have two different UIs