mirror of
https://git.code.sf.net/p/seeddms/code
synced 2025-02-11 09:35:00 +00:00
Merge branch 'seeddms-5.1.x' into seeddms-6.0.x
This commit is contained in:
commit
622b7a13bb
12
Gruntfile.js
12
Gruntfile.js
|
@ -1,7 +1,10 @@
|
|||
module.exports = function (grunt) {
|
||||
'use strict';
|
||||
|
||||
var bootstrapDir = 'views/bootstrap/vendors',
|
||||
// if you set bootstrapDir to views/bootstrap/vendors then make sure
|
||||
// bootbox is not installed, because version 5 of bootbox will not work
|
||||
// with bootstrap 2
|
||||
var bootstrapDir = 'views/bootstrap4/vendors',
|
||||
tdkDir = 'views/tdk/vendors',
|
||||
nodeDir = 'node_modules';
|
||||
|
||||
|
@ -113,6 +116,13 @@ module.exports = function (grunt) {
|
|||
],
|
||||
dest: bootstrapDir + '/jquery-typeahead',
|
||||
flatten: true
|
||||
},{
|
||||
expand: true,
|
||||
src: [
|
||||
nodeDir + '/bootbox/dist/*'
|
||||
],
|
||||
dest: bootstrapDir + '/bootbox',
|
||||
flatten: true
|
||||
},{
|
||||
expand: true,
|
||||
src: [
|
||||
|
|
|
@ -11,6 +11,7 @@
|
|||
"dependencies": {
|
||||
"@coreui/coreui": "^3.3.0",
|
||||
"@ttskch/select2-bootstrap4-theme": "^1.5.2",
|
||||
"bootbox": "^5.5.2",
|
||||
"bootstrap": "^4.5.2",
|
||||
"bootstrap-datepicker": "^1.9.0",
|
||||
"chartjs": "^0.3.24",
|
||||
|
|
Loading…
Reference in New Issue
Block a user