kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Merge branch 'mr-tabs-sticky-poc' into 'master' 

POC: Use position sticky on merge request tabs

See merge request !11289
This commit is contained in:
Annabel Dunstone Gray 2017-05-11 14:30:32 +00:00
parent e3fa527519 5d74fc8a54
commit 92bf7dfcb0
2 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/assets/javascripts/merge_request_tabs.js
View File

@ -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')

9
app/assets/stylesheets/pages/merge_requests.scss
View File

@ -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) {