diff options
| author | Phil Hughes <me@iamphill.com> | 2016-10-28 11:35:49 +0300 |
|---|---|---|
| committer | Fatih Acet <acetfatih@gmail.com> | 2016-10-29 00:50:24 +0300 |
| commit | 1c05332ed4599452f34dd94912669d85b93543a4 (patch) | |
| tree | 4d786365694c25e385166a804b5850a7d1deb2a2 /app/assets/stylesheets/framework/sidebar.scss | |
| parent | dcc699afc214dab1e27541ac35a9d57ef20f2cb9 (diff) | |
Fixed sticky MR tabs positioning when sidebar is pinned
Closes #23926
Diffstat (limited to 'app/assets/stylesheets/framework/sidebar.scss')
| -rw-r--r-- | app/assets/stylesheets/framework/sidebar.scss | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/app/assets/stylesheets/framework/sidebar.scss b/app/assets/stylesheets/framework/sidebar.scss index 1d8e64a0e4b..c54f7b27575 100644 --- a/app/assets/stylesheets/framework/sidebar.scss +++ b/app/assets/stylesheets/framework/sidebar.scss @@ -164,6 +164,18 @@ padding-left: $sidebar_width; } } + + .merge-request-tabs-holder.affix { + @media (min-width: $sidebar-breakpoint) { + left: $sidebar_width; + } + } + + &.right-sidebar-expanded { + .line-resolve-all-container { + display: none; + } + } } header.header-sidebar-pinned { |