diff options
| author | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-01-17 16:18:10 +0000 |
|---|---|---|
| committer | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-01-17 16:18:10 +0000 |
| commit | 65046d9a5e84defb1bd0a0508e085a8cc023bc6f (patch) | |
| tree | 50f85e2a5ba5e57e90aefbb95003663f5c99f769 | |
| parent | ea988d97a7d4ea53852cd6028f83ebb00e6d3079 (diff) | |
| parent | 3f581e8d04fc9d1f128c57aebbc2d6791a9e4ccc (diff) | |
| download | gitlab-ce-65046d9a5e84defb1bd0a0508e085a8cc023bc6f.tar.gz | |
Merge branch 'mr-tabs-alignment-sidebar-open' into 'master'
Correctly keeps merge request tabs in place when editting value in
See merge request !8595
| -rw-r--r-- | app/assets/stylesheets/framework/sidebar.scss | 6 | ||||
| -rw-r--r-- | changelogs/unreleased/mr-tabs-alignment-sidebar-open.yml | 4 |
2 files changed, 9 insertions, 1 deletions
diff --git a/app/assets/stylesheets/framework/sidebar.scss b/app/assets/stylesheets/framework/sidebar.scss index 838f5442fff..f0b03710c79 100644 --- a/app/assets/stylesheets/framework/sidebar.scss +++ b/app/assets/stylesheets/framework/sidebar.scss @@ -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 { diff --git a/changelogs/unreleased/mr-tabs-alignment-sidebar-open.yml b/changelogs/unreleased/mr-tabs-alignment-sidebar-open.yml new file mode 100644 index 00000000000..b8c7b78cf0d --- /dev/null +++ b/changelogs/unreleased/mr-tabs-alignment-sidebar-open.yml @@ -0,0 +1,4 @@ +--- +title: Fixed merge request tabs dont move when opening collapsed sidebar +merge_request: +author: |