lunax/snipe_it
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity Actions

Merge remote-tracking branch 'origin/develop'

Browse source 
Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	public/css/build/app.css
#	public/css/build/overrides.css
#	public/css/dist/all.css
#	public/mix-manifest.json
This commit is contained in:
snipe 2022-07-07 16:01:17 -07:00
commit 30c03435e4
5 changed files with 11 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

File diff suppressed because one or more lines are too long

2
public/css/build/overrides.css
View file

File diff suppressed because one or more lines are too long

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

File diff suppressed because one or more lines are too long

6
public/mix-manifest.json
View file

@ -1,8 +1,8 @@
{
"/js/build/app.js": "/js/build/app.js?id=1218df365997eb1079ea543e967cb778",
"/css/dist/skins/skin-blue.css": "/css/dist/skins/skin-blue.css?id=940da5c039a1f104654e127e0d43b801",
"/css/build/overrides.css": "/css/build/overrides.css?id=3ceb3005e82edf509bb14910fa522b60",
"/css/build/app.css": "/css/build/app.css?id=0fa5fa8923472c9b63c86136f4558fb5",
"/css/build/overrides.css": "/css/build/overrides.css?id=2be7c5d95ea8ef31b7e574aeb7a509b0",
"/css/build/app.css": "/css/build/app.css?id=11a1c1381fc60fee9d448138adcf2b35",
"/css/build/AdminLTE.css": "/css/build/AdminLTE.css?id=f25c77ed07053646a42e9c19923d24fa",
"/css/dist/skins/skin-orange.css": "/css/dist/skins/skin-orange.css?id=083eab0a6e1062adfe24ee21a829e6c3",
"/css/dist/skins/skin-orange-dark.css": "/css/dist/skins/skin-orange-dark.css?id=43789a18d950ebfc2bdac669bbd55160",
@ -18,7 +18,7 @@
"/css/dist/skins/skin-green.css": "/css/dist/skins/skin-green.css?id=af9b811e81b591789d1155c0d4ed42af",
"/css/dist/skins/skin-contrast.css": "/css/dist/skins/skin-contrast.css?id=fc501683e0cb04a8717593610d215baf",
"/css/dist/skins/skin-red.css": "/css/dist/skins/skin-red.css?id=476ccb37fe487f4d29ebfb49c198e311",
"/css/dist/all.css": "/css/dist/all.css?id=5d78eb3f9885127a9f57a4c2788918bf",
"/css/dist/all.css": "/css/dist/all.css?id=f284ea39416dc9275bd83eccfafd3841",
"/css/blue.png": "/css/blue.png?id=e83a6c29e04fe851f2122815b2e4b150",
"/css/blue@2x.png": "/css/blue@2x.png?id=51135dd4d24f88f5de0b2414bd51dac5",
"/css/dist/signature-pad.css": "/css/dist/signature-pad.css?id=6a89d3cd901305e66ced1cf5f13147f7",

9
resources/assets/less/overrides.less
View file

@ -589,15 +589,16 @@ th.css-accessory > .th-inner::before
{
display: inline-block;
font-size: 20px;
font-family: "Font Awesome 5 Free";
font-weight: 300;
font-family: "Font Awesome 5 Free";
font-weight: 900;
}
th.css-padlock > .th-inner::before
{
content: "\f023"; font-family: "Font Awesome 5 Free"; font-weight: 400;
content: "\f023";
font-family: "Font Awesome 5 Free";
font-weight: 900;
padding-right: 4px;
font-weight: 300;
font-size: 12px;
}