diff --git a/composer.json b/composer.json index 9f97664754..27ccd5fd1a 100644 --- a/composer.json +++ b/composer.json @@ -25,9 +25,10 @@ "michelf/php-markdown": "^1.7", "fxp/composer-asset-plugin": "~1.3", "bower-asset/base64": "^1.0", + "bower-asset/Chart-js": "^2.7", + "bower-asset/perfect-scrollbar": "^0.6", "npm-asset/jquery": "^2.0", "npm-asset/jquery-colorbox": "^1.6", - "bower-asset/Chart-js": "^2.7", "npm-asset/jquery-datetimepicker": "^2.4.0", "npm-asset/jgrowl": "^1.4", "npm-asset/fullcalendar": "^3.0.1" diff --git a/composer.lock b/composer.lock index b1c2a2a75b..079c90aff0 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "content-hash": "77fbec143bd07b349f7cd5763f982734", + "content-hash": "993cfc5f6a545674b2c201fbb502d45a", "packages": [ { "name": "bower-asset/Chart-js", @@ -69,6 +69,37 @@ "description": "Base64 encoding and decoding", "time": "2017-03-25T21:16:21+00:00" }, + { + "name": "bower-asset/perfect-scrollbar", + "version": "0.6.16", + "source": { + "type": "git", + "url": "https://github.com/utatti/perfect-scrollbar-bower.git", + "reference": "3049129e5dbb403295ce8507a461cdd0f200938c" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/utatti/perfect-scrollbar-bower/zipball/3049129e5dbb403295ce8507a461cdd0f200938c", + "reference": "3049129e5dbb403295ce8507a461cdd0f200938c", + "shasum": "" + }, + "type": "bower-asset-library", + "extra": { + "bower-asset-main": [ + "css/perfect-scrollbar.css", + "js/perfect-scrollbar.js" + ], + "bower-asset-ignore": [ + "**/.*", + "bower_components" + ] + }, + "license": [ + "MIT" + ], + "description": "Minimalistic but perfect custom scrollbar plugin", + "time": "2017-01-10T01:04:09+00:00" + }, { "name": "ezyang/htmlpurifier", "version": "v4.7.0",