Skip to content

Removed font-size override on tabs #18479

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
snipe merged 1 commit into from
Jan 23, 2026
Merged

Removed font-size override on tabs #18479

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 16 additions & 4 deletions resources/views/blade/tabs/nav-item.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion resources/views/blade/tabs/pane.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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' : '' }}">
Expand Down
13 changes: 1 addition & 12 deletions resources/views/locations/view.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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') }}"
Expand All @@ -33,7 +32,6 @@ class="active"
<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') }}"
Expand All @@ -42,7 +40,6 @@ class="active"
<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') }}"
Expand All @@ -51,7 +48,6 @@ class="active"
<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') }}"
Expand All @@ -64,7 +60,6 @@ class="active"
<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') }}"
Expand All @@ -73,7 +68,6 @@ class="active"
<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') }}"
Expand All @@ -87,7 +81,6 @@ class="active"
<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') }}"
Expand All @@ -100,7 +93,6 @@ class="active"
<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') }}"
Expand All @@ -112,7 +104,6 @@ class="active"
<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') }}"
Expand All @@ -121,7 +112,6 @@ class="active"
<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') }}"
Expand All @@ -130,7 +120,6 @@ class="active"
<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') }}"
/>
Expand All @@ -145,7 +134,7 @@ class="active"

<!-- 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>
Expand Down
Loading