summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorMorris Jobke <hey@morrisjobke.de>2014-12-15 11:39:31 +0100
committerMorris Jobke <hey@morrisjobke.de>2014-12-15 11:39:31 +0100
commitb831914aa66ab9591dd4593233cc8f67ed6cf8eb (patch)
treeb65c63985fa11d42dae50f1634ce8b040cdccc26 /lib
parent036456fe16e258d1d5f803e9a99a10a45de542ba (diff)
parentedcd2f27069ae125a4b6680a384b44ebe69b12de (diff)
downloadnextcloud-server-b831914aa66ab9591dd4593233cc8f67ed6cf8eb.tar.gz
nextcloud-server-b831914aa66ab9591dd4593233cc8f67ed6cf8eb.zip
Merge pull request #11991 from owncloud/bower-jquery-ui
bower jquery-ui - exported changes to a separate css file
Diffstat (limited to 'lib')
-rw-r--r--lib/base.php5
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/base.php b/lib/base.php
index f2ff3bb4849..24ca55584ad 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -339,7 +339,7 @@ class OC {
// TODO: read from core/js/core.json
OC_Util::addVendorScript('jquery/jquery.min');
OC_Util::addVendorScript('jquery/jquery-migrate.min');
- OC_Util::addScript("jquery-ui-1.10.0.custom");
+ OC_Util::addVendorScript('jquery-ui/ui/jquery-ui.custom');
OC_Util::addScript("jquery-showpassword");
OC_Util::addScript("placeholders");
OC_Util::addScript("jquery-tipsy");
@@ -376,7 +376,8 @@ class OC {
OC_Util::addStyle("apps");
OC_Util::addStyle("fixes");
OC_Util::addStyle("multiselect");
- OC_Util::addStyle("jquery-ui-1.10.0.custom");
+ OC_Util::addVendorStyle('jquery-ui/themes/base/jquery-ui');
+ OC_Util::addStyle('jquery-ui-fixes');
OC_Util::addStyle("jquery-tipsy");
OC_Util::addStyle("jquery.ocdialog");
}