DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2025-01-11 22:07:29 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

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-09-15 21:47:14 -07:00
parent 421c9baecc 9cae4f1d1b
commit 0924d2144b
5 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

6
public/mix-manifest.json
View file

@ -1,8 +1,8 @@
{
"/js/build/app.js": "/js/build/app.js?id=9b2bd6c2e9b882c53969c66a9628a150",
"/css/dist/skins/skin-blue.css": "/css/dist/skins/skin-blue.css?id=940da5c039a1f104654e127e0d43b801",
"/css/build/overrides.css": "/css/build/overrides.css?id=6a8926c5699dc8117fce282bddef6222",
"/css/build/app.css": "/css/build/app.css?id=e319e07a1e4eeb413e5667136850ea12",
"/css/build/overrides.css": "/css/build/overrides.css?id=e99db816cf2ce6127a93c33b505ae695",
"/css/build/app.css": "/css/build/app.css?id=8868ecb38344d12bb011d1059f3a4617",
"/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=0245911190e2ff51f1710360b9fd25c4",
@ -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=4cb990f5b29620d9a304a32a08270457",
"/css/dist/all.css": "/css/dist/all.css?id=07822def2d4cbcb1b693d32e11b6a55b",
"/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",

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

@ -665,3 +665,7 @@ th.css-accessory > .th-inner::before
.select2-container--default .select2-selection--multiple {
border-radius: 0px;
}
.bs-checkbox input {
zoom: 1.5;
}