diff --git a/composer.json b/composer.json
index 108ea8473d..20bc30edbe 100644
--- a/composer.json
+++ b/composer.json
@@ -50,19 +50,19 @@
"bower-asset/base64": "^1.0",
"bower-asset/chart-js": "^2.8",
"bower-asset/dompurify": "^1.0",
- "bower-asset/perfect-scrollbar": "^0.6",
+ "bower-asset/fork-awesome": "^1.1",
"bower-asset/vue": "^2.6",
+ "npm-asset/cropperjs": "1.2.2",
"npm-asset/es-jquery-sortable": "^0.9.13",
+ "npm-asset/fullcalendar": "^3.10",
+ "npm-asset/imagesloaded": "4.1.4",
"npm-asset/jquery": "^2.0",
"npm-asset/jquery-colorbox": "^1.6",
"npm-asset/jquery-datetimepicker": "^2.5",
"npm-asset/jgrowl": "^1.4",
"npm-asset/moment": "^2.24",
- "npm-asset/fullcalendar": "^3.10",
- "npm-asset/cropperjs": "1.2.2",
- "npm-asset/imagesloaded": "4.1.4",
- "npm-asset/typeahead.js": "^0.11.1",
- "bower-asset/fork-awesome": "^1.1"
+ "npm-asset/perfect-scrollbar": "0.6.16",
+ "npm-asset/typeahead.js": "^0.11.1"
},
"repositories": [
{
diff --git a/composer.lock b/composer.lock
index 8834f3f701..60b883d841 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically"
],
- "content-hash": "e1a839b13f7ba5892c8730d0da3ddf1c",
+ "content-hash": "b3a7490d8f103ef40431848a26fcc2a6",
"packages": [
{
"name": "asika/simple-console",
@@ -1755,6 +1755,64 @@
],
"time": "2019-01-21T21:10:34+00:00"
},
+ {
+ "name": "npm-asset/perfect-scrollbar",
+ "version": "0.6.16",
+ "dist": {
+ "type": "tar",
+ "url": "https://registry.npmjs.org/perfect-scrollbar/-/perfect-scrollbar-0.6.16.tgz",
+ "shasum": "b1d61a5245cf3962bb9a8407a3fc669d923212fc"
+ },
+ "type": "npm-asset-library",
+ "extra": {
+ "npm-asset-bugs": {
+ "url": "https://github.com/noraesae/perfect-scrollbar/issues"
+ },
+ "npm-asset-files": [
+ "dist",
+ "src",
+ "index.js",
+ "jquery.js",
+ "perfect-scrollbar.d.ts"
+ ],
+ "npm-asset-main": "./index.js",
+ "npm-asset-directories": [],
+ "npm-asset-repository": {
+ "type": "git",
+ "url": "git+https://github.com/noraesae/perfect-scrollbar.git"
+ },
+ "npm-asset-scripts": {
+ "test": "gulp",
+ "before-deploy": "gulp && gulp compress",
+ "release": "rm -rf dist && gulp && npm publish"
+ },
+ "npm-asset-engines": {
+ "node": ">= 0.12.0"
+ }
+ },
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "Hyunje Jun",
+ "email": "me@noraesae.net"
+ },
+ {
+ "name": "Hyunje Jun",
+ "email": "me@noraesae.net"
+ }
+ ],
+ "description": "Minimalistic but perfect custom scrollbar plugin",
+ "homepage": "https://github.com/noraesae/perfect-scrollbar#readme",
+ "keywords": [
+ "frontend",
+ "jquery-plugin",
+ "scroll",
+ "scrollbar"
+ ],
+ "time": "2017-01-10T01:03:05+00:00"
+ },
{
"name": "npm-asset/php-date-formatter",
"version": "v1.3.5",
@@ -3018,6 +3076,7 @@
],
"description": "This tool check syntax of PHP files about 20x faster than serial check.",
"homepage": "https://github.com/JakubOnderka/PHP-Parallel-Lint",
+ "abandoned": "php-parallel-lint/php-parallel-lint",
"time": "2018-02-24T15:31:20+00:00"
},
{
diff --git a/view/templates/head.tpl b/view/templates/head.tpl
index 3896a4b4ad..eaec270364 100644
--- a/view/templates/head.tpl
+++ b/view/templates/head.tpl
@@ -6,7 +6,7 @@
-
+
{{foreach $stylesheets as $stylesheetUrl}}
@@ -40,7 +40,11 @@
+<<<<<<< HEAD
+=======
+
+>>>>>>> f1c1103e1... Merge pull request #8595 from MrPetovan/task/8578-perfect-scrollbar-dependency
diff --git a/view/theme/frio/templates/head.tpl b/view/theme/frio/templates/head.tpl
index b539a90d96..d0821f36e0 100644
--- a/view/theme/frio/templates/head.tpl
+++ b/view/theme/frio/templates/head.tpl
@@ -11,7 +11,7 @@
-
+
@@ -61,7 +61,11 @@
+<<<<<<< HEAD
+=======
+
+>>>>>>> f1c1103e1... Merge pull request #8595 from MrPetovan/task/8578-perfect-scrollbar-dependency