kmeyerhofer commented 5 years ago

Project Styling

Features

Blue color scheme with white tree svg background for a winter-y feel.
- Color variables used, simplifying changes if desired.
Navbar visible on every page, allowing site wide navigation.
Lots of use of display: grid; and display: flex; for modularity and ease of positioning.
Data organizational changes to all /show.html.erb pages. (Not counting the numerous <div> container additions)

This branch is dependent on the move-new-item branch. ( PR #22 )

kmeyerhofer commented 5 years ago

Adds two fonts to the project, from Font Squirrel. Germania One: Image of Glacial Indifference and Glacial Indifference:

Germania One is set for all h1, h2 and h3.

Glacial Indifference is set for the rest of the text.

meyerhoferc commented 5 years ago

Please resolve merge conflicts here as well

kmeyerhofer commented 5 years ago

Merge conflicts fixed. @meyerhoferc

meyerhoferc commented 5 years ago

@kmeyerhofer some merge conflicts and tests are not passing. I'm going to make some commits in the interest of time