diff options
| author | Fatih Acet <acetfatih@gmail.com> | 2016-10-28 22:48:14 +0000 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2016-10-28 23:24:40 -0700 |
| commit | d31fa260d067bbdb1e3b6c82bbf1c01a5f66f54d (patch) | |
| tree | 3ee2dd1f90e88d2e8591182840962c4d7f1f6f36 /app | |
| parent | a7f5927579b00651723fa12c9ed44b80ecf9803a (diff) | |
| download | gitlab-ce-d31fa260d067bbdb1e3b6c82bbf1c01a5f66f54d.tar.gz | |
Merge branch 'sticky-mr-tabs-pinned-nav' into 'master'
Fixed sticky MR tabs positioning when sidebar is pinned
## What does this MR do?
The sticky MR tabs where positioned underneath the pinned sidebar. This fixes that by accounting for the size of the pinned nav.
## Screenshots (if relevant)
## What are the relevant issue numbers?
Closes #23926
See merge request !7167
Diffstat (limited to 'app')
| -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 { |