diff options
author | Jacob Schatz <jschatz@gitlab.com> | 2016-05-26 21:22:30 +0000 |
---|---|---|
committer | Jacob Schatz <jschatz@gitlab.com> | 2016-05-26 21:22:30 +0000 |
commit | 9576f77caefa5ee392b8246f433292cacd81ce5b (patch) | |
tree | 5be1707e11ed922d66354d579eaac1f307dcb031 | |
parent | 03f26a4091dbe78a4d1374fdbbf6b6521a378c8b (diff) | |
parent | 7903e44efc9af625b8d28cc93ad0a88b585e751e (diff) | |
download | gitlab-ce-9576f77caefa5ee392b8246f433292cacd81ce5b.tar.gz |
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
-rw-r--r-- | app/assets/stylesheets/framework/nav.scss | 21 |
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; + } + } +} |