ouyang/snipe-it
1
0
Fork 0
Code Issues Pull Requests Actions 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/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-08-15 14:24:30 +02:00
parent 31197604a3 9797bb19e2
commit 7b7738fbcc
8 changed files with 19 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
public/css/build/app.css
+1 -1
View File
File diff suppressed because one or more lines are too long
public/css/build/app.css.map
+1 -1
View File
File diff suppressed because one or more lines are too long
public/css/build/overrides.css
+1 -1
View File
File diff suppressed because one or more lines are too long
public/css/build/overrides.css.map
+1 -1
View File
File diff suppressed because one or more lines are too long
public/css/dist/all.css
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
public/mix-manifest.json
+3 -3
View File
@@ -2,8 +2,8 @@
"/js/dist/all.js": "/js/dist/all.js?id=de88a5fd4b026170e290344559b7fa99",
"/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=146086d653897e2557af5e68f6f8c56f",
"/css/build/overrides.css": "/css/build/overrides.css?id=0bac6960dea3fc4e62536f9b665006e9",
"/css/build/app.css": "/css/build/app.css?id=bd23682f958f06f815d8e1261dbf56b9",
"/css/build/overrides.css": "/css/build/overrides.css?id=f0e973ad0aa516d9d9a55d281e37fed2",
"/css/build/app.css": "/css/build/app.css?id=f15ba4f622cef70b21899abd47bbf064",
"/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=fcedb8d2c6f164cdb288638c47f9b57d",
"/css/dist/all.css": "/css/dist/all.css?id=743bcf2c83580c5d00b171530321aaa9",
"/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",
resources/assets/less/overrides.less
+8
View File
@@ -1234,3 +1234,11 @@ caption.tableCaption {
margin-left: -47px;
margin-top: 2px;
}
.popover.help-popover,
.popover.help-popover .popover-content,
.popover.help-popover .popover-body,
.popover.help-popover .popover-title,
.popover.help-popover .popover-header {
color: #000;
}
resources/views/partials/more-info.blade.php
+3 -1
View File
@@ -1,4 +1,6 @@
<a style="padding-left: 5px; font-size: 15px;" class="text-dark-gray hidden-print" data-trigger="focus" tabindex="0" role="button" data-toggle="popover" title="{{ trans('general.more_info') }}" data-placement="right" data-html="true" data-content="{{ (isset($helpText)) ? $helpText : 'Help Info Missing' }}">
<a style="padding-left: 5px; font-size: 15px;" class="text-dark-gray hidden-print" data-trigger="focus" tabindex="0" role="button" data-toggle="popover" data-container="body"
data-template="<div class='popover help-popover' role='tooltip'><div class='arrow'></div><h3 class='popover-title'></h3><div class='popover-content popover-body'></div></div>"
title="{{ trans('general.more_info') }}" data-placement="right" data-html="true" data-content="{{ (isset($helpText)) ? $helpText : 'Help Info Missing' }}">
<x-icon type="more-info" style="padding-top: 9px;" />
<span class="sr-only">{{ trans('general.moreinfo') }}</span>
</a>