Skip to content

Commit

Permalink
fix building instruction
Browse files Browse the repository at this point in the history
  • Loading branch information
trippo committed Jan 27, 2018
1 parent bb83d25 commit 94a050a
Show file tree
Hide file tree
Showing 3 changed files with 22 additions and 21 deletions.
1 change: 0 additions & 1 deletion README.md
Expand Up @@ -79,5 +79,4 @@ Gulp use [laravel-elixir](http://laravel.com/docs/5.0/elixir)
- [jQuery contextMenu](https://swisnl.github.io/jQuery-contextMenu/)
- [Bootstrap-modal](https://github.com/jschr/bootstrap-modal)
- [jPlayer](http://jplayer.org)
- [ViewerJS](http://viewerjs.org)
- [Lazy Load Plugin for jQuery](http://www.appelsiini.net/projects/lazyload)
8 changes: 4 additions & 4 deletions bower.json
@@ -1,5 +1,5 @@
{
"name": "ResponsiveFilemanager",
"name": "responsive_filemanager",
"version": "9.9.0",
"homepage": "http://www.responsivefilemanager.com/",
"authors": [
Expand All @@ -15,20 +15,20 @@
],
"dependencies": {
"jquery": "1.9.1",
"jquery_lazyload": "git@github.com:tuupola/jquery_lazyload.git",
"jquery-scrollstop": "git@github.com:ssorallen/jquery-scrollstop.git",
"jQuery-contextMenu": "~1.6.6",
"bootbox.js": "git@github.com:makeusabrew/bootbox.git#3.3.0",
"jquery-touchswipe": "~1.6.8",
"zeroclipboard": "2.1.6",
"bootstrap": "2.3.1",
"bootstrap-modal": "~2.2.5",
"bootstrap-lightbox": "git@github.com:jbutz/bootstrap-lightbox.git#0.6.0",
"jquery-ui": "1.10.4",
"jqueryui-touch-punch": "*",
"jPlayer": "git@github.com:happyworm/jPlayer.git#2.4.0",
"html5shiv": "3.6.2",
"blueimp-file-upload": "^9.19.1"
"blueimp-file-upload": "^9.19.1",
"vanilla-lazyload": "^10.4.2",
"clipboard": "^1.7.1"
},
"resolutions": {
"jquery": "1.9.1",
Expand Down
34 changes: 18 additions & 16 deletions gulpfile.js
Expand Up @@ -4,29 +4,35 @@ elixir(function(mix) {
mix.less(
[
'style.less',
//"../../../bower_components/bootstrap/less/bootstrap.less",
//"../../../bower_components/bootstrap/less/responsive.less",
//"../../../bower_components/bootstrap-lightbox/less/bootstrap-lightbox.less"
],
'resources/tmp/css/style.css');
'resources/tmp/css/style.css',
'resources/assets/less');

mix.less(
[
"../../../bower_components/bootstrap/less/bootstrap.less",
"../../../bower_components/bootstrap/less/responsive.less",
"../../../bower_components/bootstrap-lightbox/less/bootstrap-lightbox.less"
],
'resources/tmp/css/lib.css',
'bower_components');

mix.styles(
[
"bootstrap.css",
"responsive.css",
"bootstrap-lightbox.css",
"lib.css",
"../../../bower_components/bootstrap-modal/css/bootstrap-modal.css",
"../../../bower_components/jQuery-contextMenu/src/jquery.contextMenu.css",
"style.css"
],
'filemanager/css/style.css',
'resources/tmp/css'
);
mix.styles(
["rtl-style.less"],
'filemanager/css/rtl-style.css',
'resources/assets/less'
);

// mix.styles(
// ["rtl-style.less"],
// 'filemanager/css/rtl-style.css',
// 'resources/assets/less'
// );

mix.scripts(
[
Expand Down Expand Up @@ -62,10 +68,6 @@ elixir(function(mix) {
['include.js'],
'filemanager/js/include.js');

mix.scripts(
['include.commercial.js'],
'filemanager/js/include.commercial.js');

mix.scripts(
['plugin.js'],
'filemanager/plugin.min.js');
Expand Down

0 comments on commit 94a050a

Please sign in to comment.