mirror/snipe-it
3
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2025-10-29 11:21:21 +00:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop'

Browse Source 
# Conflicts:
#	config/version.php
#	public/css/build/app.css
#	public/css/build/app.css.map
#	public/css/build/overrides.css
#	public/css/build/overrides.css.map
#	public/css/dist/all.css
#	public/mix-manifest.json
This commit is contained in:
snipe 2025-10-17 18:37:18 +01:00
commit 1a7c7fdebf
9 changed files with 17 additions and 9 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/app.css.map
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/build/overrides.css.map
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

@ -2,8 +2,8 @@
"/js/dist/all.js": "/js/dist/all.js?id=5c191843e0bb9292ec6b7f0a3c5765b3",
"/css/dist/skins/skin-black-dark.css": "/css/dist/skins/skin-black-dark.css?id=bf1a348eae3e60c62b8879953f7df14c",
"/css/dist/skins/_all-skins.css": "/css/dist/skins/_all-skins.css?id=f712d11cfca345b58c1d8a35df03d38d",
"/css/build/overrides.css": "/css/build/overrides.css?id=a4f95b2cd50d7a042bfe7abfd229e8a4",
"/css/build/app.css": "/css/build/app.css?id=203a9c485f15a835b74c31d6267cbe5f",
"/css/build/overrides.css": "/css/build/overrides.css?id=fec94887d3bd4899176e7172e315c961",
"/css/build/app.css": "/css/build/app.css?id=1b2aad9b78c526c9ac324a147a4848e6",
"/css/build/AdminLTE.css": "/css/build/AdminLTE.css?id=bdf169bc2141f453390614c138cdce95",
"/css/dist/skins/skin-yellow.css": "/css/dist/skins/skin-yellow.css?id=e1e6e1c64cf14fc350585aaeb0e42f6b",
"/css/dist/skins/skin-yellow-dark.css": "/css/dist/skins/skin-yellow-dark.css?id=08ae1b3e66008966ce5d600ea3ad04a2",
@ -19,7 +19,7 @@
"/css/dist/skins/skin-blue.css": "/css/dist/skins/skin-blue.css?id=68a92d85c8e351dfb38a835307f126ec",
"/css/dist/skins/skin-blue-dark.css": "/css/dist/skins/skin-blue-dark.css?id=cbb20ad6182b658f34117bf96a621b63",
"/css/dist/skins/skin-black.css": "/css/dist/skins/skin-black.css?id=84e2ee950ae04444988b37038e5a3951",
"/css/dist/all.css": "/css/dist/all.css?id=91a0e92398aae9902ffb0f74a7fd95f1",
"/css/dist/all.css": "/css/dist/all.css?id=ebce085e83406391a6003079f8a304b0",
"/css/dist/signature-pad.css": "/css/dist/signature-pad.css?id=6a89d3cd901305e66ced1cf5f13147f7",
"/css/dist/signature-pad.min.css": "/css/dist/signature-pad.min.css?id=6a89d3cd901305e66ced1cf5f13147f7",
"/js/select2/i18n/af.js": "/js/select2/i18n/af.js?id=4f6fcd73488ce79fae1b7a90aceaecde",

7
resources/assets/less/overrides.less
View File

@ -1295,3 +1295,10 @@ p.callout-subtext a:hover, p.callout-subtext a:visited, p.callout-subtext a:link
color: #31708f;
text-decoration: none;
}
/**
This just hides the padding on the right side of the mark tag for a less weird visual experience
*/
mark {
padding-right: 0px;
}

1
resources/views/hardware/index.blade.php
View File

@ -67,6 +67,7 @@
data-show-footer="true"
data-sort-order="asc"
data-sort-name="name"
data-search-text="{{ session()->get('search') }}"
data-show-columns-search="true"
data-toolbar="#assetsBulkEditToolbar"
data-bulk-button-id="#bulkAssetEditButton"

2
resources/views/layouts/default.blade.php
View File

@ -1334,7 +1334,7 @@ dir="{{ Helper::determineLanguageDirection() }}">
</script>
@if ((Session::get('topsearch')=='true') || (request()->is('/')))
@if ((session()->get('topsearch')=='true') || (request()->is('/')))
<script nonce="{{ csrf_token() }}">
$("#tagSearch").focus();
</script>