aa. DMPRoadmap/roadmap#571 ...

Reverted to Gemfile and Gemfile.lock compatible to pass tests. DMPRoadmap/roadmap#571

Merge branch 'CDL-MVP' into issue571

Merge branch 'CDLUC3-issue573' into CDL-MVP

updated gitignore that was preventing new overrides.scss from being committed DMPRoadmap/roadmap#573

tinymce refactoring for notes using JS. DMPRoadmap/roadmap#571 ...

tinymce refactoring for notes using JS. DMPRoadmap/roadmap#571

tinymce refactoring for answers using JS. TODO adding events. DMPRoadmap/roadmap#571

tinymce gem removed from any view. DMPRoadmap/roadmap#571

tinymce answer events for editor working. DMPRoadmap/roadmap#571

fixed typos in js.erb template. DMPRoadmap/roadmap#571

extend renamed to define since more appropiate. DMPRoadmap/roadmap#571

Added new branded scss files to travis

commented out old styling to make it easier to determine whether boostrap or old css is controlling layout/styling DMPRoadmap/roadmap#573

refactored scss to include easily brandable overrides to the sites generic styling. also added a new file to override boostrap and added a section at bottom of dmproadmap variable file for new variables DMPRoadmap/roadmap#573

Merge pull request #70 from DMPRoadmap/CDL-MVP ...

pulling in initial grid layout for Boostrap

Merge pull request #574 from CDLUC3/issue552 ...

Setup Boostrap's grid system

fixed tests broken by change to core page structure DMPRoadmap/roadmap#552

switched every page to use bootstrap's row/col grid system DMPRoadmap/roadmap#552

pulled bootstrap in and updated basic header/footer/main content to use the grid system. Updated static pages, home page and contact us page to use grid system DMPRoadmap/roadmap#552

added package-lock.json to gitignore.

Merge pull request #69 from DMPRoadmap/CDL-MVP ...

Pulling in npm package manger, auto-save fix, and minor styling changes

Merge pull request #570 from DigitalCurationCentre/issue551 ...

front-end dependencies handled through npm.

Merge branch 'CDL-MVP' into issue551

front-end dependencies handled through npm. DMPRoadmap/roadmap#551

removed unsaved changes message since no longer is needed

Merge branch 'CDLUC3-CDL-MVP' into CDL-MVP

fixed typo in scss

updated base.scss to use header margin variable from dmproadmap.scss

commented out new public export controller tests. need to research best way to install wkhtmltopdf on travis

test for public_pages controller and a new update.js for plans page

text changes for DMPRoadmap/roadmap#498

fixed broken tests and added functional tests for public_pages_controller

fixed minor styling issues with sizes of input fields on signin/create pages

fixed sizing of input fields and added data contact phone to project details

fixed alignment issues on share plan page

Merge pull request #67 from DMPRoadmap/CDL-MVP ...

rebase with latest from DMPRoadmap