upgraded to Bootstrap 3 and added disappering navigation sidebar

USGS-WiM / merlin_django

Mercury Research Laboratory Information Management System written in Django with Django Rest Framework

Other

2 stars 6 forks source link

upgraded to Bootstrap 3 and added disappering navigation sidebar #10

Closed BlakeDraper closed 10 years ago

BlakeDraper commented 10 years ago

Merge can ignore the commenting out of the REST Services URL in mercurylab/views.py and the Database object in mercuryproject/settings.py. I forgot to revert those before committing. Do accept the changes to the dependencies. Bootstrap's files are updated to v3.2.