diff options
| author | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-12-05 18:34:37 -0700 |
|---|---|---|
| committer | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-12-05 20:24:12 -0700 |
| commit | 0a01f8cf9292532b3cd68c9a8cd93039f9b24be0 (patch) | |
| tree | a9ab66dbf095a388f8275dce45d7c4de8ea927d4 | |
| parent | 043647dcf5445a3bc51537ca8b35dd52c8ff1040 (diff) | |
| download | gitlab-ce-35724-animate-contextual-sidebar.tar.gz | |
Fix static analysis35724-animate-contextual-sidebar
Fix
| -rw-r--r-- | app/assets/javascripts/contextual_sidebar.js | 2 | ||||
| -rw-r--r-- | app/assets/stylesheets/framework/contextual-sidebar.scss | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/app/assets/javascripts/contextual_sidebar.js b/app/assets/javascripts/contextual_sidebar.js index ac878c073c6..8d08787cd04 100644 --- a/app/assets/javascripts/contextual_sidebar.js +++ b/app/assets/javascripts/contextual_sidebar.js @@ -10,7 +10,7 @@ export default class ContextualSidebar { initDomElements() { this.$page = $('.page-with-sidebar'); - this.$pageContent = $('.page-with-sidebar .content-wrapper') + this.$pageContent = $('.page-with-sidebar .content-wrapper'); this.$sidebar = $('.nav-sidebar'); this.$innerScroll = $('.nav-sidebar-inner-scroll', this.$sidebar); this.$overlay = $('.mobile-overlay'); diff --git a/app/assets/stylesheets/framework/contextual-sidebar.scss b/app/assets/stylesheets/framework/contextual-sidebar.scss index 7019e50bcf6..6648a941193 100644 --- a/app/assets/stylesheets/framework/contextual-sidebar.scss +++ b/app/assets/stylesheets/framework/contextual-sidebar.scss @@ -72,14 +72,13 @@ position: fixed; z-index: 400; width: $contextual-sidebar-width; - transition: left $sidebar-transition-duration; + transition: left $sidebar-transition-duration, opacity $page-unload-transition; top: $header-height; bottom: 0; left: 0; background-color: $gray-light; box-shadow: inset -2px 0 0 $border-color; transform: translate3d(0, 0, 0); - transition: opacity $page-unload-transition, left $page-unload-transition; &:not(.sidebar-icons-only) { @media (min-width: $screen-sm-min) and (max-width: $screen-md-max) { |