diff --git a/public/css/blue.png b/public/css/blue.png
new file mode 100644
index 0000000000000000000000000000000000000000..af04cee596d5d2f884b03f9d8f0dd25c1cd5a0fa
Binary files /dev/null and b/public/css/blue.png differ
diff --git a/public/css/blue@2x.png b/public/css/blue@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..f19210a9e570edb8acbb6d425809d8835854f190
Binary files /dev/null and b/public/css/blue@2x.png differ
diff --git a/public/css/build/AdminLTE.css b/public/css/build/AdminLTE.css
new file mode 100644
index 0000000000000000000000000000000000000000..9aeb0437405d7ba7179a9d0ca0ea6b6507371a9f
Binary files /dev/null and b/public/css/build/AdminLTE.css differ
diff --git a/public/css/build/app.css b/public/css/build/app.css
new file mode 100644
index 0000000000000000000000000000000000000000..983c183243336a0023715e00c0af2d94e5e24a6a
Binary files /dev/null and b/public/css/build/app.css differ
diff --git a/public/css/build/overrides.css b/public/css/build/overrides.css
new file mode 100644
index 0000000000000000000000000000000000000000..413517d3a522a071e8f2d6e3721986c953dda0d5
Binary files /dev/null and b/public/css/build/overrides.css differ
diff --git a/public/css/build/signature-pad.min.css b/public/css/build/signature-pad.min.css
new file mode 100644
index 0000000000000000000000000000000000000000..8b137891791fe96927ad78e64b0aad7bded08bdc
Binary files /dev/null and b/public/css/build/signature-pad.min.css differ
diff --git a/public/css/dist/all.css b/public/css/dist/all.css
new file mode 100644
index 0000000000000000000000000000000000000000..2564f54c7c18b30bf9d1495ad601e3e19bcc2334
Binary files /dev/null and b/public/css/dist/all.css differ
diff --git a/public/css/dist/bootstrap-table.css b/public/css/dist/bootstrap-table.css
new file mode 100644
index 0000000000000000000000000000000000000000..2c4a67341a2e354f0cce741af7576b628e270b8f
Binary files /dev/null and b/public/css/dist/bootstrap-table.css differ
diff --git a/public/css/dist/signature-pad.css b/public/css/dist/signature-pad.css
new file mode 100755
index 0000000000000000000000000000000000000000..218b9c2365c3608a6b15c9fa430557ee10a2f991
Binary files /dev/null and b/public/css/dist/signature-pad.css differ
diff --git a/public/css/dist/skins/skin-black-dark.css b/public/css/dist/skins/skin-black-dark.css
new file mode 100644
index 0000000000000000000000000000000000000000..cd4369222e701f815b46c6e824dc3472dd399d41
Binary files /dev/null and b/public/css/dist/skins/skin-black-dark.css differ
diff --git a/public/css/dist/skins/skin-black-dark.min.css b/public/css/dist/skins/skin-black-dark.min.css
new file mode 100644
index 0000000000000000000000000000000000000000..8468fc80afe8e9747e4a63f25cf66e95bca93937
Binary files /dev/null and b/public/css/dist/skins/skin-black-dark.min.css differ
diff --git a/public/css/dist/skins/skin-black.css b/public/css/dist/skins/skin-black.css
new file mode 100644
index 0000000000000000000000000000000000000000..ff91e268345b4b69e69af37d63f34b7a20233657
Binary files /dev/null and b/public/css/dist/skins/skin-black.css differ
diff --git a/public/css/dist/skins/skin-blue-dark.css b/public/css/dist/skins/skin-blue-dark.css
new file mode 100644
index 0000000000000000000000000000000000000000..9f8a9dc9baa350ccd76434503f8887e1d5402991
Binary files /dev/null and b/public/css/dist/skins/skin-blue-dark.css differ
diff --git a/public/css/dist/skins/skin-blue-dark.min.css b/public/css/dist/skins/skin-blue-dark.min.css
new file mode 100644
index 0000000000000000000000000000000000000000..3fdee5a6ef8fff53062ced93b3fc8e44ce8b3ffd
Binary files /dev/null and b/public/css/dist/skins/skin-blue-dark.min.css differ
diff --git a/public/css/dist/skins/skin-blue.css b/public/css/dist/skins/skin-blue.css
new file mode 100644
index 0000000000000000000000000000000000000000..9bc7aaa2374bba1401249b6d7528808ae958e1c6
Binary files /dev/null and b/public/css/dist/skins/skin-blue.css differ
diff --git a/public/css/dist/skins/skin-contrast.css b/public/css/dist/skins/skin-contrast.css
new file mode 100644
index 0000000000000000000000000000000000000000..cee4a18de974be485032c558aa9fd5c62d9ca81e
Binary files /dev/null and b/public/css/dist/skins/skin-contrast.css differ
diff --git a/public/css/dist/skins/skin-contrast.min.css b/public/css/dist/skins/skin-contrast.min.css
new file mode 100644
index 0000000000000000000000000000000000000000..4371050957432a3491db05741825a2b7909d0588
Binary files /dev/null and b/public/css/dist/skins/skin-contrast.min.css differ
diff --git a/public/css/dist/skins/skin-green-dark.css b/public/css/dist/skins/skin-green-dark.css
new file mode 100644
index 0000000000000000000000000000000000000000..d993b76e01cfb23898dfd81baf90ed6953dcdefb
Binary files /dev/null and b/public/css/dist/skins/skin-green-dark.css differ
diff --git a/public/css/dist/skins/skin-green-dark.min.css b/public/css/dist/skins/skin-green-dark.min.css
new file mode 100644
index 0000000000000000000000000000000000000000..29ec24b7fd2c60936b9036692423299041458ab4
Binary files /dev/null and b/public/css/dist/skins/skin-green-dark.min.css differ
diff --git a/public/css/dist/skins/skin-green.css b/public/css/dist/skins/skin-green.css
new file mode 100644
index 0000000000000000000000000000000000000000..94fdc44ec8d11fc2fec6a6791a8274c64a3ffd7e
Binary files /dev/null and b/public/css/dist/skins/skin-green.css differ
diff --git a/public/css/dist/skins/skin-orange-dark.css b/public/css/dist/skins/skin-orange-dark.css
new file mode 100644
index 0000000000000000000000000000000000000000..4c5e89bcf3afdf7ce3bc61adf0561aa2405c7beb
Binary files /dev/null and b/public/css/dist/skins/skin-orange-dark.css differ
diff --git a/public/css/dist/skins/skin-orange-dark.min.css b/public/css/dist/skins/skin-orange-dark.min.css
new file mode 100644
index 0000000000000000000000000000000000000000..71e29f8a00c13217ddf741cf6cd9e578658216f2
Binary files /dev/null and b/public/css/dist/skins/skin-orange-dark.min.css differ
diff --git a/public/css/dist/skins/skin-orange.css b/public/css/dist/skins/skin-orange.css
new file mode 100644
index 0000000000000000000000000000000000000000..77b8e9b0c906ba8461dba37325df064f1fdc5320
Binary files /dev/null and b/public/css/dist/skins/skin-orange.css differ
diff --git a/public/css/dist/skins/skin-purple-dark.css b/public/css/dist/skins/skin-purple-dark.css
new file mode 100644
index 0000000000000000000000000000000000000000..5d31137b9e270630eb6ad1b7884140ec8bca8bef
Binary files /dev/null and b/public/css/dist/skins/skin-purple-dark.css differ
diff --git a/public/css/dist/skins/skin-purple-dark.min.css b/public/css/dist/skins/skin-purple-dark.min.css
new file mode 100644
index 0000000000000000000000000000000000000000..70a10d3a5880f39b8da8377012bbfe754e44c98e
Binary files /dev/null and b/public/css/dist/skins/skin-purple-dark.min.css differ
diff --git a/public/css/dist/skins/skin-purple.css b/public/css/dist/skins/skin-purple.css
new file mode 100644
index 0000000000000000000000000000000000000000..3a50660659ae01270dadd309adc745c07cb0dece
Binary files /dev/null and b/public/css/dist/skins/skin-purple.css differ
diff --git a/public/css/dist/skins/skin-red-dark.css b/public/css/dist/skins/skin-red-dark.css
new file mode 100644
index 0000000000000000000000000000000000000000..a268a76dc07dcc6e95ccc001ba2a9d4ef51f77d8
Binary files /dev/null and b/public/css/dist/skins/skin-red-dark.css differ
diff --git a/public/css/dist/skins/skin-red-dark.min.css b/public/css/dist/skins/skin-red-dark.min.css
new file mode 100644
index 0000000000000000000000000000000000000000..cf07179944274d944838f3fd6014699934b07b6c
Binary files /dev/null and b/public/css/dist/skins/skin-red-dark.min.css differ
diff --git a/public/css/dist/skins/skin-red.css b/public/css/dist/skins/skin-red.css
new file mode 100644
index 0000000000000000000000000000000000000000..099836d4f2cdfca9fe3cc217588e27f68a8c0c6f
Binary files /dev/null and b/public/css/dist/skins/skin-red.css differ
diff --git a/public/css/dist/skins/skin-yellow-dark.css b/public/css/dist/skins/skin-yellow-dark.css
new file mode 100644
index 0000000000000000000000000000000000000000..968cfe69c76fed5f6e9d6d594f038d874b5c0b3d
Binary files /dev/null and b/public/css/dist/skins/skin-yellow-dark.css differ
diff --git a/public/css/dist/skins/skin-yellow-dark.min.css b/public/css/dist/skins/skin-yellow-dark.min.css
new file mode 100644
index 0000000000000000000000000000000000000000..860a6dfd8153716aa660996a43f23563c2654b77
Binary files /dev/null and b/public/css/dist/skins/skin-yellow-dark.min.css differ
diff --git a/public/css/dist/skins/skin-yellow.css b/public/css/dist/skins/skin-yellow.css
new file mode 100644
index 0000000000000000000000000000000000000000..bae6c794a1c16a8c4a8b2faa3df65c0ab4a829f1
Binary files /dev/null and b/public/css/dist/skins/skin-yellow.css differ
diff --git a/public/css/skins/dist/skin-blue-dark.css b/public/css/skins/dist/skin-blue-dark.css
new file mode 100644
index 0000000000000000000000000000000000000000..9f8a9dc9baa350ccd76434503f8887e1d5402991
Binary files /dev/null and b/public/css/skins/dist/skin-blue-dark.css differ
diff --git a/public/js/build/app.js b/public/js/build/app.js
new file mode 100644
index 0000000000000000000000000000000000000000..e26879cb067d3a1a385a5eaac806daa75fa2deee
Binary files /dev/null and b/public/js/build/app.js differ
diff --git a/public/js/build/vendor.js b/public/js/build/vendor.js
new file mode 100644
index 0000000000000000000000000000000000000000..906424623b3dd7a349b8a59266ff5bad64cf4bee
Binary files /dev/null and b/public/js/build/vendor.js differ
diff --git a/public/js/dist/all.js b/public/js/dist/all.js
index a17eec52a7d089af602db8dcb7626780e05dcc79..de3e3fba3fdb0e6df18ef568c5829f81ea41de4c 100644
Binary files a/public/js/dist/all.js and b/public/js/dist/all.js differ
diff --git a/public/js/dist/bootstrap-table.js b/public/js/dist/bootstrap-table.js
new file mode 100644
index 0000000000000000000000000000000000000000..066519c2b881ff740bc3ea70bb918b49ca4f9fac
Binary files /dev/null and b/public/js/dist/bootstrap-table.js differ
diff --git a/public/js/plugins/select2/select2.css b/public/js/plugins/select2/select2.css
index d365213c7b6ebd9600b7d33cef40d4713e63dd96..125a15d72e06b410c8a421227406cb8205e324b7 100755
Binary files a/public/js/plugins/select2/select2.css and b/public/js/plugins/select2/select2.css differ
diff --git a/public/js/vendor.js b/public/js/vendor.js
index b78b252bfae69112290ec69f7ab57ffe23db9bc5..2abcea17734c965c5eafed2235beaf1ef0616416 100644
Binary files a/public/js/vendor.js and b/public/js/vendor.js differ
diff --git a/public/mix-manifest.json b/public/mix-manifest.json
index 1cddb19e10ea4f0424a547fa132e95da94374cda..3c83b7d03a427a5d634d5290cde425f77e2660de 100644
--- a/public/mix-manifest.json
+++ b/public/mix-manifest.json
@@ -1,42 +1,38 @@
{
- "/js/build/vue.js": "/js/build/vue.js",
- "/css/build/AdminLTE.css": "/css/build/AdminLTE.css",
- "/css/build/app.css": "/css/build/app.css",
- "/css/build/overrides.css": "/css/build/overrides.css",
- "/css/dist/skins/skin-blue.css": "/css/dist/skins/skin-blue.css",
- "/css/dist/skins/skin-red.css": "/css/dist/skins/skin-red.css",
- "/css/dist/skins/skin-contrast.css": "/css/dist/skins/skin-contrast.css",
- "/css/dist/skins/skin-green.css": "/css/dist/skins/skin-green.css",
- "/css/dist/skins/skin-green-dark.css": "/css/dist/skins/skin-green-dark.css",
- "/css/dist/skins/skin-black.css": "/css/dist/skins/skin-black.css",
- "/css/dist/skins/skin-black-dark.css": "/css/dist/skins/skin-black-dark.css",
- "/css/dist/skins/skin-red-dark.css": "/css/dist/skins/skin-red-dark.css",
- "/css/dist/skins/skin-purple.css": "/css/dist/skins/skin-purple.css",
- "/css/dist/skins/skin-purple-dark.css": "/css/dist/skins/skin-purple-dark.css",
- "/css/dist/skins/skin-yellow.css": "/css/dist/skins/skin-yellow.css",
- "/css/dist/skins/skin-yellow-dark.css": "/css/dist/skins/skin-yellow-dark.css",
- "/css/skins/dist/skin-blue-dark.css": "/css/skins/dist/skin-blue-dark.css",
- "/css/dist/skins/skin-orange-dark.css": "/css/dist/skins/skin-orange-dark.css",
- "/css/dist/skins/skin-orange.css": "/css/dist/skins/skin-orange.css",
- "/js/build/vue.js.map": "/js/build/vue.js.map",
- "/css/build/AdminLTE.css.map": "/css/build/AdminLTE.css.map",
- "/css/build/app.css.map": "/css/build/app.css.map",
- "/css/build/overrides.css.map": "/css/build/overrides.css.map",
- "/css/dist/skins/skin-blue.css.map": "/css/dist/skins/skin-blue.css.map",
- "/css/dist/skins/skin-red.css.map": "/css/dist/skins/skin-red.css.map",
- "/css/dist/skins/skin-contrast.css.map": "/css/dist/skins/skin-contrast.css.map",
- "/css/dist/skins/skin-green.css.map": "/css/dist/skins/skin-green.css.map",
- "/css/dist/skins/skin-green-dark.css.map": "/css/dist/skins/skin-green-dark.css.map",
- "/css/dist/skins/skin-black.css.map": "/css/dist/skins/skin-black.css.map",
- "/css/dist/skins/skin-black-dark.css.map": "/css/dist/skins/skin-black-dark.css.map",
- "/css/dist/skins/skin-red-dark.css.map": "/css/dist/skins/skin-red-dark.css.map",
- "/css/dist/skins/skin-purple.css.map": "/css/dist/skins/skin-purple.css.map",
- "/css/dist/skins/skin-purple-dark.css.map": "/css/dist/skins/skin-purple-dark.css.map",
- "/css/dist/skins/skin-yellow.css.map": "/css/dist/skins/skin-yellow.css.map",
- "/css/dist/skins/skin-yellow-dark.css.map": "/css/dist/skins/skin-yellow-dark.css.map",
- "/css/skins/dist/skin-blue-dark.css.map": "/css/skins/dist/skin-blue-dark.css.map",
- "/css/dist/skins/skin-orange-dark.css.map": "/css/dist/skins/skin-orange-dark.css.map",
- "/css/dist/skins/skin-orange.css.map": "/css/dist/skins/skin-orange.css.map",
- "/css/dist/all.css": "/css/dist/all.css",
- "/js/dist/all.js": "/js/dist/all.js"
+ "/js/build/app.js": "/js/build/app.js?id=a7bc4e83c6d3ae912094",
+ "/css/build/AdminLTE.css": "/css/build/AdminLTE.css?id=59413334823616b81341",
+ "/css/build/app.css": "/css/build/app.css?id=180fafe3f6a28ed15dd7",
+ "/css/build/overrides.css": "/css/build/overrides.css?id=d4fe2beb579ecbeb4ee2",
+ "/css/dist/skins/skin-blue.css": "/css/dist/skins/skin-blue.css?id=9fa704134cfacfacab93",
+ "/css/dist/skins/skin-red.css": "/css/dist/skins/skin-red.css?id=747948e5f269f64047f7",
+ "/css/dist/skins/skin-contrast.css": "/css/dist/skins/skin-contrast.css?id=d7996d850e8bcdc4e167",
+ "/css/dist/skins/skin-green.css": "/css/dist/skins/skin-green.css?id=eb25d2ec49f730d09431",
+ "/css/dist/skins/skin-green-dark.css": "/css/dist/skins/skin-green-dark.css?id=0cfa39cacd9c83b4f53b",
+ "/css/dist/skins/skin-black.css": "/css/dist/skins/skin-black.css?id=35602987835e5d50d162",
+ "/css/dist/skins/skin-black-dark.css": "/css/dist/skins/skin-black-dark.css?id=6bd9c2420a41eaf96f0b",
+ "/css/dist/skins/skin-red-dark.css": "/css/dist/skins/skin-red-dark.css?id=60de5bc2660c35544c4d",
+ "/css/dist/skins/skin-purple.css": "/css/dist/skins/skin-purple.css?id=b6dcb6d5c666fc5c8cc0",
+ "/css/dist/skins/skin-purple-dark.css": "/css/dist/skins/skin-purple-dark.css?id=9dd1dc817a71431e5904",
+ "/css/dist/skins/skin-yellow.css": "/css/dist/skins/skin-yellow.css?id=cb85a4e40e784319e878",
+ "/css/dist/skins/skin-yellow-dark.css": "/css/dist/skins/skin-yellow-dark.css?id=4a19f5ae861f98f40bab",
+ "/css/dist/skins/skin-blue-dark.css": "/css/dist/skins/skin-blue-dark.css?id=2f665cf40d7348b3f94c",
+ "/css/dist/skins/skin-orange-dark.css": "/css/dist/skins/skin-orange-dark.css?id=71c178700d68294e3413",
+ "/css/dist/skins/skin-orange.css": "/css/dist/skins/skin-orange.css?id=b4fc4a74e1f6367dc3e2",
+ "/css/dist/all.css": "/css/dist/all.css?id=eb45baac804f83ec6cf1",
+ "/css/blue.png": "/css/blue.png?id=4c85d6a97173123bd14a",
+ "/css/blue@2x.png": "/css/blue@2x.png?id=62c67c6a822439e8a4ac",
+ "/css/dist/skins/skin-green-dark.min.css": "/css/dist/skins/skin-green-dark.min.css?id=0cfa39cacd9c83b4f53b",
+ "/css/dist/skins/skin-black-dark.min.css": "/css/dist/skins/skin-black-dark.min.css?id=6bd9c2420a41eaf96f0b",
+ "/css/dist/skins/skin-blue-dark.min.css": "/css/dist/skins/skin-blue-dark.min.css?id=2f665cf40d7348b3f94c",
+ "/css/dist/skins/skin-yellow-dark.min.css": "/css/dist/skins/skin-yellow-dark.min.css?id=4a19f5ae861f98f40bab",
+ "/css/dist/skins/skin-red-dark.min.css": "/css/dist/skins/skin-red-dark.min.css?id=60de5bc2660c35544c4d",
+ "/css/dist/skins/skin-purple-dark.min.css": "/css/dist/skins/skin-purple-dark.min.css?id=9dd1dc817a71431e5904",
+ "/css/dist/skins/skin-orange-dark.min.css": "/css/dist/skins/skin-orange-dark.min.css?id=71c178700d68294e3413",
+ "/css/dist/skins/skin-contrast.min.css": "/css/dist/skins/skin-contrast.min.css?id=d7996d850e8bcdc4e167",
+ "/css/dist/signature-pad.css": "/css/dist/signature-pad.css?id=6a89d3cd901305e66ced",
+ "/css/build/signature-pad.min.css": "/css/build/signature-pad.min.css?id=d41d8cd98f00b204e980",
+ "/css/dist/bootstrap-table.css": "/css/dist/bootstrap-table.css?id=a534edb9f7179f6dcf62",
+ "/js/build/vendor.js": "/js/build/vendor.js?id=ac70ab5fd89efc2aa7d0",
+ "/js/dist/bootstrap-table.js": "/js/dist/bootstrap-table.js?id=9407782198cbc29f23d1",
+ "/js/dist/all.js": "/js/dist/all.js?id=f930032e5ca0a4bb587a"
}
diff --git a/resources/assets/css/lib/select2.css b/resources/assets/css/lib/select2.css
index ae46ec3b4255644c766e3a3befbf20b4f6f868d6..fb6be4b6d8609e27ba669054967e4f1651f46e0b 100755
--- a/resources/assets/css/lib/select2.css
+++ b/resources/assets/css/lib/select2.css
@@ -15,14 +15,14 @@ Version: @@ver@@ Timestamp: @@timestamp@@
.select2-drop,
.select2-search,
.select2-search input {
- /*
- Force border-box so that % widths fit the parent
- container without overlap because of margin/padding.
- More Info : http://www.quirksmode.org/css/box.html
- */
- -webkit-box-sizing: border-box; /* webkit */
- -moz-box-sizing: border-box; /* firefox */
- box-sizing: border-box; /* css3 */
+ /*
+ Force border-box so that % widths fit the parent
+ container without overlap because of margin/padding.
+ More Info : http://www.quirksmode.org/css/box.html
+ */
+ -webkit-box-sizing: border-box; /* webkit */
+ -moz-box-sizing: border-box; /* firefox */
+ box-sizing: border-box; /* css3 */
}
.select2-container .select2-choice {
@@ -43,10 +43,10 @@ Version: @@ver@@ Timestamp: @@timestamp@@
background-clip: padding-box;
-webkit-touch-callout: none;
- -webkit-user-select: none;
- -moz-user-select: none;
- -ms-user-select: none;
- user-select: none;
+ -webkit-user-select: none;
+ -moz-user-select: none;
+ -ms-user-select: none;
+ user-select: none;
background-color: #fff;
background-image: -webkit-gradient(linear, left bottom, left top, color-stop(0, #eee), color-stop(0.5, #fff));
@@ -141,7 +141,7 @@ Version: @@ver@@ Timestamp: @@timestamp@@
border-radius: 0 0 4px 4px;
-webkit-box-shadow: 0 4px 5px rgba(0, 0, 0, .15);
- box-shadow: 0 4px 5px rgba(0, 0, 0, .15);
+ box-shadow: 0 4px 5px rgba(0, 0, 0, .15);
}
.select2-drop.select2-drop-above {
@@ -152,7 +152,7 @@ Version: @@ver@@ Timestamp: @@timestamp@@
border-radius: 4px 4px 0 0;
-webkit-box-shadow: 0 -4px 5px rgba(0, 0, 0, .15);
- box-shadow: 0 -4px 5px rgba(0, 0, 0, .15);
+ box-shadow: 0 -4px 5px rgba(0, 0, 0, .15);
}
.select2-drop-active {
@@ -230,7 +230,7 @@ Version: @@ver@@ Timestamp: @@timestamp@@
border-radius: 0;
-webkit-box-shadow: none;
- box-shadow: none;
+ box-shadow: none;
background: #fff url('../../../img/select2/select2.png') no-repeat 100% -22px;
background: url('../../../img/select2/select2.png') no-repeat 100% -22px, -webkit-gradient(linear, left bottom, left top, color-stop(0.85, #fff), color-stop(0.99, #eee));
@@ -257,13 +257,13 @@ Version: @@ver@@ Timestamp: @@timestamp@@
outline: none;
-webkit-box-shadow: 0 0 5px rgba(0, 0, 0, .3);
- box-shadow: 0 0 5px rgba(0, 0, 0, .3);
+ box-shadow: 0 0 5px rgba(0, 0, 0, .3);
}
.select2-dropdown-open .select2-choice {
border-bottom-color: transparent;
-webkit-box-shadow: 0 1px 0 #fff inset;
- box-shadow: 0 1px 0 #fff inset;
+ box-shadow: 0 1px 0 #fff inset;
border-bottom-left-radius: 0;
border-bottom-right-radius: 0;
@@ -339,10 +339,10 @@ Version: @@ver@@ Timestamp: @@timestamp@@
min-height: 1em;
-webkit-touch-callout: none;
- -webkit-user-select: none;
- -moz-user-select: none;
- -ms-user-select: none;
- user-select: none;
+ -webkit-user-select: none;
+ -moz-user-select: none;
+ -ms-user-select: none;
+ user-select: none;
}
.select2-results .select2-highlighted {
@@ -382,9 +382,9 @@ disabled look for disabled choices in the results dropdown
cursor: default;
}
.select2-results .select2-disabled {
- background: #f4f4f4;
- display: list-item;
- cursor: default;
+ background: #f4f4f4;
+ display: list-item;
+ cursor: default;
}
.select2-results .select2-selected {
@@ -441,7 +441,7 @@ disabled look for disabled choices in the results dropdown
}
.select2-locked {
- padding: 3px 5px 3px 5px !important;
+ padding: 3px 5px 3px 5px !important;
}
.select2-container-multi .select2-choices {
@@ -453,7 +453,7 @@ disabled look for disabled choices in the results dropdown
outline: none;
-webkit-box-shadow: 0 0 5px rgba(0, 0, 0, .3);
- box-shadow: 0 0 5px rgba(0, 0, 0, .3);
+ box-shadow: 0 0 5px rgba(0, 0, 0, .3);
}
.select2-container-multi .select2-choices li {
float: left;
@@ -479,7 +479,7 @@ html[dir="rtl"] .select2-container-multi .select2-choices li
outline: 0;
border: 0;
-webkit-box-shadow: none;
- box-shadow: none;
+ box-shadow: none;
background: transparent !important;
}
@@ -504,15 +504,15 @@ html[dir="rtl"] .select2-container-multi .select2-choices li
border-radius: 3px;
-webkit-box-shadow: 0 0 2px #fff inset, 0 1px 0 rgba(0, 0, 0, 0.05);
- box-shadow: 0 0 2px #fff inset, 0 1px 0 rgba(0, 0, 0, 0.05);
+ box-shadow: 0 0 2px #fff inset, 0 1px 0 rgba(0, 0, 0, 0.05);
background-clip: padding-box;
-webkit-touch-callout: none;
- -webkit-user-select: none;
- -moz-user-select: none;
- -ms-user-select: none;
- user-select: none;
+ -webkit-user-select: none;
+ -moz-user-select: none;
+ -ms-user-select: none;
+ user-select: none;
background-color: #e4e4e4;
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#eeeeee', endColorstr='#f4f4f4', GradientType=0);
@@ -555,7 +555,7 @@ html[dir="rtl"] .select2-search-choice-close {
}
.select2-container-multi .select2-choices .select2-search-choice .select2-search-choice-close:hover {
- background-position: right -11px;
+ background-position: right -11px;
}
.select2-container-multi .select2-choices .select2-search-choice-focus .select2-search-choice-close {
background-position: right -11px;
@@ -616,12 +616,12 @@ html[dir="rtl"] .select2-search-choice-close {
/* Retina-ize icons */
@media only screen and (-webkit-min-device-pixel-ratio: 1.5), only screen and (min-resolution: 144dpi) {
- .select2-search input, .select2-search-choice-close, .select2-container .select2-choice abbr, .select2-container .select2-choice .select2-arrow b {
- background-image: url('select2x2.png') !important;
- background-repeat: no-repeat !important;
- background-size: 60px 40px !important;
- }
- .select2-search input {
- background-position: 100% -21px !important;
- }
+ .select2-search input, .select2-search-choice-close, .select2-container .select2-choice abbr, .select2-container .select2-choice .select2-arrow b {
+ background-image: url('select2x2.png') !important;
+ background-repeat: no-repeat !important;
+ background-size: 60px 40px !important;
+ }
+ .select2-search input {
+ background-position: 100% -21px !important;
+ }
}
\ No newline at end of file
diff --git a/resources/assets/less/AdminLTE.less b/resources/assets/less/AdminLTE.less
index 9768cf3aa877416933b06db9c21808fef281dccf..a67a77ad1374fd71303904cf1487af2f45f543ef 100755
--- a/resources/assets/less/AdminLTE.less
+++ b/resources/assets/less/AdminLTE.less
@@ -59,3 +59,4 @@
@import "print.less";
+
diff --git a/resources/assets/less/app.less b/resources/assets/less/app.less
index 78635f45f3aa611b5dff03c5367e64dfc1596d6e..a0ac196358de59b2a77e553298683c0791405dc2 100644
--- a/resources/assets/less/app.less
+++ b/resources/assets/less/app.less
@@ -1,7 +1,453 @@
-@icon-font-path: '../fonts';
+body {
+ font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", "Roboto", "Oxygen",
+ "Ubuntu", "Cantarell", "Fira Sans", "Droid Sans", "Helvetica Neue",
+ sans-serif;
+ font-size: 13px;
+}
+// Moved from default.blade.php
+@media (max-width: 400px) {
+ .navbar-left {
+ margin: 2px;
+ }
-@import '../../../node_modules/bootstrap-less/bootstrap/bootstrap';
-@import '../../../node_modules/ekko-lightbox/ekko-lightbox';
-@import '../../../node_modules/bootstrap-colorpicker/src/less/colorpicker';
+ .nav::after {
+ clear: none;
+ }
+}
+.skin-blue .main-header .logo {
+ background-color: inherit !important;
+}
+.main-header .logo {
+ width: 100% !important;
+ white-space: nowrap;
+ text-align: left;
+ display: block;
+ clear: both;
+ //text-overflow: hidden;
+}
+
+.huge {
+ font-size: 40px;
+}
+
+.btn-file {
+ position: relative;
+ overflow: hidden;
+}
+
+.dropdown-menu > li > a {
+ color: #354044;
+}
+
+#sort tr.cansort {
+ border-radius: 2px;
+ padding: 10px;
+ background: #f4f4f4;
+ margin-bottom: 3px;
+ border-left: 2px solid #e6e7e8;
+ color: #444;
+ cursor: move;
+}
+
+.user-image-inline {
+ float: left;
+ width: 25px;
+ height: 25px;
+ border-radius: 50%;
+ margin-right: 10px;
+}
+
+.input-group .input-group-addon {
+ background-color: #f4f4f4;
+}
+
+a.accordion-header {
+ color: #333;
+}
+
+.dynamic-form-row {
+ padding: 10px;
+ margin: 20px;
+}
+
+.handle {
+ padding-left: 10px;
+}
+
+.btn-file input[type="file"] {
+ position: absolute;
+ top: 0;
+ right: 0;
+ min-width: 100%;
+ min-height: 100%;
+ font-size: 100px;
+ text-align: right;
+ filter: alpha(opacity=0);
+ opacity: 0;
+ outline: none;
+ background: white;
+ cursor: inherit;
+ display: block;
+}
+
+.main-footer {
+ font-size: 13px;
+}
+
+.main-header {
+ max-height: 150px;
+}
+
+.navbar-nav > .user-menu > .dropdown-menu {
+ width: inherit;
+}
+
+.main-header .logo {
+ padding: 0px 5px 0px 15px;
+}
+
+.sidebar-toggle {
+ margin-left: -48px;
+ z-index: 100;
+ background-color: inherit;
+}
+
+.sidebar-toggle-mobile {
+ z-index: 100;
+ width: 50px;
+ padding-top: 10px;
+}
+
+// .skin-blue .main-header .navbar .dropdown-menu li a {
+// //color: inherit;
+// }
+
+.main-header .sidebar-toggle:before {
+ content: "\f0c9";
+}
+
+.direct-chat-contacts {
+ padding: 10px;
+ height: 150px;
+}
+
+.select2-container {
+ width: 100%;
+}
+.error input {
+ color: #dd4b39;
+ border: 2px solid #dd4b39 !important;
+}
+
+.error label,
+.alert-msg {
+ color: #dd4b39;
+ display: block;
+}
+
+.input-group[class*="col-"] {
+ padding-right: 15px;
+ padding-left: 15px;
+}
+.control-label.multiline {
+ padding-top: 10px;
+}
+
+.btn-outline {
+ color: inherit;
+ background-color: transparent;
+ transition: all 0.5s;
+}
+
+.btn-primary.btn-outline {
+ color: #428bca;
+}
+
+.btn-success.btn-outline {
+ color: #5cb85c;
+}
+
+.btn-info.btn-outline {
+ color: #5bc0de;
+}
+
+.btn-warning.btn-outline {
+ color: #f0ad4e;
+}
+
+.btn-danger.btn-outline {
+ color: #d9534f;
+}
+
+.btn-primary.btn-outline:hover,
+.btn-success.btn-outline:hover,
+.btn-info.btn-outline:hover,
+.btn-warning.btn-outline:hover,
+.btn-danger.btn-outline:hover {
+ color: #fff;
+}
+
+.slideout-menu {
+ position: fixed;
+ top: 0;
+ right: -250px;
+ width: 250px;
+ height: 100%;
+ background: #333;
+ z-index: 100;
+ margin-top: 100px;
+ color: white;
+ padding: 10px;
+}
+
+.slideout-menu h3 {
+ position: relative;
+ padding: 5px 5px;
+ color: #fff;
+ font-size: 1.2em;
+ font-weight: 400;
+ border-bottom: 4px solid #222;
+}
+
+.slideout-menu .slideout-menu-toggle {
+ position: absolute;
+ top: 12px;
+ right: 10px;
+ display: inline-block;
+ padding: 6px 9px 5px;
+ font-family: Arial, sans-serif;
+ font-weight: bold;
+ line-height: 1;
+ background: #222;
+ color: #999;
+ text-decoration: none;
+ vertical-align: top;
+}
+
+.slideout-menu .slideout-menu-toggle:hover {
+ color: #fff;
+}
+
+.slideout-menu ul {
+ list-style: none;
+ font-weight: 300;
+ border-top: 1px solid #151515;
+ border-bottom: 1px solid #454545;
+}
+
+.slideout-menu ul li {
+ border-top: 1px solid #454545;
+ border-bottom: 1px solid #151515;
+}
+
+.slideout-menu ul li a {
+ position: relative;
+ display: block;
+ padding: 10px;
+ color: #999;
+ text-decoration: none;
+}
+
+.slideout-menu ul li a:hover {
+ background: #000;
+ color: #fff;
+}
+
+.slideout-menu ul li a i {
+ position: absolute;
+ top: 15px;
+ right: 10px;
+ opacity: 0.5;
+}
+
+.btn-box-tool-lg {
+ font-size: 16px;
+ color: orange;
+}
+
+/*Form Wizard*/
+.bs-wizard {
+ margin-top: 20px;
+ border-bottom: solid 1px #e0e0e0;
+ padding: 0 0 10px 0;
+}
+.bs-wizard > .bs-wizard-step {
+ padding: 0;
+ position: relative;
+}
+
+// .bs-wizard > .bs-wizard-step + .bs-wizard-step {}
+
+.bs-wizard > .bs-wizard-step .bs-wizard-stepnum {
+ color: #595959;
+ font-size: 16px;
+ margin-bottom: 5px;
+}
+
+.bs-wizard > .bs-wizard-step .bs-wizard-info {
+ color: #999;
+ font-size: 14px;
+}
+
+.bs-wizard > .bs-wizard-step > .bs-wizard-dot {
+ position: absolute;
+ width: 30px;
+ height: 30px;
+ display: block;
+ background: #fbe8aa;
+ top: 45px;
+ left: 50%;
+ margin-top: -15px;
+ margin-left: -15px;
+ border-radius: 50%;
+}
+
+.bs-wizard > .bs-wizard-step > .bs-wizard-dot:after {
+ content: " ";
+ width: 14px;
+ height: 14px;
+ background: #fbbd19;
+ border-radius: 50px;
+ position: absolute;
+ top: 8px;
+ left: 8px;
+}
+
+.bs-wizard > .bs-wizard-step > .progress {
+ position: relative;
+ border-radius: 0px;
+ height: 8px;
+ box-shadow: none;
+ margin: 20px 0;
+}
+
+.bs-wizard > .bs-wizard-step > .progress > .progress-bar {
+ width: 0px;
+ box-shadow: none;
+ background: #fbe8aa;
+}
+
+.bs-wizard > .bs-wizard-step.complete > .progress > .progress-bar {
+ width: 100%;
+}
+
+.bs-wizard > .bs-wizard-step.active > .progress > .progress-bar {
+ width: 50%;
+}
+
+.bs-wizard > .bs-wizard-step:first-child.active > .progress > .progress-bar {
+ width: 0%;
+}
+
+.bs-wizard > .bs-wizard-step:last-child.active > .progress > .progress-bar {
+ width: 100%;
+}
+
+.bs-wizard > .bs-wizard-step.disabled > .bs-wizard-dot {
+ background-color: #f5f5f5;
+}
+
+.bs-wizard > .bs-wizard-step.disabled > .bs-wizard-dot:after {
+ opacity: 0;
+}
+
+.bs-wizard > .bs-wizard-step:first-child > .progress {
+ left: 50%;
+ width: 50%;
+}
+
+.bs-wizard > .bs-wizard-step:last-child > .progress {
+ width: 50%;
+}
+
+.bs-wizard > .bs-wizard-step.disabled a.bs-wizard-dot {
+ pointer-events: none;
+}
+/*END Form Wizard*/
+
+.left-navblock {
+ display: inline-block;
+ // float: left;
+ text-align: left;
+ color: white;
+ padding: 0px;
+ /* adjust based on your layout */
+}
+
+.skin-blue .main-header .navbar .dropdown-menu li a {
+ color: #333;
+}
+
+a.logo.no-hover a:hover {
+ background-color: transparent;
+}
+
+.required {
+ border-right: 6px solid orange;
+}
+
+.sidebar-menu {
+ font-size: 14px;
+ white-space: normal;
+}
+
+@media print {
+ a[href]:after {
+ content: none;
+ }
+
+ .tab-content > .tab-pane {
+ display: block !important;
+ opacity: 1 !important;
+ visibility: visible !important;
+ }
+}
+
+img.navbar-brand-img,
+.navbar-brand > img {
+ float: left;
+ padding: 5px 5px 5px 0;
+ max-height: 50px;
+}
+
+.input-daterange {
+ border-radius: 0px;
+}
+
+.btn.bg-maroon,
+.btn.bg-purple {
+ min-width: 90px;
+}
+
+[hidden] {
+ display: none !important;
+}
+
+#toolbar {
+ margin-top: 10px;
+}
+
+#uploadPreview {
+ border-color: grey;
+ border-width: 1px;
+ border-style: solid;
+}
+
+.icon-med {
+ font-size: 20px;
+ color: #889195;
+}
+
+#login-logo {
+ padding-top: 20px;
+ padding-bottom: 10px;
+ max-width: 200px;
+}
+
+.left-navblock {
+ max-width: 500px;
+}
+
+@import "overrides.less";
\ No newline at end of file
diff --git a/resources/assets/less/miscellaneous.less b/resources/assets/less/miscellaneous.less
index 72f96f909c389103993eb42ffccd820324c7fded..fcc7497ef7aa2bc657575ea42b951dd21f00d1f8 100755
--- a/resources/assets/less/miscellaneous.less
+++ b/resources/assets/less/miscellaneous.less
@@ -236,14 +236,14 @@
.link-muted {
color: darken(@gray, 30%);
&:hover,
- &:focus {
+ &:focus {
color: darken(@gray, 40%);
}
}
.link-black {
color: #666;
&:hover,
- &:focus {
+ &:focus {
color: #999;
}
}
@@ -282,7 +282,7 @@
> .list-group-item {
border-left: 0;
border-right: 0;
- border-radius: 0;
+ border-radius: 0;
padding-left: 0;
padding-right: 0;
}
@@ -526,4 +526,4 @@
canvas {
width: 100%!important;
}
-}
+}
\ No newline at end of file
diff --git a/resources/assets/less/overrides.less b/resources/assets/less/overrides.less
index 32b42f0b52df5821d62d18dc1aa11b3cc288dbb2..67bc7a41a0f0e6d82e087b9855f06abe582ae25b 100644
--- a/resources/assets/less/overrides.less
+++ b/resources/assets/less/overrides.less
@@ -466,7 +466,19 @@ h4 {
display: table-cell;
}
-.btn-link {
- color: @dark-gray;
- text-decoration: underline;
-}
\ No newline at end of file
+.small-box {
+ padding-left: 10px;
+ padding-right: 10px;
+ color: #fff;
+}
+
+.small-box > a:link, .small-box > a:visited, .small-box > a:hover {
+ color: #fff;
+}
+
+.select2-container--default .select2-selection--single, .select2-selection .select2-selection--single {
+ border: 1px solid #d2d6de;
+ border-radius: 0;
+ padding: 6px 12px;
+ height: 34px;
+}
diff --git a/resources/assets/less/skins/_all-skins.less b/resources/assets/less/skins/_all-skins.less
index 7733d1035bb3b6f374b0d4f6340a0ad665952198..265a51108fbe22e01c044984364b7aa92a825043 100755
--- a/resources/assets/less/skins/_all-skins.less
+++ b/resources/assets/less/skins/_all-skins.less
@@ -1,14 +1,17 @@
//All skins in one file
-@import "skin-blue.less";
-@import "skin-blue-light.less";
@import "skin-black.less";
-@import "skin-black-light.less";
+@import "skin-black-dark.less";
+@import "skin-blue.less";
+@import "skin-blue-dark.less";
+@import "skin-contrast.less";
@import "skin-green.less";
-@import "skin-green-light.less";
+@import "skin-green-dark.less";
+@import "skin-orange-dark.less";
+@import "skin-purple.less";
+@import "skin-purple-dark.less";
@import "skin-red.less";
-@import "skin-red-light.less";
+@import "skin-red-dark.less";
+@import "skin-orange.less";
@import "skin-yellow.less";
-@import "skin-yellow-light.less";
-@import "skin-purple.less";
-@import "skin-purple-light.less";
-@import "skin-contrast.less";
+@import "skin-yellow-dark.less";
+
diff --git a/resources/views/layouts/default.blade.php b/resources/views/layouts/default.blade.php
index 8c8a6a589eaa0be9d2b08a447336f4ed80ef2bda..03c1373ff860af1536d61d0274706e39ebb270bc 100644
--- a/resources/views/layouts/default.blade.php
+++ b/resources/views/layouts/default.blade.php
@@ -29,8 +29,9 @@
{{-- stylesheets --}}
- <link rel="stylesheet" href="{{ url('css/dist/all.css') }}">
- <link rel="stylesheet" href="{{ url('css/dist/skins/skin-'.($snipeSettings->skin!='' ? $snipeSettings->skin : 'blue').'.css') }}">
+ <link rel="stylesheet" href="{{ url(mix('css/dist/all.css')) }}">
+ <link rel="stylesheet" href="{{ url(mix('css/dist/skins/skin-'.($snipeSettings->skin!='' ? $snipeSettings->skin : 'blue').'.css')) }}">
+
{{-- page level css --}}
@@ -70,6 +71,7 @@
</style>
@endif
+
<script nonce="{{ csrf_token() }}">
window.snipeit = {
settings: {
@@ -836,7 +838,7 @@
</div>
{{-- Javascript files --}}
- <script src="{{ url('js/dist/all.js') }}" nonce="{{ csrf_token() }}"></script>
+ <script src="{{ url(mix('js/dist/all.js')) }}" nonce="{{ csrf_token() }}"></script>
{{-- Page level javascript --}}
@stack('js')
diff --git a/resources/views/partials/bootstrap-table.blade.php b/resources/views/partials/bootstrap-table.blade.php
index 91fb7c36c0131b9fa20454a17865d94f2d5fe35c..0294173ae7a97073df48a7802d1d7ddb6af48283 100644
--- a/resources/views/partials/bootstrap-table.blade.php
+++ b/resources/views/partials/bootstrap-table.blade.php
@@ -1,14 +1,9 @@
@push('css')
-<link rel="stylesheet" href="{{ url('css/dist/bootstrap-table.css') }}">
+<link rel="stylesheet" href="{{ url(mix('css/dist/bootstrap-table.css')) }}">
@endpush
@push('js')
-<script src="{{ url('js/dist/bootstrap-table.js') }}"></script>
-
-@if (!isset($simple_view))
-<script src="{{ url('js/dist/bootstrap-table-simple-view.js') }}"></script>
-@endif
-
+<script src="{{ asset(mix('js/dist/bootstrap-table.js')) }}"></script>
<script nonce="{{ csrf_token() }}">
$(function () {
diff --git a/webpack.mix.js b/webpack.mix.js
index 7d4cd6878d2a67f5ccf010082febbd47dea4fbc9..65a559006529c6e3071e205781c83f3ff05a9527 100644
--- a/webpack.mix.js
+++ b/webpack.mix.js
@@ -1,74 +1,77 @@
const { mix } = require('laravel-mix');
-
-// // This generates a file called app.css, which we use
-// // later on to build all.css
+// This generates a file called app.css, which we use
+// later on to build all.css
mix
- .options(
- {
- processCssUrls: false,
- processFontUrls: true,
- clearConsole: false
- })
+ .options({
+ processCssUrls: false,
+ processFontUrls: true,
+ clearConsole: false
+ })
.less('./node_modules/admin-lte/build/less/AdminLTE.less', 'css/build')
.less('./resources/assets/less/app.less', 'css/build')
.less('./resources/assets/less/overrides.less', 'css/build')
- .styles([
- './resources/assets/css/font-awesome/font-awesome.min.css',
+ .styles(
+ [
'./node_modules/bootstrap/dist/css/bootstrap.css',
+ './node_modules/font-awesome/css/font-awesome.css',
'./public/css/build/AdminLTE.css',
- './resources/assets/css/app.css',
- './node_modules/select2/dist/css/select2.css',
- './node_modules/select2/dist/css/select2.css',
+ './node_modules/jquery-ui-dist/jquery-ui.css',
+ './node_modules/admin-lte/plugins/iCheck/minimal/blue.css',
+ './node_modules/icheck/skins/minimal/minimal.css',
'./node_modules/bootstrap-datepicker/dist/css/bootstrap-datepicker.standalone.css',
- './resources/assets/css/bootstrap-tables-sticky-header.css',
- //'./node_modules/jquery-ui-bundle/jquery-ui.css',
- './resources/assets/css/signature-pad.css',
- './node_modules/icheck/skins/minimal/_all.css',
+ './node_modules/bootstrap-colorpicker/dist/css/bootstrap-colorpicker.css',
+ './node_modules/blueimp-file-upload/css/jquery.fileupload.css',
+ './node_modules/blueimp-file-upload/css/jquery.fileupload-ui.css',
+ './node_modules/ekko-lightbox/dist/ekko-lightbox.css',
+ './node_modules/bootstrap-table/dist/bootstrap-table.css',
+ './public/css/build/app.css',
+ //'./resources/assets/css/lib/select2.css',
+ './node_modules/select2/dist/css/select2.css',
'./public/css/build/overrides.css'
],
- './public/css/dist/all.css')
-
- // jQuery is loaded from vue.js webpack process
- // This compiles the vue.js file in the build directory
- // for later concatenation in the scripts() section below.
- .js(
- './resources/assets/js/vue.js', // Snipe-IT's initializer for Vue.js
- './public/js/build'
- ).sourceMaps()
- .scripts([
- './public/js/build/vue.js', //this is the modularized nifty Vue.js thing we just built, above!
- //'./node_modules/jquery/dist/jquery.js',
- //'./node_modules/jquery-ui-bundle/jquery-ui.js',
- //'./node_modules/bootstrap/dist/js/bootstrap.js',
- './resources/assets/js/app.js', //this is part of AdminLTE
-
- './node_modules/tether/dist/js/tether.min.js',
- './node_modules/jquery-slimscroll/jquery.slimscroll.js',
- './node_modules/jquery.iframe-transport/jquery.iframe-transport.js',
- './node_modules/blueimp-file-upload/js/jquery.fileupload.js',
- './node_modules/bootstrap-colorpicker/dist/js/bootstrap-colorpicker.js',
- './node_modules/bootstrap-datepicker/dist/js/bootstrap-datepicker.js',
- './node_modules/icheck/icheck.js',
- './node_modules/select2/dist/js/select2.js',
- './node_modules/jquery-form-validator/form-validator/jquery.form-validator.js',
- './node_modules/list.js/dist/list.js',
- './node_modules/ekko-lightbox/dist/ekko-lightbox.js',
+ './public/css/dist/all.css'
+ ).version();
+
- './resources/assets/js/snipeit.js', //this is the actual Snipe-IT JS
- './resources/assets/js/snipeit_modals.js'
- ],
- './public/js/dist/all.js');
-// Syntax: mix.copy(from, to);
-// mix.copy('./public/css/build/app.css', './public/css/dist/all.css')
-// .copy('./public/js/build/app.js', './public/js/dist/all.js')
- mix.copy('./node_modules/font-awesome/fonts', './public/css/fonts')
- .copy('./node_modules/icheck/skins/minimal', './public/css/dist');
+mix.copy(['./node_modules/icheck/skins/minimal/blue.png',
+ './node_modules/icheck/skins/minimal/blue@2x.png'], './public/css');
+
+/**
+ * Copy, minify and version skins
+ */
+mix
+ .minify([
+ './public/css/dist/skins/skin-green-dark.css',
+ './public/css/dist/skins/skin-black-dark.css',
+ './public/css/dist/skins/skin-blue-dark.css',
+ './public/css/dist/skins/skin-yellow-dark.css',
+ './public/css/dist/skins/skin-red-dark.css',
+ './public/css/dist/skins/skin-purple-dark.css',
+ './public/css/dist/skins/skin-orange-dark.css',
+ './public/css/dist/skins/skin-contrast.css'
+ ])
+ .version();
+/**
+ * Copy, minify and version signature-pad.css
+ */
+mix
+ .copy('./resources/assets/css/signature-pad.css', './public/css/dist')
+ .minify('./public/css/build/signature-pad.css');
-//mix.version();
+// Combine main SnipeIT JS files
+mix.js(
+ [
+ './resources/assets/js/vue.js',
+ './resources/assets/js/snipeit.js', //this is the actual Snipe-IT JS
+ './resources/assets/js/snipeit_modals.js'
+ ],
+ './public/js/build/app.js'
+);
+// Convert the skins to CSS
mix.less('./resources/assets/less/skins/skin-blue.less', 'css/dist/skins', './public/css/dist/skins/skin-blue.css');
mix.less('./resources/assets/less/skins/skin-red.less', 'css/dist/skins', './public/css/dist/skins/skin-red.css');
mix.less('./resources/assets/less/skins/skin-contrast.less', 'css/dist/skins', './public/css/dist/skins/skin-contrast.css');
@@ -79,10 +82,86 @@ mix.less('./resources/assets/less/skins/skin-black-dark.less', 'css/dist/skins',
mix.less('./resources/assets/less/skins/skin-red-dark.less', 'css/dist/skins', './public/css/dist/skins/skin-red-light.css');
mix.less('./resources/assets/less/skins/skin-purple.less', 'css/dist/skins', './public/css/dist/skins/skin-purple.css');
mix.less('./resources/assets/less/skins/skin-purple-dark.less', 'css/dist/skins', './public/css/dist/skins/skin-purple-light.css');
-mix.less('./resources/assets/less/skins/skin-yellow.less', 'css/dist/skins', './public/css/skins/dist/skin-yellow.css');
+mix.less('./resources/assets/less/skins/skin-yellow.less', 'css/dist/skins', './public/css/dist/skins/skin-yellow.css');
mix.less('./resources/assets/less/skins/skin-yellow-dark.less', 'css/dist/skins', './public/css/dist/skins/skin-yellow-light.css');
-mix.less('./resources/assets/less/skins/skin-blue-dark.less', 'css/skins/dist', './public/css/dist/skins/skin-blue-light.css');
+mix.less('./resources/assets/less/skins/skin-blue-dark.less', 'css/dist/skins', './public/css/dist/skins/skin-blue-light.css');
mix.less('./resources/assets/less/skins/skin-orange-dark.less', 'css/dist/skins', './public/css/dist/skins/skin-orange-light.css');
mix.less('./resources/assets/less/skins/skin-orange.less', 'css/dist/skins', './public/css/dist/skins/skin-orange.css');
+/**
+ * Combine bootstrap table css
+ */
+mix.combine(
+ [
+ './node_modules/bootstrap-table/dist/bootstrap-table.css',
+ './node_modules/bootstrap-table/dist/extentions/mobile/bootstrap-table-mobile.css',
+ './node_modules/bootstrap-table/dist/extensions/export/bootstrap-table-export.css',
+ './node_modules/bootstrap-table/dist/extensions/sticky-header/bootstrap-table-sticky-header.css'
+ ],
+ 'public/css/dist/bootstrap-table.css'
+).version();
+
+
+
+/**
+ * Combine JS
+ */
+mix
+ .combine(
+ [
+ './node_modules/admin-lte/dist/js/adminlte.min.js',
+ './node_modules/tether/dist/js/tether.js',
+ './node_modules/jquery-slimscroll/jquery.slimscroll.js',
+ './node_modules/jquery.iframe-transport/jquery.iframe-transport.js',
+ './node_modules/blueimp-file-upload/js/jquery.fileupload.js',
+ './node_modules/bootstrap-colorpicker/dist/js/bootstrap-colorpicker.js',
+ './node_modules/bootstrap-datepicker/dist/js/bootstrap-datepicker.js',
+ './node_modules/ekko-lightbox/dist/ekko-lightbox.js',
+ './node_modules/icheck/icheck.js',
+ './resources/assets/js/extensions/pGenerator.jquery.js',
+ './node_modules/chart.js/dist/Chart.js',
+ './resources/assets/js/signature_pad.js',
+ './node_modules/jquery-form-validator/form-validator/jquery.form-validator.js',
+ './node_modules/list.js/dist/list.js'
+ ],
+ 'public/js/build/vendor.js'
+ );
+
+
+
+/**
+ * Combine bootstrap table js
+ */
+mix
+ .combine(
+ [
+ './node_modules/bootstrap-table/dist/bootstrap-table.js',
+ './node_modules/bootstrap-table/dist/extentions/mobile/bootstrap-table-mobile.js',
+ './node_modules/bootstrap-table/dist/extensions/export/bootstrap-table-export.js',
+ './node_modules/bootstrap-table/dist/extensions/cookie/bootstrap-table-cookie.js',
+ './resources/assets/js/extensions/jquery.base64.js',
+ './node_modules/tableexport.jquery.plugin/tableExport.js',
+ './node_modules/tableexport.jquery.plugin/libs/jsPDF/jspdf.min.js',
+ './resources/js/FileSaver.min.js',
+ './resources/js/xlsx.core.min.js',
+ './node_modules/tableexport.jquery.plugin/libs/jsPDF-AutoTable/jspdf.plugin.autotable.js',
+ './node_modules/bootstrap-table/dist/extensions/sticky-header/bootstrap-table-sticky-header.js',
+ './node_modules/bootstrap-table/dist/extensions/toolbar/bootstrap-table-toolbar.js'
+ ],
+ 'public/js/dist/bootstrap-table.js'
+ ).version();
+
+
+mix.combine(
+ [
+ './public/js/build/app.js',
+ './public/js/build/vendor.js'
+
+ ],
+ './public/js/dist/all.js'
+ ).version();
+
+
+
+