Skip to content
Snippets Groups Projects
Commit 19bc158f authored by Wes Hulette's avatar Wes Hulette Committed by snipe
Browse files

Fixed tooltips and iCheck (#6303)

* Fixed missing oauth tables during setup.

* Fixed duplicate style tag

This was causing webpack issues.

* Deleted erroneously created directory

* Removed duplicate imports

* Fixed tooltips, iCheck audit page

https://github.com/snipe/snipe-it/pull/6285#issuecomment-427235280

* Merge remote-tracking branch 'origin/#6285-Fixes' into #6285-Fixes
Fixed Manifest file
parent a516e427
Branches twilight
No related tags found
No related merge requests found
.public/css/dist/blue.png

1.11 KiB

.public/css/dist/blue@2x.png

1.38 KiB

File suppressed by a .gitattributes entry or the file's encoding is unsupported.
File suppressed by a .gitattributes entry or the file's encoding is unsupported.
File suppressed by a .gitattributes entry or the file's encoding is unsupported.
{
"/js/app.js": "/js/app.js?id=496b2158637db1de24ee",
"/js/app.js": "/js/app.js?id=818d31d3716495504611",
"/css/build/AdminLTE.css": "/css/build/AdminLTE.css?id=f7a5d783fef321018f4c",
"/css/build/app.css": "/css/build/app.css?id=0dfc05b0fe1dcc9b6e3d",
"/css/all.css": "/css/all.css?id=c6ec5749d68d87512346",
"/css/all.css": "/css/all.css?id=9399418f7ce5805e3571",
"/css/skins/skin-green-dark.min.css": "/css/skins/skin-green-dark.min.css?id=1039ae0e198a7f3d8da7",
"/css/skins/skin-orange-dark.min.css": "/css/skins/skin-orange-dark.min.css?id=9a461970f7ab07f40847",
"/css/skins/skin-red-dark.min.css": "/css/skins/skin-red-dark.min.css?id=99f90bbd653d7db10795",
"/css/signature-pad.css": "/css/signature-pad.css?id=6a89d3cd901305e66ced",
"/css/signature-pad.min.css": "/css/signature-pad.min.css?id=6a89d3cd901305e66ced",
"/js/vendor.js": "/js/vendor.js?id=39523e966a9bc7a70731",
"/js/vendor.js": "/js/vendor.js?id=c8bc37fd1a8b2d7aea69",
"/js/html5shiv.min.js": "/js/html5shiv.min.js?id=ba846cb704dbfbc5f1b3",
"/js/respond.min.js": "/js/respond.min.js?id=afc1984a3d17110449dc",
"/js/dist/bootstrap-table.js": "/js/dist/bootstrap-table.js?id=7223478ba9bf2c6dfb4f",
......
This diff is collapsed.
......@@ -6,7 +6,6 @@ window._ = require('lodash');
* for JavaScript based Bootstrap features such as modals and tabs. This
* code may be modified to fit the specific needs of your application.
*/
window.$ = window.jQuery = require('jquery');
require('bootstrap-less');
......
......@@ -82,9 +82,9 @@
<br><br>
</div>
<div class="alert col-md-12" style="padding-top: 20px;"
<div class="alert col-md-12"
:class="alertClass"
style="text-align:left"
style="padding-top: 20px; text-align:left"
v-if="statusText">
{{ this.statusText }}
</div>
......
......@@ -16,6 +16,7 @@ mix
"./node_modules/font-awesome/css/font-awesome.css",
"./node_modules/select2/dist/css/select2.css",
"./public/css/build/AdminLTE.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",
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment