A free open source IT asset/license management system
Tweaked label + style for table labels (say that 100 times fast)
snipebf525f7213f8
diff --git a/resources/views/layouts/default.blade.php b/resources/views/layouts/default.blade.phpindex c6a38cd196..895e4255f3 100644--- a/resources/views/layouts/default.blade.php+++ b/resources/views/layouts/default.blade.php@@ -44,6 +44,7 @@:root {color-scheme: light dark;+ --color-bg: light-dark(#ecf0f5, #222222);--btn-theme-hover-text-color: {{ $nav_link_color ?? 'light-dark(hsl(from var(--main-theme-color) h s calc(l - 10)),hsl(from var(--main-theme-color) h s calc(l - 10)))' }};--btn-theme-hover: {{ $nav_link_color ?? 'light-dark(hsl(from var(--main-theme-color) h s calc(l - 10)),hsl(from var(--main-theme-color) h s calc(l - 10)))' }};--btn-theme-text-color: {{ $nav_link_color ?? 'light-dark(hsl(from var(--main-theme-color) h s calc(l + 10)),hsl(from var(--main-theme-color) h s calc(l - 10)))' }};@@ -69,6 +70,10 @@--text-success: light-dark(#039516,#4ced61);--text-warning: light-dark(#da9113,#f3a51f);--input-border-color: light-dark(#d2d6de,#656464);+ --default-label-link-bg: var(--color-bg);+ --default-label-link-text: light-dark({{ $link_light_color ?? '#296282' }}, {{ $link_dark_color ?? '#5fa4cc' }});+ --default-label-link-border: 1px solid light-dark(#b8c7ce, #494747);+}[data-theme="light"] {@@ -84,7 +89,6 @@--btn-theme-hover: var(--main-theme-hover);--callout-bg-color: var(--box-header-bottom-border-color);--callout-left-border: var(--box-header-top-border-color);- --color-bg: #ecf0f5;--header-color: #000000;--input-group-bg: hsl(from var(--box-bg) h s calc(l - 5));--input-group-fg: hsl(from var(--input-group-bg) h s calc(l - 50));@@ -109,7 +113,6 @@--btn-theme-hover: var(--main-theme-hover);--callout-bg-color: var(--box-header-top-border-color);--callout-left-border: #323131;- --color-bg: #222222;--header-color: #ffffff;--input-group-bg: hsl(from var(--box-bg) h s calc(l + 10));--input-group-fg: hsl(from var(--input-group-bg) h s calc(l + 50));@@ -579,6 +582,34 @@color: var(--nav-primary-text-color) !important;}+ .label-light {+ background-color: var(--default-label-link-bg) !important;+ color: var(--color-fg) !important;+ font-size: 12px !important;+ font-weight: normal !important;+ line-height: 25px;+ border: var(--default-label-link-border);++ }++ a.label-light {+ background-color: var(--default-label-link-bg) !important;+ color: var(--link-color) !important;+ font-size: 12px !important;+ font-weight: normal !important;+ line-height: 25px;+ border: var(--default-label-link-border);+ }++ a.label-light:hover {+ background-color: var(--default-label-link-bg) !important;+ color: var(--link-hover) !important;+ font-size: 12px !important;+ font-weight: normal !important;+ line-height: 25px;+ border: var(--default-label-link-border);+ }+.dropdown-menu > li > a,.dropdown-menu > li > a:link,diff --git a/resources/views/partials/bootstrap-table.blade.php b/resources/views/partials/bootstrap-table.blade.phpindex 27ff9ba888..585d53c6ce 100644--- a/resources/views/partials/bootstrap-table.blade.php+++ b/resources/views/partials/bootstrap-table.blade.php@@ -1977,7 +1977,7 @@if (value) {var groups = '';for (var index in value.rows) {- groups += '<a href="{{ config('app.url') }}/admin/groups/' + value.rows[index].id + '" class="label label-default">' + value.rows[index].name + '</a> ';+ groups += '<a href="{{ config('app.url') }}/admin/groups/' + value.rows[index].id + '" class="label label-light">' + value.rows[index].name + '</a> ';}return groups;}@@ -2154,6 +2154,16 @@}}+ function companiesArrayLinkFormatter(value, row) {+ if (!value || !value.length) {+ return '';+ }+ return value.map(function (c) {+ var icon = (c.tag_color) ? '<i class="fa-solid fa-square" style="color: ' + c.tag_color + ';" aria-hidden="true"></i> ' : '';+ return '<a href="{{ config('app.url') }}/companies/' + c.id + '" class="label label-light">' + icon + c.name + '</a></span>';+ }).join(' ');+ }+function locationCompanyObjFilterFormatter(value, row) {if (value) {return '<a href="{{ url('/') }}/locations/?company_id=' + row.company.id + '">' + row.company.name + '</a>';