From 3f581e8d04fc9d1f128c57aebbc2d6791a9e4ccc Mon Sep 17 00:00:00 2001 From: Phil Hughes Date: Mon, 16 Jan 2017 14:55:30 -0500 Subject: Correctly keeps merge request tabs in place when editting value in collapsed sidebar Previously the CSS would presume the sidebar is open, which it is but as an overlay so the CSS was pushing the tabs when it shouldnt of been --- app/assets/stylesheets/framework/sidebar.scss | 6 +++++- changelogs/unreleased/mr-tabs-alignment-sidebar-open.yml | 4 ++++ 2 files changed, 9 insertions(+), 1 deletion(-) create mode 100644 changelogs/unreleased/mr-tabs-alignment-sidebar-open.yml 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: -- cgit v1.2.1