X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=Makefile;h=c50f3a562a053f9d000feb79033fca2bf1e4903c;hb=668533f9cb00fd23da95db7bc807e1006ef3dfc1;hp=ab0a822d3cbb89d6179a1f7a881dd16130390904;hpb=5972d4ba29058ef57e17c5e1ca534d082ac04c8a;p=myslice.git diff --git a/Makefile b/Makefile index ab0a822d..c50f3a56 100644 --- a/Makefile +++ b/Makefile @@ -30,14 +30,12 @@ THIRD-PARTY-RESOURCES = THIRD-PARTY-RESOURCES += $(shell ls third-party/bootstrap/*/*) # just the single js as identified with a symlink THIRD-PARTY-RESOURCES += $(shell ls third-party/datatables/js/dataTables.js) -THIRD-PARTY-RESOURCES += $(shell ls third-party/datatables/js/DT_bootstrap.js) +THIRD-PARTY-RESOURCES += $(shell ls third-party/datatables/js/dataTables.bootstrap.js) +THIRD-PARTY-RESOURCES += $(shell ls third-party/datatables/css/dataTables.bootstrap.css) # likewise THIRD-PARTY-RESOURCES += $(shell ls third-party/jquery/js/jquery{,.min}.js) # for storing the visible status of plugins THIRD-PARTY-RESOURCES += $(shell ls third-party/jquery-html5storage/jquery.html5storage{,.min}.js) -# xxx we have jquery-ui in our codebase but we've now moved to using bootstrap instead -# so jquery-ui can probably be git removed altogether -#THIRD-PARTY-RESOURCES += $(shell ls third-party/jquery-ui/themes/base/jquery-ui.css) # spin comes in plain or min, + the jquery plugin, and our own settings THIRD-PARTY-RESOURCES += $(shell ls third-party/spin/*.js) # used in QueryCode