Merge branch 'master' into master

2017-04-07 22:21:21 -04:00 · 2017-04-07 22:21:21 -04:00 · fef478781d
commit fef478781d
parent bf7cefa516 c1a553d2c2
81 changed files with 979 additions and 400 deletions
--- a/app/assets/images/background-photo.jpeg
+++ b/app/assets/images/background-photo.jpeg
--- a/app/assets/stylesheets/components.scss
+++ b/app/assets/stylesheets/components.scss
@ -1,5 +1,9 @@
@import 'variables';

+.app-body{
+ -ms-overflow-style: -ms-autohiding-scrollbar; 
+}
+
 .button {
  background-color: darken($color4, 3%);
  font-family: inherit;