diff options
author | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-05-12 21:35:15 +0000 |
---|---|---|
committer | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-05-12 21:35:15 +0000 |
commit | d63de44d26f1b50e62d25c6db8f3a63d98f13d45 (patch) | |
tree | 6388ced3ae488e9ba4342cad501488a6a16671f8 /app/views/shared/issuable | |
parent | 09ca4c92d2c6991e0b6e58894bd381758bcfd0da (diff) | |
parent | c757000e83f57eb9e71dbf5505a3b1cd21bd8105 (diff) | |
download | gitlab-ce-d63de44d26f1b50e62d25c6db8f3a63d98f13d45.tar.gz |
Merge branch '30975-fixed-top-nav-POC' into 'master'
Add fixed positioning to top level navbar
Closes #30975
See merge request !10751
Diffstat (limited to 'app/views/shared/issuable')
-rw-r--r-- | app/views/shared/issuable/_sidebar.html.haml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/shared/issuable/_sidebar.html.haml b/app/views/shared/issuable/_sidebar.html.haml index 305d1c36a73..ac84fffe831 100644 --- a/app/views/shared/issuable/_sidebar.html.haml +++ b/app/views/shared/issuable/_sidebar.html.haml @@ -3,7 +3,7 @@ = page_specific_javascript_bundle_tag('common_vue') = page_specific_javascript_bundle_tag('sidebar') -%aside.right-sidebar.js-right-sidebar{ data: { "offset-top" => "102", "spy" => "affix" }, class: sidebar_gutter_collapsed_class, 'aria-live' => 'polite' } +%aside.right-sidebar.js-right-sidebar{ data: { "offset-top" => "50", "spy" => "affix" }, class: sidebar_gutter_collapsed_class, 'aria-live' => 'polite' } .issuable-sidebar{ data: { endpoint: "#{issuable_json_path(issuable)}" } } - can_edit_issuable = can?(current_user, :"admin_#{issuable.to_ability_name}", @project) .block.issuable-sidebar-header |