diff --git a/package.json b/package.json index 442513a9f9..f6cc53307f 100644 --- a/package.json +++ b/package.json @@ -38,7 +38,6 @@ "chart.js": "^2.9.4", "css-loader": "^4.0.0", "ekko-lightbox": "^5.1.1", - "icheck": "^1.0.2", "imagemin": "^8.0.1", "jquery-form-validator": "^2.3.79", "jquery-slimscroll": "^1.3.8", diff --git a/public/css/build/app.css b/public/css/build/app.css index 314427c6dc..a74ffcfc2a 100644 Binary files a/public/css/build/app.css and b/public/css/build/app.css differ diff --git a/public/css/build/overrides.css b/public/css/build/overrides.css index 6105a2b102..058e30a137 100644 Binary files a/public/css/build/overrides.css and b/public/css/build/overrides.css differ diff --git a/public/css/dist/all.css b/public/css/dist/all.css index e5ff03bb59..c9c03a25dc 100644 Binary files a/public/css/dist/all.css and b/public/css/dist/all.css differ diff --git a/public/js/build/app.js b/public/js/build/app.js index da67384910..000ab0bf37 100644 Binary files a/public/js/build/app.js and b/public/js/build/app.js differ diff --git a/public/js/build/vendor.js b/public/js/build/vendor.js index b5ee42d9f6..68a04d9a7a 100644 Binary files a/public/js/build/vendor.js and b/public/js/build/vendor.js differ diff --git a/public/js/dist/all.js b/public/js/dist/all.js index 60cfd10f66..0293da7fce 100644 Binary files a/public/js/dist/all.js and b/public/js/dist/all.js differ diff --git a/public/mix-manifest.json b/public/mix-manifest.json index 7704bba77f..1ce14addae 100644 --- a/public/mix-manifest.json +++ b/public/mix-manifest.json @@ -1,8 +1,8 @@ { - "/js/build/app.js": "/js/build/app.js?id=28c6122bd878c92d1b8612ed7f9a6020", + "/js/build/app.js": "/js/build/app.js?id=7caeae38608edd96421f8ef59d33f5f6", "/css/dist/skins/skin-blue.css": "/css/dist/skins/skin-blue.css?id=f677207c6cf9678eb539abecb408c374", - "/css/build/overrides.css": "/css/build/overrides.css?id=bdb3c9c119597e19769e0c604b0b3724", - "/css/build/app.css": "/css/build/app.css?id=c8fdcf4d1659b975d83fc1f91b343272", + "/css/build/overrides.css": "/css/build/overrides.css?id=fcd2390cb449bfb8f93d0cc2342c06ad", + "/css/build/app.css": "/css/build/app.css?id=41f3c631198b89b1319d91200d521dfc", "/css/build/AdminLTE.css": "/css/build/AdminLTE.css?id=dc383f8560a8d4adb51d44fb4043e03b", "/css/dist/skins/skin-orange.css": "/css/dist/skins/skin-orange.css?id=6f0563e726c2fe4fab4026daaa5bfdf2", "/css/dist/skins/skin-orange-dark.css": "/css/dist/skins/skin-orange-dark.css?id=f343f659ca1d45534d2c2c3cc30fb619", @@ -18,7 +18,7 @@ "/css/dist/skins/skin-green.css": "/css/dist/skins/skin-green.css?id=0a82a6ae6bb4e58fe62d162c4fb50397", "/css/dist/skins/skin-contrast.css": "/css/dist/skins/skin-contrast.css?id=da6c7997d9de2f8329142399f0ce50da", "/css/dist/skins/skin-red.css": "/css/dist/skins/skin-red.css?id=44bf834f2110504a793dadec132a5898", - "/css/dist/all.css": "/css/dist/all.css?id=39a396ba396c4e17048bd6a2cde2c6b7", + "/css/dist/all.css": "/css/dist/all.css?id=5c636e1435c3abc16b28184b18c65056", "/css/dist/signature-pad.css": "/css/dist/signature-pad.css?id=6a89d3cd901305e66ced1cf5f13147f7", "/css/dist/signature-pad.min.css": "/css/dist/signature-pad.min.css?id=6a89d3cd901305e66ced1cf5f13147f7", "/css/webfonts/fa-brands-400.ttf": "/css/webfonts/fa-brands-400.ttf?id=2df05d4beaa48550d71234e8dca79141", @@ -30,9 +30,9 @@ "/css/webfonts/fa-v4compatibility.ttf": "/css/webfonts/fa-v4compatibility.ttf?id=a947172f4fde88e43b4c1a60b01db061", "/css/webfonts/fa-v4compatibility.woff2": "/css/webfonts/fa-v4compatibility.woff2?id=bbc23038a6067c78310d3f19432a3ebf", "/css/dist/bootstrap-table.css": "/css/dist/bootstrap-table.css?id=ee4896df8b8f008ce73a9a0c2549aefd", - "/js/build/vendor.js": "/js/build/vendor.js?id=47ecbb4bb3b0e02315f391caadbdf971", + "/js/build/vendor.js": "/js/build/vendor.js?id=3843eca1b2e670b29c1e1cb57e1d7aa7", "/js/dist/bootstrap-table.js": "/js/dist/bootstrap-table.js?id=14d9a2affec7b066d20fcba2e6e67ad2", - "/js/dist/all.js": "/js/dist/all.js?id=525e7726cc4cdcdf4e8bd8c2ad203297", + "/js/dist/all.js": "/js/dist/all.js?id=97b1034b75e3ac29a2eb9770d66c3370", "/css/dist/skins/skin-green.min.css": "/css/dist/skins/skin-green.min.css?id=0a82a6ae6bb4e58fe62d162c4fb50397", "/css/dist/skins/skin-green-dark.min.css": "/css/dist/skins/skin-green-dark.min.css?id=c0d21166315b7c2cdd4819fa4a5e4d1e", "/css/dist/skins/skin-black.min.css": "/css/dist/skins/skin-black.min.css?id=76482123f6c70e866d6b971ba91de7bb", diff --git a/resources/assets/js/snipeit.js b/resources/assets/js/snipeit.js index 7236712c34..70e4f80a8f 100755 --- a/resources/assets/js/snipeit.js +++ b/resources/assets/js/snipeit.js @@ -599,7 +599,7 @@ function htmlEntities(str) { })(jQuery); /** - * Universal Livewire Select2 and iCheck integration + * Universal Livewire Select2 integration * * How to use: * @@ -623,16 +623,6 @@ $(function () { window.livewire.hook('message.processed', function (el,component) { $('.livewire-select2').select2(); - //$('.livewire-icheck').iCheck(); //this seems to blow up pretty badly. }); - $(document).on('ifToggled', '.livewire-icheck', function (event) { - if(!event.target.name || !$(event.target).data('livewire-component')) { - console.error("You need to set both name (which should match a Livewire property) and data-livewire-component on your iCheck elements!") - console.error("For data-livewire-component, you probably want to use $_instance->id or {{ $_instance->id }}, as appropriate") - return false - } - window.livewire.find($(event.target).data('livewire-component')).set(event.target.name, event.target.checked) - }) - }) \ No newline at end of file diff --git a/resources/assets/less/overrides.less b/resources/assets/less/overrides.less index 17a26579c6..fd5a13bfa3 100644 --- a/resources/assets/less/overrides.less +++ b/resources/assets/less/overrides.less @@ -701,6 +701,7 @@ label.form-control { background-color: inherit; color: inherit; font-size: inherit; + font-weight: inherit; } .form-control--disabled { diff --git a/webpack.mix.js b/webpack.mix.js index 8d29fb581a..2cda1ee50f 100644 --- a/webpack.mix.js +++ b/webpack.mix.js @@ -165,7 +165,6 @@ mix.combine( "./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", //definite problem here :( "./resources/assets/js/extensions/pGenerator.jquery.js", "./node_modules/chart.js/dist/Chart.js", "./resources/assets/js/signature_pad.js",