diff options
| author | Dmitriy Zaporozhets <dzaporozhets@gitlab.com> | 2015-02-13 22:52:09 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dzaporozhets@gitlab.com> | 2015-02-13 22:52:09 +0000 |
| commit | d785b20c43b114bbae385a5446f9369370fbd3bf (patch) | |
| tree | b21b0a02ebff9d3c48bb7ffd451234359d47cfbb | |
| parent | d0f045eb860f819a736d76622d8d9c546a9610ee (diff) | |
| parent | f989190ed4ea3f9b03451918b55384a2e23fe3af (diff) | |
| download | gitlab-ce-d785b20c43b114bbae385a5446f9369370fbd3bf.tar.gz | |
Merge branch 'sidebar-tooltips' into 'master'
Sidebar tooltips
Show nice tooltips when hover on collapsed sidebar
See merge request !1521
| -rw-r--r-- | app/assets/stylesheets/sections/nav_sidebar.scss | 2 | ||||
| -rw-r--r-- | app/views/layouts/_page.html.haml | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/app/assets/stylesheets/sections/nav_sidebar.scss b/app/assets/stylesheets/sections/nav_sidebar.scss index b35043821da..9c7d1a03a03 100644 --- a/app/assets/stylesheets/sections/nav_sidebar.scss +++ b/app/assets/stylesheets/sections/nav_sidebar.scss @@ -126,7 +126,7 @@ .nav-sidebar { margin-top: 20px; - position: absolute; + position: fixed; top: 45px; width: 52px; diff --git a/app/views/layouts/_page.html.haml b/app/views/layouts/_page.html.haml index 98a3d2278a3..422966cdc55 100644 --- a/app/views/layouts/_page.html.haml +++ b/app/views/layouts/_page.html.haml @@ -17,3 +17,7 @@ = yield = yield :embedded_scripts + +:coffeescript + $('.page-sidebar-collapsed .nav-sidebar a').tooltip placement: "right" + |