diff options
author | Phil Hughes <me@iamphill.com> | 2017-05-11 11:37:40 +0100 |
---|---|---|
committer | Phil Hughes <me@iamphill.com> | 2017-05-11 11:37:40 +0100 |
commit | 5d74fc8a5496423b31eb4dc0daf02b39d0fb51de (patch) | |
tree | e906674140b89962a5adf3896c5bde84bffbe33d | |
parent | 4067dd4f84681dd109fb8e1957b6327b4db20193 (diff) | |
download | gitlab-ce-5d74fc8a5496423b31eb4dc0daf02b39d0fb51de.tar.gz |
Use position sticky on merge request tabsmr-tabs-sticky-poc
Removes the need for Bootstraps affix on browser that support sticky positions. On these browsers, there should be a slight performance improvement as there will be no scrolling events, it will all be handled by the browser
-rw-r--r-- | app/assets/javascripts/merge_request_tabs.js | 7 | ||||
-rw-r--r-- | app/assets/stylesheets/pages/merge_requests.scss | 9 |
2 files changed, 14 insertions, 2 deletions
diff --git a/app/assets/javascripts/merge_request_tabs.js b/app/assets/javascripts/merge_request_tabs.js index 93c30c54a8e..a3dff25c93b 100644 --- a/app/assets/javascripts/merge_request_tabs.js +++ b/app/assets/javascripts/merge_request_tabs.js @@ -358,6 +358,13 @@ import BlobForkSuggestion from './blob/blob_fork_suggestion'; // So we dont affix the tabs on these if (Breakpoints.get().getBreakpointSize() === 'xs' || !$tabs.length) return; + /** + If the browser does not support position sticky, it returns the position as static. + If the browser does support sticky, then we allow the browser to handle it, if not + then we default back to Bootstraps affix + **/ + if ($tabs.css('position') !== 'static') return; + const $diffTabs = $('#diff-notes-app'); $tabs.off('affix.bs.affix affix-top.bs.affix') diff --git a/app/assets/stylesheets/pages/merge_requests.scss b/app/assets/stylesheets/pages/merge_requests.scss index 75c57e369e7..87592926930 100644 --- a/app/assets/stylesheets/pages/merge_requests.scss +++ b/app/assets/stylesheets/pages/merge_requests.scss @@ -693,12 +693,17 @@ } .merge-request-tabs-holder { + top: 0; + z-index: 10; background-color: $white-light; + @media(min-width: $screen-sm-min) { + position: sticky; + position: -webkit-sticky; + } + &.affix { - top: 0; left: 0; - z-index: 10; transition: right .15s; @media (max-width: $screen-xs-max) { |