Commit a0fcbda9 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Merge branch 'rs-default-tooltip-placement' into 'master'

Fix default tooltip placement

Made a logic error in 1e1785cc that prevented elements with the `has_tooltip` class from having the default tooltip placement if they didn't define one.

See merge request !674
parents d1c9a0f1 bd85e8ea
...@@ -140,8 +140,8 @@ $ -> ...@@ -140,8 +140,8 @@ $ ->
# Place the logo tooltip on the right when collapsed, bottom when expanded # Place the logo tooltip on the right when collapsed, bottom when expanded
$el.parents('header').hasClass('header-collapsed') and 'right' or 'bottom' $el.parents('header').hasClass('header-collapsed') and 'right' or 'bottom'
else else
# Otherwise use the data-placement attribute like normal # Otherwise use the data-placement attribute, or 'bottom' if undefined
$el.data('placement') $el.data('placement') or 'bottom'
}) })
# Form submitter # Form submitter
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment