diff options
| author | Robert Speicher <rspeicher@gmail.com> | 2015-04-25 16:00:30 -0400 |
|---|---|---|
| committer | Robert Speicher <rspeicher@gmail.com> | 2015-04-25 16:00:30 -0400 |
| commit | d30ceda7debecc79d667ca0594aa13ab42b8a1a8 (patch) | |
| tree | 2493329afb530e7c25485b25abd5e6fc69409033 | |
| parent | a11b07f31d14ceface3f9a20d0d1e7b55d369602 (diff) | |
| download | gitlab-ce-d30ceda7debecc79d667ca0594aa13ab42b8a1a8.tar.gz | |
Add collapsed navbar links to the default tooltip selector
| -rw-r--r-- | app/assets/javascripts/application.js.coffee | 2 | ||||
| -rw-r--r-- | app/views/layouts/_page.html.haml | 4 |
2 files changed, 1 insertions, 5 deletions
diff --git a/app/assets/javascripts/application.js.coffee b/app/assets/javascripts/application.js.coffee index 652dc292421..eb6ecaa4835 100644 --- a/app/assets/javascripts/application.js.coffee +++ b/app/assets/javascripts/application.js.coffee @@ -133,7 +133,7 @@ $ -> # Initialize tooltips $('body').tooltip({ - selector: '.has_tooltip, [data-toggle="tooltip"]' + selector: '.has_tooltip, [data-toggle="tooltip"], .page-sidebar-collapsed .nav-sidebar a' }) # Form submitter diff --git a/app/views/layouts/_page.html.haml b/app/views/layouts/_page.html.haml index 1c164800b0e..0fa2ec9824d 100644 --- a/app/views/layouts/_page.html.haml +++ b/app/views/layouts/_page.html.haml @@ -15,7 +15,3 @@ = yield = yield :embedded_scripts - -:coffeescript - $('.page-sidebar-collapsed .nav-sidebar a').tooltip placement: "right" - |