diff options
| author | Fatih Acet <acetfatih@gmail.com> | 2016-10-28 22:48:14 +0000 |
|---|---|---|
| committer | Fatih Acet <acetfatih@gmail.com> | 2016-10-28 22:48:14 +0000 |
| commit | b216d9bf85388e34891e392d8c80e72643d639c0 (patch) | |
| tree | 13462b11e2eb24c97cbeed81166ee7f5e165d670 | |
| parent | 4d3a08036416a235873d8841a2924febc37c3414 (diff) | |
| parent | 1c05332ed4599452f34dd94912669d85b93543a4 (diff) | |
| download | gitlab-ce-b216d9bf85388e34891e392d8c80e72643d639c0.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
| -rw-r--r-- | CHANGELOG.md | 1 | ||||
| -rw-r--r-- | app/assets/stylesheets/framework/sidebar.scss | 12 |
2 files changed, 13 insertions, 0 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 2c93a6ee9ec..083c8b9da1f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -44,6 +44,7 @@ Please view this file on the master branch, on stable branches it's out of date. - Fix importing MR comments from GitHub !7139 - Modify GitHub importer to be retryable !7003 - Fix and improve `Sortable.highest_label_priority` + - Fixed sticky merge request tabs when sidebar is pinned ## 8.13.1 (2016-10-25) - Fix branch protection API. !6215 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 { |