DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2025-03-05 20:52:15 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'develop' into JS_Cleanup

Browse source
This commit is contained in:
Wes Hulette 2018-10-01 08:07:07 -04:00
parent 3016dcc616 5cb6744c1b
commit ce0a40a20c
5 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.gitignore vendored
View file

@ -56,3 +56,4 @@ tests/_support/_generated/*
\.php_cs\.dist \.php_cs\.dist
phpmd\.xml phpmd\.xml
/public/storage

2
app/Models/CustomFieldset.php
View file

@ -15,7 +15,7 @@ class CustomFieldset extends Model
* Validation rules * Validation rules
* @var array * @var array
*/ */
protected $rules = [ public $rules = [
"name" => "required|unique:custom_fieldsets" "name" => "required|unique:custom_fieldsets"
]; ];

BIN
public/css/all.css
View file

Binary file not shown.

2
resources/views/layouts/basic.blade.php
View file

@ -12,7 +12,7 @@
<!-- Select2 --> <!-- Select2 -->
<link rel="stylesheet" href="{{ url(asset('js/plugins/select2/select2.min.css')) }}"> <link rel="stylesheet" href="{{ url(asset('js/plugins/select2/select2.min.css')) }}">
<link rel="stylesheet" href="{{ url(mix('css/dist/all.css')) }}"> <link rel="stylesheet" href="{{ url(mix('css/all.css')) }}">
<link rel="shortcut icon" type="image/ico" href="{{ url(asset('favicon.ico')) }}"> <link rel="shortcut icon" type="image/ico" href="{{ url(asset('favicon.ico')) }}">

2
webpack.mix.js
View file

@ -12,8 +12,8 @@ mix
.less("./resources/assets/less/app.less", "css/build") .less("./resources/assets/less/app.less", "css/build")
.styles( .styles(
[ [
"./public/css/build/AdminLTE.css",
"./node_modules/select2/dist/css/select2.css", "./node_modules/select2/dist/css/select2.css",
"./public/css/build/AdminLTE.css",
"./node_modules/admin-lte/plugins/iCheck/minimal/blue.css", "./node_modules/admin-lte/plugins/iCheck/minimal/blue.css",
"./node_modules/font-awesome/css/font-awesome.css", "./node_modules/font-awesome/css/font-awesome.css",
"./node_modules/icheck/skins/minimal/minimal.css", "./node_modules/icheck/skins/minimal/minimal.css",