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

Merge branch 'mr-tabs-alignment-sidebar-open' into 'master' 

Correctly keeps merge request tabs in place when editting value in

See merge request !8595
This commit is contained in:
Annabel Dunstone Gray 2017-01-17 16:18:10 +00:00
parent ea988d97a7 3f581e8d04
commit 65046d9a5e
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/assets/stylesheets/framework/sidebar.scss
View File

@ -236,9 +236,13 @@ header.header-sidebar-pinned {
@media (min-width: $screen-md-min) {
padding-right: $gutter_width;
.merge-request-tabs-holder.affix {
&:not(.with-overlay) .merge-request-tabs-holder.affix {
right: $gutter_width;
}
&.with-overlay .merge-request-tabs-holder.affix {
right: $sidebar_collapsed_width;
}
}
&.with-overlay {

4
changelogs/unreleased/mr-tabs-alignment-sidebar-open.yml Normal file
View File

@ -0,0 +1,4 @@
---
title: Fixed merge request tabs dont move when opening collapsed sidebar
merge_request:
author: