diff options
author | Phil Hughes <me@iamphill.com> | 2017-09-05 17:08:26 +0300 |
---|---|---|
committer | Phil Hughes <me@iamphill.com> | 2017-09-05 17:08:26 +0300 |
commit | 337a73e18c63ff3abe9d3b66892176e0118d4046 (patch) | |
tree | 465ce1004b06c9ac3d9b6cec42a5fbad4c3ad63f /app/assets/javascripts/main.js | |
parent | 9477f4a881cb3c9a54f6abd9bc0a20f161c9e9b3 (diff) | |
parent | d316a8c0b39652d6053238d6a14983c51714faa0 (diff) |
Merge branch 'master' into breadcrumbs-improvements
Diffstat (limited to 'app/assets/javascripts/main.js')
-rw-r--r-- | app/assets/javascripts/main.js | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/app/assets/javascripts/main.js b/app/assets/javascripts/main.js index 66f8cbd7139..0bc31a56684 100644 --- a/app/assets/javascripts/main.js +++ b/app/assets/javascripts/main.js @@ -132,6 +132,7 @@ import './project_new'; import './project_select'; import './project_show'; import './project_variables'; +import './projects_dropdown'; import './projects_list'; import './syntax_highlight'; import './render_math'; @@ -252,7 +253,10 @@ $(function () { // Initialize popovers $body.popover({ selector: '[data-toggle="popover"]', - trigger: 'focus' + trigger: 'focus', + // set the viewport to the main content, excluding the navigation bar, so + // the navigation can't overlap the popover + viewport: '.page-with-sidebar' }); $('.trigger-submit').on('change', function () { return $(this).parents('form').submit(); |