From ba583dcf39d50b7b2d55574a2441152828b32e2c Mon Sep 17 00:00:00 2001 From: Matt-Yorkley <9029026+Matt-Yorkley@users.noreply.github.com> Date: Sun, 13 Jun 2021 21:23:17 +0100 Subject: [PATCH] Install jquery-ui via yarn We can delete the gem once the Javascript part has been handled --- app/webpacker/css/admin/all.scss | 2 +- package.json | 1 + yarn.lock | 5 +++++ 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/app/webpacker/css/admin/all.scss b/app/webpacker/css/admin/all.scss index 13cbc71ddf..011682581c 100644 --- a/app/webpacker/css/admin/all.scss +++ b/app/webpacker/css/admin/all.scss @@ -1,7 +1,7 @@ @import 'vendor/assets/stylesheets/normalize'; @import 'vendor/assets/stylesheets/responsive-tables'; @import 'vendor/assets/stylesheets/jquery.powertip'; -@import 'jquery.ui.dialog'; +@import '~jquery-ui/themes/base/jquery.ui.dialog'; @import '../shared/textAngular'; @import '../shared/ng-tags-input.min'; @import 'select2'; diff --git a/package.json b/package.json index 965c7a2fdd..c54ab37336 100644 --- a/package.json +++ b/package.json @@ -33,6 +33,7 @@ "cable_ready": "^5.0.0-pre2", "flatpickr": "^4.6.9", "foundation-sites": "^5.5.2", + "jquery-ui": "1.10.4", "moment": "^2.29.1", "mrujs": "^0.7.2", "shortcut-buttons-flatpickr": "^0.3.1", diff --git a/yarn.lock b/yarn.lock index 277f1bd2db..e90406fd6f 100644 --- a/yarn.lock +++ b/yarn.lock @@ -8066,6 +8066,11 @@ jest@^27.4.5: import-local "^3.0.2" jest-cli "^27.4.5" +jquery-ui@1.10.4: + version "1.10.4" + resolved "https://registry.yarnpkg.com/jquery-ui/-/jquery-ui-1.10.4.tgz#a096fe5f4e0f2ab69a0585cf10455877f57506bd" + integrity sha1-oJb+X04PKraaBYXPEEVYd/V1Br0= + js-string-escape@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/js-string-escape/-/js-string-escape-1.0.1.tgz#e2625badbc0d67c7533e9edc1068c587ae4137ef"