ouyang/snipe-it
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

And more updates

Browse Source
This commit is contained in:
snipe
2025-11-28 17:33:30 +00:00
parent 20a75bbbb7
commit 4e4b8ddb77
13 changed files with 120 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
public/css/build/app.css
View File

@@ -522,12 +522,20 @@ a.link-danger:visited,
a.link-danger:hover {
color: #dd4b39;
}
.btn-primary:hover,
.btn-success:hover,
.btn-info:hover,
.btn-warning:hover,
.btn-primary,
.btn-success,
.btn-info,
.btn-warning,
.btn-primary.btn-outline:hover,
.btn-success.btn-outline:hover,
.btn-info.btn-outline:hover,
.btn-warning.btn-outline:hover,
.btn-danger.btn-outline:hover {
color: #fff;
color: #fff !important;
}
.slideout-menu {
position: fixed;

2
public/css/build/app.css.map
View File

File diff suppressed because one or more lines are too long

10
public/css/build/overrides.css
View File

@@ -146,12 +146,20 @@ a.link-danger:visited,
a.link-danger:hover {
color: #dd4b39;
}
.btn-primary:hover,
.btn-success:hover,
.btn-info:hover,
.btn-warning:hover,
.btn-primary,
.btn-success,
.btn-info,
.btn-warning,
.btn-primary.btn-outline:hover,
.btn-success.btn-outline:hover,
.btn-info.btn-outline:hover,
.btn-warning.btn-outline:hover,
.btn-danger.btn-outline:hover {
color: #fff;
color: #fff !important;
}
.slideout-menu {
position: fixed;

2
public/css/build/overrides.css.map
View File

File diff suppressed because one or more lines are too long

20
public/css/dist/all.css vendored
View File

@@ -21858,12 +21858,20 @@ a.link-danger:visited,
a.link-danger:hover {
color: #dd4b39;
}
.btn-primary:hover,
.btn-success:hover,
.btn-info:hover,
.btn-warning:hover,
.btn-primary,
.btn-success,
.btn-info,
.btn-warning,
.btn-primary.btn-outline:hover,
.btn-success.btn-outline:hover,
.btn-info.btn-outline:hover,
.btn-warning.btn-outline:hover,
.btn-danger.btn-outline:hover {
color: #fff;
color: #fff !important;
}
.slideout-menu {
position: fixed;
@@ -23535,12 +23543,20 @@ a.link-danger:visited,
a.link-danger:hover {
color: #dd4b39;
}
.btn-primary:hover,
.btn-success:hover,
.btn-info:hover,
.btn-warning:hover,
.btn-primary,
.btn-success,
.btn-info,
.btn-warning,
.btn-primary.btn-outline:hover,
.btn-success.btn-outline:hover,
.btn-info.btn-outline:hover,
.btn-warning.btn-outline:hover,
.btn-danger.btn-outline:hover {
color: #fff;
color: #fff !important;
}
.slideout-menu {
position: fixed;

6
public/mix-manifest.json
View File

@@ -1,9 +1,9 @@
{
"/js/dist/all.js": "/js/dist/all.js?id=1c72002abd039fabdc1f3a9d9da62df4",
"/css/build/overrides.css": "/css/build/overrides.css?id=d23a6aaa17b789304c8822ea940a0ee9",
"/css/build/app.css": "/css/build/app.css?id=b58cc5dc5a0b3264f9c674a42f8f204f",
"/css/build/overrides.css": "/css/build/overrides.css?id=5d509df81d394b251a0127b29ff1e4d6",
"/css/build/app.css": "/css/build/app.css?id=17a32190ce763c7e1faad9c3f51ea1fd",
"/css/build/AdminLTE.css": "/css/build/AdminLTE.css?id=ee0ed88465dd878588ed044eefb67723",
"/css/dist/all.css": "/css/dist/all.css?id=3df38c2f640006ddb15da6e71f9a74eb",
"/css/dist/all.css": "/css/dist/all.css?id=d706be120045706b4100dc1ac3a41fa5",
"/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",

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

@@ -207,10 +207,24 @@ a.accordion-header {
color: #dd4b39;
}
.btn-primary.btn-outline:hover, .btn-success.btn-outline:hover, .btn-info.btn-outline:hover, .btn-warning.btn-outline:hover, .btn-danger.btn-outline:hover {
color: #fff;
.btn-primary:hover,
.btn-success:hover,
.btn-info:hover,
.btn-warning:hover,
.btn-primary,
.btn-success,
.btn-info,
.btn-warning,
.btn-primary.btn-outline:hover,
.btn-success.btn-outline:hover,
.btn-info.btn-outline:hover,
.btn-warning.btn-outline:hover,
.btn-danger.btn-outline:hover {
color: #fff !important;
}
.slideout-menu {
position: fixed;
top: 0;

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

@@ -46,6 +46,7 @@
--sidenav-text-hover-color: #fff;
--sidenav-text-nohover-color: #b8c7ce;
--search-highlight: #e9d15b;
}
[data-theme="light"] {
@@ -60,7 +61,8 @@
--color-bg: #ecf0f5;
--color-fg: #000000;
--header-color: #000000;
--link-color: {{ $snipeSettings->header_color }};
--link-color: hsl(from var(--main-theme-color) h s calc(l - 10));
--link-hover: hsl(from var(--link-color) h s calc(l - 10));
--nav-primary-font-color: #ffffff;
--tab-bottom-border: 1px solid var(--box-header-top-border-color);
--table-border-row-top: 1px solid #ecf0f5;
@@ -73,6 +75,9 @@
--text-legend-help: var(--text-help);
--text-success: #039516;
--text-warning: #da9113;
--main-theme-hover: hsl(from var(--main-theme-color) h s calc(l - 5));
--btn-theme-base: hsl(from var(--main-theme-color) h s calc(l - 5));
--btn-theme-hover: hsl(from var(--btn-theme-base) h s calc(l - 15));
}
@@ -88,7 +93,8 @@
--color-bg: #222222;
--color-fg: #ffffff;
--header-color: #ffffff;
--link-color: #ffffff;
--link-color: hsl(from var(--main-theme-color) h s calc(l + 20));
--link-hover: hsl(from var(--link-color) h s calc(l + 15));
--nav-primary-font-color: #ffffff;
--tab-bottom-border: 1px solid var(--box-header-top-border-color);
--table-border-row: 1px solid #656464;
@@ -101,9 +107,24 @@
--text-legend-help: #d6d6d6;
--text-success: #4ced61;
--text-warning: #f3a51f;
--main-theme-hover: hsl(from var(--main-theme-color) h s calc(l - 10));
--btn-theme-base: hsl(from var(--main-theme-color) h s calc(l + 5));
--btn-theme-hover: hsl(from var(--btn-theme-base) h s calc(l + 15));
}
.btn-theme {
background-color: var(--btn-theme-base);
color: contrast-color(var(--btn-theme-base)) !important;
border: 1px solid hsl(from var(--btn-theme-base) h s calc(l - 15)) !important;
}
.btn-theme:hover {
background-color: var(--btn-theme-hover);
color: contrast-color(var(--btn-theme-hover)) !important;
border: 1px solid hsl(from var(--btn-theme-base) h s calc(l - 15)) !important;
}
.dropdown-wrapper,
.input-group-addon,
.js-data-ajax,
@@ -248,18 +269,7 @@
color: var(--text-blue) !important;
}
a,
a:link,
a:visited
{
color: var(--link-color);
}
a:hover,
a:focus
{
color: hsl(from var(--main-theme-color) h s calc(l + 25)) !important;
}
label,
.icon-med,
@@ -414,7 +424,7 @@
.label-default
{
background-color: var(--main-theme-color);
color: var(--nav-primary-font-color) !important;
color: contrast-color(var(--main-theme-color)) !important;
}
@@ -433,39 +443,46 @@
color: contrast-color(var(--main-theme-color)) !important;
}
.dropdown-menu > li > a:hover,
.dropdown-menu > li > a:focus,
.dropdown-menu > li:hover,
.dropdown-menu > li:focus,
.btn-tableButton.active.focus,
.btn-tableButton.active:focus,
.btn-tableButton.active:hover,
.btn-tableButton:active.focus,
.btn-tableButton:active:focus,
.btn-tableButton:active:hover,
.dropdown-menu > .active > a:focus,
.dropdown-menu > .active > a:hover,
.dropdown-menu > .active > a:link,
.dropdown-menu > .active > a:visited,
.dropdown-menu > .active > a:hover,
.dropdown-menu > .active > a:focus,
.navbar-nav .open > a:hover,
.navbar-nav .open > a:focus,
.navbar-nav > li > a:hover,
.navbar-nav > li > a:focus,
.dropdown-menu > li > a:focus,
.dropdown-menu > li > a:hover,
.dropdown-menu > li:focus,
.dropdown-menu > li:hover,
.navbar-nav .open li.active > a:focus,
.navbar-nav .open li.active > a:hover,
.pagination > .active > a:hover,
.btn-primary:active:hover,
.btn-primary.active:hover,
.open > .dropdown-toggle.btn-primary:hover,
.btn-primary:active:focus,
.btn-primary.active:focus,
.open > .dropdown-toggle.btn-primary:focus,
.btn-primary:active.focus,
.btn-primary.active.focus,
.open > .dropdown-toggle.btn-primary.focus
.navbar-nav .open > a:focus,
.navbar-nav .open > a:hover,
.navbar-nav > li > a:focus,
.navbar-nav > li > a:hover,
.open > .dropdown-toggle.btn-tableButton.focus,
.open > .dropdown-toggle.btn-tableButton:focus,
.open > .dropdown-toggle.btn-tableButton:hover,
.pagination > .active > a:hover
{
background-color: hsl(from var(--main-theme-color) h s calc(l - 5));
background-color: var(--main-theme-hover);
border-color: var(--table-stripe-bg);
}
{
background-color: hsl(from var(--main-theme-color) h s calc(l - 5));
/*background-color: rgba(0,0,0,.15);*/
color: contrast-color(var(--main-theme-color)) !important;
/*color: var(--nav-primary-font-color) !important;*/
}
.bootstrap-table .fixed-table-toolbar li.dropdown-item-marker label
{
color: contrast-color(var(--main-theme-color)) !important;
}
.bootstrap-table .fixed-table-toolbar li.dropdown-item-marker label:hover
{
background-color: var(--main-theme-hover) !important;
color: contrast-color(var(--main-theme-hover)) !important;
}
@@ -483,55 +500,6 @@
color: contrast-color(var(--main-theme-color)) !important;
}
.btn:link,
.btn:hover,
.btn:visited,
.btn:focus
{
color: contrast-color(var(--main-theme-color)) !important;
}
.btn-primary,
.btn-primary:hover,
.btn-primary:active,
.btn-primary:active:hover,
.btn-primary:active:focus,
.btn-primary a,
.btn-primary a:link,
.btn-primary a:hover,
label.btn-primary:hover
{
background-color: hsl(from var(--main-theme-color) h s calc(l - 5));
border-color: hsl(from var(--main-theme-color) h s calc(l - 15));
color: contrast-color(var(--main-theme-color)) !important;
}
.btn-default,
.btn-default:hover,
.btn-default:active,
.btn-default:active:hover,
.btn-default:active:focus,
label.btn-default:hover
{
background-color: hsl(from var(--main-theme-color) h s calc(l - 5));
border-color: hsl(from var(--main-theme-color) h s calc(l - 15));
color: contrast-color(var(--main-theme-color)) !important;
}
.btn-default.active,
.btn-default.active:hover,
.btn-default.active:focus
{
background-color: hsl(from var(--main-theme-color) h s calc(l - 10));
border-color: hsl(from var(--main-theme-color) h s calc(l - 15));
color: contrast-color(var(--main-theme-color)) !important;
}
.navbar-nav > .notifications-menu > .dropdown-menu > li.header,
.navbar-nav > .messages-menu > .dropdown-menu > li.header,
@@ -617,9 +585,6 @@
color: var(--sidenav-text-hover-color) !important;
}
.breadcrumb-item a {
color: hsl(from var(--main-theme-color) h s calc(l - 5));
}
thead,
tbody,
@@ -842,7 +807,7 @@
<input type="hidden" name="topsearch" value="true" id="search">
</div>
<div class="col-xs-1">
<button type="submit" id="topSearchButton" class="btn btn-primary pull-right">
<button type="submit" id="topSearchButton" class="btn btn-theme pull-right">
<x-icon type="search" />
<span class="sr-only">{{ trans('general.search') }}</span>
</button>

2
resources/views/partials/asset-bulk-actions.blade.php
View File

@@ -42,6 +42,6 @@
@endif
</select>
<button class="btn btn-primary" id="{{ (isset($id_button)) ? $id_button : 'bulkAssetEditButton' }}" disabled>{{ trans('button.go') }}</button>
<button class="btn btn-theme" id="{{ (isset($id_button)) ? $id_button : 'bulkAssetEditButton' }}" disabled>{{ trans('button.go') }}</button>
</form>
</div>

2
resources/views/partials/bootstrap-table.blade.php
View File

@@ -72,7 +72,7 @@
// buttonsPrefix: "btn",
addrbar: {{ (config('session.bs_table_addrbar') == 'true') ? 'true' : 'false'}}, // deeplink search phrases, sorting, etc
advancedSearch: data_with_default('advanced-search', true),
buttonsClass: "tableButton tableButton btn-primary hidden-print",
buttonsClass: "tableButton tableButton btn-theme hidden-print",
buttonsOrder: [
'columns',
'btnAdd',

2
resources/views/partials/locations-bulk-actions.blade.php
View File

@@ -13,7 +13,7 @@
<select name="bulk_actions" class="form-control select2" style="width: 200px;" aria-label="bulk_actions">
<option value="delete">{{ trans('general.bulk_delete') }}</option>
</select>
<button class="btn btn-primary" id="bulkLocationsEditButton" disabled>{{ trans('button.go') }}</button>
<button class="btn btn-theme" id="bulkLocationsEditButton" disabled>{{ trans('button.go') }}</button>
</div>
</form>

2
resources/views/partials/models-bulk-actions.blade.php
View File

@@ -15,7 +15,7 @@
<option value="edit">{{ trans('general.bulk_edit') }}</option>
<option value="delete">{{ trans('general.bulk_delete') }}</option>
</select>
<button class="btn btn-primary" id="bulkModelsEditButton" disabled>{{ trans('button.go') }}</button>
<button class="btn btn-theme" id="bulkModelsEditButton" disabled>{{ trans('button.go') }}</button>
</div>
@endcan
@endif

2
resources/views/partials/users-bulk-actions.blade.php
View File

@@ -29,7 +29,7 @@
<option value="bulkpasswordreset">{{ trans('button.send_password_link') }}</option>
<option value="print">{{ trans('admin/users/general.print_assigned') }}</option>
</select>
<button class="btn btn-primary" id="bulkUserEditButton" disabled>{{ trans('button.go') }}</button>
<button class="btn btn-theme" id="bulkUserEditButton" disabled>{{ trans('button.go') }}</button>
</div>
</form>
@endif