Skip to content

A free open source IT asset/license management system

Removed font-size override on tabs

snipe2633ec10dc1f
diff --git a/resources/views/blade/tabs/nav-item.blade.php b/resources/views/blade/tabs/nav-item.blade.php
index 66df072c65..803bc25d30 100644
--- a/resources/views/blade/tabs/nav-item.blade.php
+++ b/resources/views/blade/tabs/nav-item.blade.php
@@ -11,15 +11,27 @@
<a href="#{{ $name ?? 'info' }}" data-toggle="tab"{!! ($tooltip) ? ' data-tooltip="true" title="'.$tooltip.'"' : '' !!}>
@if ($icon)
- <i class="{{ $icon }}" style="font-size: 17px" aria-hidden="true"></i>
- @endif
- <span class="sr-only">
+ <span class="hidden-lg hidden-md">
+ <i class="{{ $icon }}" style="font-size: 18px" aria-hidden="true"></i>
+ </span>
+
+ <span class="hidden-xs hidden-sm">
+ <i class="{{ $icon }}" style="font-size: 16px" aria-hidden="true"></i>
+ </span>
+
+ <span class="sr-only">
{{ $label }}
</span>
+ @elseif ($label)
+ {{ $label }}
+ @endif
+
+
+
@if ($count > 0)
- <span class="badge">{{ number_format($count) }} </span>
+ <span class="badge">{{ number_format($count) }}</span>
@endif
</a>
diff --git a/resources/views/blade/tabs/pane.blade.php b/resources/views/blade/tabs/pane.blade.php
index 9a9542a360..6fd9685cdf 100644
--- a/resources/views/blade/tabs/pane.blade.php
+++ b/resources/views/blade/tabs/pane.blade.php
@@ -3,7 +3,7 @@
])
<!-- tab-pane -->
-<div id="{{ $name }}" {{ $attributes->merge(['class' => 'tab-pane']) }}>
+<div id="{{ $name }}" {{ $attributes->merge(['class' => 'tab-pane fade']) }} style="min-height: 400px !important;">
@if (isset($header))
<h2 class="box-title{{ (!isset($bulkactions)) ? 'pull-left' : '' }}">
diff --git a/resources/views/locations/view.blade.php b/resources/views/locations/view.blade.php
index 5e9db988e5..48ba45f2f0 100644
--- a/resources/views/locations/view.blade.php
+++ b/resources/views/locations/view.blade.php
@@ -21,7 +21,6 @@
class="active"
name="users"
icon="fa-solid fa-house-user fa-fw"
- icon_style="font-size: 17px"
label="{{ trans('general.users') }}"
count="{{ $location->users()->count() }}"
tooltip="{{ trans('general.users') }}"
@@ -33,7 +32,6 @@
<x-tabs.nav-item
name="assets"
icon="fa-solid fa-house-laptop fa-fw"
- icon_style="font-size: 17px"
label="{{ trans('general.users') }}"
count="{{ $location->assets()->AssetsForShow()->count() }}"
tooltip="{{ trans('admin/locations/message.current_location') }}"
@@ -42,7 +40,6 @@
<x-tabs.nav-item
name="rtd_assets"
icon="fa-solid fa-house-flag fa-fw"
- icon_style="font-size: 17px"
label="{{ trans('admin/hardware/form.default_location') }}"
count="{{ $location->rtd_assets()->AssetsForShow()->count() }}"
tooltip="{{ trans('admin/hardware/form.default_location') }}"
@@ -51,7 +48,6 @@
<x-tabs.nav-item
name="assets_assigned"
icon="fas fa-barcode fa-fw"
- icon_style="font-size: 17px"
label="{{ trans('admin/locations/message.assigned_assets') }}"
count="{{ $location->assignedAssets()->AssetsForShow()->count() }}"
tooltip="{{ trans('admin/locations/message.assigned_assets') }}"
@@ -64,7 +60,6 @@
<x-tabs.nav-item
name="accessories"
icon="far fa-keyboard fa-fw"
- icon_style="font-size: 17px"
label="{{ trans('general.accessories') }}"
count="{{ $location->accessories()->count() }}"
tooltip="{{ trans('general.accessories') }}"
@@ -73,7 +68,6 @@
<x-tabs.nav-item
name="accessories_assigned"
icon="fas fa-keyboard fa-fw"
- icon_style="font-size: 17px"
label="{{ trans('general.accessories_assigned') }}"
count="{{ $location->assignedAccessories()->count() }}"
tooltip="{{ trans('general.accessories_assigned') }}"
@@ -87,7 +81,6 @@
<x-tabs.nav-item
name="consumables"
icon="fas fa-tint fa-fw"
- icon_style="font-size: 17px"
label="{{ trans('general.consumables') }}"
count="{{ $location->consumables()->count() }}"
tooltip="{{ trans('general.consumables') }}"
@@ -100,7 +93,6 @@
<x-tabs.nav-item
name="components"
icon="fas fa-hdd fa-fw"
- icon_style="font-size: 17px"
label="{{ trans('general.components') }}"
count="{{ $location->components->count() }}"
tooltip="{{ trans('general.components') }}"
@@ -112,7 +104,6 @@
<x-tabs.nav-item
name="child_locations"
icon="fa-solid fa-city fa-fw"
- icon_style="font-size: 17px"
label="{{ trans('general.child_locations') }}"
count="{{ $location->children()->count() }}"
tooltip="{{ trans('general.child_locations') }}"
@@ -121,7 +112,6 @@
<x-tabs.nav-item
name="files"
icon="fa-solid fa-file-contract fa-fw"
- icon_style="font-size: 17px"
label="{{ trans('general.files') }}"
count="{{ $location->uploads()->count() }}"
tooltip="{{ trans('general.files') }}"
@@ -130,7 +120,6 @@
<x-tabs.nav-item
name="history"
icon="fa-solid fa-clock-rotate-left fa-fw"
- icon_style="font-size: 17px"
label="{{ trans('general.history') }}"
tooltip="{{ trans('general.history') }}"
/>
@@ -145,7 +134,7 @@
<!-- start users tab pane -->
@can('view', \App\Models\User::class)
- <x-tabs.pane name="users" class="active">
+ <x-tabs.pane name="users" class="in active">
<x-slot:header>
{{ trans('general.users') }}
</x-slot:header>