about summary refs log tree commit diff
path: root/app/assets
diff options
context:
space:
mode:
authorShel R <Yiskah.Raphen@gmail.com>2017-04-07 22:11:24 -0400
committerGitHub <noreply@github.com>2017-04-07 22:11:24 -0400
commit451b7431c9d0a8bb34642d5af599bc48701376d2 (patch)
tree1be076bbade89fa78872d09b8961b5a183230e25 /app/assets
parent8fa8004a2b090a3911cce11473bb926ebd6782a6 (diff)
parent530725ba3c4fefc6fd3e45cda588daa5af2ea9ec (diff)
Merge branch 'master' into patch-2
Diffstat (limited to 'app/assets')
-rw-r--r--app/assets/images/background-photo.jpegbin894792 -> 214464 bytes
-rw-r--r--app/assets/stylesheets/components.scss4
2 files changed, 4 insertions, 0 deletions
diff --git a/app/assets/images/background-photo.jpeg b/app/assets/images/background-photo.jpeg
index b0a88ff35..d7937fd4b 100644
--- a/app/assets/images/background-photo.jpeg
+++ b/app/assets/images/background-photo.jpeg
Binary files differdiff --git a/app/assets/stylesheets/components.scss b/app/assets/stylesheets/components.scss
index d233b3471..696e89418 100644
--- 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;