mirror of
https://github.com/snipe/snipe-it.git
synced 2024-12-23 12:44:12 -08:00
Removed poop class, added comment to webpack file
This commit is contained in:
parent
01cc00c832
commit
03411a3ae8
|
@ -12,7 +12,7 @@
|
|||
"/css/AdminLTE.css": "/css/AdminLTE.css",
|
||||
"/css/overrides.css": "/css/overrides.css",
|
||||
"/css/skin-blue.css": "/css/skin-blue.css",
|
||||
"/public/vue.js": "/public/vue.js",
|
||||
"/vue.js": "/vue.js",
|
||||
"/public/css/AdminLTE.css": "/public/css/AdminLTE.css",
|
||||
"/public/css/app.css": "/public/css/app.css",
|
||||
"/public/css/overrides.css": "/public/css/overrides.css",
|
||||
|
|
|
@ -7019,6 +7019,3 @@ button.close {
|
|||
.colorpicker-inline.colorpicker-visible {
|
||||
display: inline-block;
|
||||
}
|
||||
.poop-class {
|
||||
background-color: red;
|
||||
}
|
||||
|
|
415
build/vue.js
Normal file
415
build/vue.js
Normal file
File diff suppressed because one or more lines are too long
BIN
public/css/dist/all.css
vendored
BIN
public/css/dist/all.css
vendored
Binary file not shown.
|
@ -5,4 +5,3 @@
|
|||
@import '../../../node_modules/ekko-lightbox/ekko-lightbox';
|
||||
@import '../../../node_modules/bootstrap-colorpicker/src/less/colorpicker';
|
||||
|
||||
.poop-class {background-color: red}
|
||||
|
|
|
@ -3,6 +3,9 @@ const { mix } = require('laravel-mix');
|
|||
|
||||
mix.setPublicPath('build'); //this throws everything to root dir 'build'
|
||||
|
||||
|
||||
// This generates a file called app.css, which we use
|
||||
// later on to build all.css
|
||||
mix
|
||||
.options(
|
||||
{
|
||||
|
@ -14,10 +17,7 @@ mix
|
|||
.less('resources/assets/less/app.less', 'public/css')
|
||||
.less('resources/assets/less/overrides.less', 'public/css')
|
||||
|
||||
|
||||
|
||||
mix.styles([
|
||||
//'public/css/app.css', //what is this file, is this wrong? Are we building from ourselves?
|
||||
'build/public/css/app.css',
|
||||
'public/css/AdminLTE.css',
|
||||
'resources/assets/css/font-awesome/font-awesome.min.css',
|
||||
|
@ -30,7 +30,7 @@ mix.styles([
|
|||
mix.js(
|
||||
// jQuery is loaded from vue.js webpack process
|
||||
'./resources/assets/js/vue.js', //this is Snipe-IT's initializer for Vue.js
|
||||
'build/public'
|
||||
'build'
|
||||
).sourceMaps();
|
||||
|
||||
mix.scripts([
|
||||
|
|
Loading…
Reference in a new issue