diff options
| author | Bernhard Posselt <Raydiation@users.noreply.github.com> | 2015-07-23 19:25:09 +0200 |
|---|---|---|
| committer | Bernhard Posselt <Raydiation@users.noreply.github.com> | 2015-07-23 19:25:09 +0200 |
| commit | 582f07950f45d9e0bdfa8faaefa105cad5d39420 (patch) | |
| tree | 83582e253b040995dfe8b337b137e49448087903 /lib/base.php | |
| parent | 01b7e306c427f00d1ce4570c3d1bc90f72e25644 (diff) | |
| parent | 03a6e12bdb77242d38e08c9f3c78076e499bcaff (diff) | |
| download | nextcloud-server-582f07950f45d9e0bdfa8faaefa105cad5d39420.tar.gz nextcloud-server-582f07950f45d9e0bdfa8faaefa105cad5d39420.zip | |
Merge pull request #17075 from owncloud/bootstrap-tooltip
Replace jQuery tipsy with bootstrap tooltip
Diffstat (limited to 'lib/base.php')
| -rw-r--r-- | lib/base.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/base.php b/lib/base.php index 32fcbac7c05..d11dd395b84 100644 --- a/lib/base.php +++ b/lib/base.php @@ -392,7 +392,7 @@ class OC { } OC_Util::addScript("placeholders"); - OC_Util::addScript("jquery-tipsy"); + //OC_Util::addScript("tooltip"); OC_Util::addScript("compatibility"); OC_Util::addScript("jquery.ocdialog"); OC_Util::addScript("oc-dialogs"); @@ -428,7 +428,7 @@ class OC { OC_Util::addStyle("multiselect"); OC_Util::addVendorStyle('jquery-ui/themes/base/jquery-ui'); OC_Util::addStyle('jquery-ui-fixes'); - OC_Util::addStyle("jquery-tipsy"); + OC_Util::addStyle("tooltip"); OC_Util::addStyle("jquery.ocdialog"); } |