Merge branch 'scroll-links-bug' into 'master'

Fix bug where fade div covers up controls button

## What does this MR do?
Fixes bug where fade div covers up controls button

## Screenshots (if relevant)
Before:     
<img src="/uploads/a6a883839255b8e10d872759a1aa54a0/Screen_Shot_2016-05-26_at_2.22.08_PM.png" width="300px">      
After:        
<img src="/uploads/9ab53d9815470cf86f68f5a340ffc454/Screen_Shot_2016-05-26_at_2.22.42_PM.png" width="300px">

See merge request !4306

1 files changed, 21 insertions, 0 deletions

diff --git a/app/assets/stylesheets/framework/nav.scss b/app/assets/stylesheets/framework/nav.scss
index adfe5540704..7eb7a8e4544 100644
--- a/app/assets/stylesheets/framework/nav.scss
+++ b/app/assets/stylesheets/framework/nav.scss
@@ -336,6 +336,16 @@
       @include fade(right, rgba(255, 255, 255, 0.4), $white-light);
       left: 0;
     }
+
+    &.event-filter {
+      .fade-right {
+        visibility: hidden;
+
+        @media (max-width: $screen-xs-max) {
+          visibility: visible;
+        }
+      }
+    }
   }
 }
 
@@ -346,3 +356,14 @@
     top: ($header-height * 2) + 2;
   }
 }
+
+.activities {
+
+  .nav-block {
+    border-bottom: 1px solid $border-color;
+
+    .nav-links {
+      border-bottom: none;
+    }
+  }
+}