diff options
| author | André Luís <me@andr3.net> | 2018-12-08 07:19:03 +0000 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2018-12-08 07:19:03 +0000 |
| commit | 85daddbec99cc0578277946e0fb8aee1abfaa8c8 (patch) | |
| tree | c09f9eb1eabeaaaaa2c62bafe6b167c37acb2dfe /app/assets/javascripts/lib | |
| parent | f3299596c7d9d7b042859253606bab9972ed4a13 (diff) | |
| download | gitlab-ce-85daddbec99cc0578277946e0fb8aee1abfaa8c8.tar.gz | |
Resolve "Navigating unresolved discussions on Merge Request page"
Diffstat (limited to 'app/assets/javascripts/lib')
| -rw-r--r-- | app/assets/javascripts/lib/utils/common_utils.js | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/app/assets/javascripts/lib/utils/common_utils.js b/app/assets/javascripts/lib/utils/common_utils.js index 040d0bc659e..9e22cdc04e9 100644 --- a/app/assets/javascripts/lib/utils/common_utils.js +++ b/app/assets/javascripts/lib/utils/common_utils.js @@ -192,8 +192,12 @@ export const contentTop = () => { const mrTabsHeight = $('.merge-request-tabs').height() || 0; const headerHeight = $('.navbar-gitlab').height() || 0; const diffFilesChanged = $('.js-diff-files-changed').height() || 0; + const diffFileLargeEnoughScreen = + 'matchMedia' in window ? window.matchMedia('min-width: 768') : true; + const diffFileTitleBar = + (diffFileLargeEnoughScreen && $('.diff-file .file-title-flex-parent:visible').height()) || 0; - return perfBar + mrTabsHeight + headerHeight + diffFilesChanged; + return perfBar + mrTabsHeight + headerHeight + diffFilesChanged + diffFileTitleBar; }; export const scrollToElement = element => { |