DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-12-24 21:24:13 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Removed poop class, added comment to webpack file

Browse source
This commit is contained in:
snipe 2017-06-06 01:44:17 -07:00
parent 01cc00c832
commit 03411a3ae8
6 changed files with 420 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
build/mix-manifest.json
View file

@ -12,7 +12,7 @@
"/css/AdminLTE.css": "/css/AdminLTE.css", "/css/AdminLTE.css": "/css/AdminLTE.css",
"/css/overrides.css": "/css/overrides.css", "/css/overrides.css": "/css/overrides.css",
"/css/skin-blue.css": "/css/skin-blue.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/AdminLTE.css": "/public/css/AdminLTE.css",
"/public/css/app.css": "/public/css/app.css", "/public/css/app.css": "/public/css/app.css",
"/public/css/overrides.css": "/public/css/overrides.css", "/public/css/overrides.css": "/public/css/overrides.css",

3
build/public/css/app.css
View file

@ -7019,6 +7019,3 @@ button.close {
.colorpicker-inline.colorpicker-visible { .colorpicker-inline.colorpicker-visible {
display: inline-block; display: inline-block;
} }
.poop-class {
background-color: red;
}

415
build/vue.js Normal file
View file

File diff suppressed because one or more lines are too long

BIN
public/css/dist/all.css vendored
View file

Binary file not shown.

1
resources/assets/less/app.less
View file

@ -5,4 +5,3 @@
@import '../../../node_modules/ekko-lightbox/ekko-lightbox'; @import '../../../node_modules/ekko-lightbox/ekko-lightbox';
@import '../../../node_modules/bootstrap-colorpicker/src/less/colorpicker'; @import '../../../node_modules/bootstrap-colorpicker/src/less/colorpicker';
.poop-class {background-color: red}

8
webpack.mix.js
View file

@ -3,6 +3,9 @@ const { mix } = require('laravel-mix');
mix.setPublicPath('build'); //this throws everything to root dir 'build' 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 mix
.options( .options(
{ {
@ -14,10 +17,7 @@ mix
.less('resources/assets/less/app.less', 'public/css') .less('resources/assets/less/app.less', 'public/css')
.less('resources/assets/less/overrides.less', 'public/css') .less('resources/assets/less/overrides.less', 'public/css')
mix.styles([ mix.styles([
//'public/css/app.css', //what is this file, is this wrong? Are we building from ourselves?
'build/public/css/app.css', 'build/public/css/app.css',
'public/css/AdminLTE.css', 'public/css/AdminLTE.css',
'resources/assets/css/font-awesome/font-awesome.min.css', 'resources/assets/css/font-awesome/font-awesome.min.css',
@ -30,7 +30,7 @@ mix.styles([
mix.js( mix.js(
// jQuery is loaded from vue.js webpack process // jQuery is loaded from vue.js webpack process
'./resources/assets/js/vue.js', //this is Snipe-IT's initializer for Vue.js './resources/assets/js/vue.js', //this is Snipe-IT's initializer for Vue.js
'build/public' 'build'
).sourceMaps(); ).sourceMaps();
mix.scripts([ mix.scripts([