Skip to content

update @tabler/core to 1.3.2 #19635

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

Open
wants to merge 7 commits into
base: main
Choose a base branch
from
+63 −141
Open

update @tabler/core to 1.3.2 #19635

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
0dc68d2
update @tabler/core to 1.2.0
orthagh Jun 2, 2025
c40f40b
fix headers in accordions
orthagh May 5, 2025
f877eac
update tabler to 1.3.x
orthagh Jun 2, 2025
62dd668
fix savedsearch button
orthagh Jun 2, 2025
96c8dee
fix dropdown items icon spacing
orthagh Jun 2, 2025
97e5847
fix bootstrap version
cedric-anne Jun 2, 2025
05bb5af
expose `bootstrap` in the global context
cedric-anne May 14, 2025
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
13 changes: 1 addition & 12 deletions css/includes/_base.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@
--tblr-bg-surface-tertiary: var(--tblr-gray-50);
--tblr-bg-surface-dark: color-mix(in srgb, var(--tblr-bg-surface), var(--tblr-dark) 1.5%);
--tblr-box-shadow-input: none;
--tblr-spacer: var(--tblr-spacer-3);
--glpi-tabs-bg: color-mix(in srgb, var(--tblr-bg-surface), black 1.5%);
--glpi-tabs-fg: var(--tblr-muted);
--glpi-tabs-border-color: var(--tblr-border-color);
Expand Down Expand Up @@ -178,18 +179,6 @@ body.in_modal {
}
}

.dropdown-item {
& > .fas:first-child,
& > .fa-solid:first-child,
& > .far:first-child,
& > .fa-regular:first-child,
& > .fab:first-child,
& > .fa-brands:first-child,
& > .ti:first-child {
margin-right: 0.5em;
}
}

.ti {
font-size: 1.25em;
text-align: left;
Expand Down
8 changes: 6 additions & 2 deletions css/includes/components/_global-menu.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,6 @@

.dropdown-item {
border-left: 3px solid rgba($color: #000, $alpha: 50%);
padding-left: 3.25rem; // FIXME: tabler 1.0.0-beta13 missing var $container-padding-x

&.active {
border-left-color: color-mix(in srgb, var(--tblr-primary), transparent 30%);
Expand All @@ -151,13 +150,18 @@
color: var(--tblr-primary);
background-color: rgba($color: #000, $alpha: 20%);
}


i {
margin-right: 0;
}
}
}
}
}

i {
margin-right: 0.7em;
margin-right: 0.4rem;
}

&:hover {
Expand Down
3 changes: 2 additions & 1 deletion lib/bundles/base.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,8 @@ require('jquery.fancytree/dist/modules/jquery.fancytree.persist');
import 'jquery.fancytree/dist/skin-awesome/ui.fancytree.css';

// Tabler
import '@tabler/core';
import {bootstrap} from '@tabler/core';
window.bootstrap = bootstrap;

// qTip2
require('qtip2');
Expand Down
2 changes: 1 addition & 1 deletion lib/bundles/tabler.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
$enable-negative-margins: true;
$link-hover-decoration: none;

@import "@tabler/core/src/scss/core";
@import "@tabler/core/scss/core";
@import "@fontsource/inter/scss/mixins";

$fontDir: "@fontsource/inter/files";
Expand Down
94 changes: 11 additions & 83 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,10 @@
"@fullcalendar/timegrid": "^4.4.2",
"@fullcalendar/timeline": "^4.4.3",
"@glpi-project/illustrations": "^0.5.3",
"@tabler/core": "^1.0.0",
"@tabler/core": "^1.3.2",
"@tabler/icons-webfont": "^3.33.0",
"animate.css": "^4.1.1",
"bootstrap": "^5.3.2",
"bootstrap": "^5.3.6",
"cropperjs": "^2.0.0",
"cytoscape": "^3.32.0",
"cytoscape-canvas": "^3.0.1",
Expand Down
48 changes: 24 additions & 24 deletions templates/components/itilobject/fields_panel.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,17 +46,17 @@
{% set main_show = headers_states['item-main'] is not defined or headers_states['item-main'] == "true" ? true : false %}
{{ call_plugin_hook(constant('Glpi\\Plugin\\Hooks::PRE_ITIL_INFO_SECTION'), {"item": item, 'options': params}) }}
<section class="accordion-item" aria-label="{{ item.getTypeName(1) }}">
<h2 class="accordion-header" id="heading-main-item">
<div class="accordion-header" id="heading-main-item">
<button class="accordion-button {{ main_show ? "" : "collapsed" }}" type="button" data-bs-toggle="collapse" data-bs-target="#item-main" aria-expanded="true" aria-controls="ticket-main">
<i class="ti ti-alert-circle me-1 item-icon"></i>
<i class="ti ti-alert-circle item-icon"></i>
<span class='status-recall'>
{{ item.getStatusIcon(item.fields['status'])|raw }}
</span>
<span class="item-title">
{{ item.getTypeName(1) }}
</span>
</button>
</h2>
</div>
<section id="item-main" class="accordion-collapse collapse {{ main_show ? "show" : "" }}" aria-labelledby="heading-main-item">
<div class="accordion-body row m-0 mt-n2">

Expand Down Expand Up @@ -268,9 +268,9 @@

{% set actors_show = headers_states['actors'] is not defined or headers_states['actors'] == "true" ? true : false %}
<section class="accordion-item" aria-label="{{ __('Actors') }}">
<h2 class="accordion-header" id="heading-actor" title="{{ __('Actors') }}" data-bs-toggle="tooltip">
<div class="accordion-header" id="heading-actor" title="{{ __('Actors') }}" data-bs-toggle="tooltip">
<button class="accordion-button {{ actors_show ? "" : "collapsed" }}" type="button" data-bs-toggle="collapse" data-bs-target="#actors" aria-expanded="true" aria-controls="actors">
<i class="ti ti-users me-1"></i>
<i class="ti ti-users"></i>
<span class="item-title">
{{ __('Actors') }}
</span>
Expand All @@ -281,7 +281,7 @@
{{ include('components/user/create_user.html.twig') }}
{% endif %}
</button>
</h2>
</div>
<div id="actors" class="accordion-collapse collapse {{ actors_show ? "show" : "" }}" aria-labelledby="heading-actor">
<div class="accordion-body accordion-actors row m-0 mt-n2">
{{ include('components/itilobject/actors/main.html.twig') }}
Expand All @@ -294,15 +294,15 @@
{% set notes_show = headers_states['notes'] is not defined or headers_states['notes'] == "true" ? true : (notes|length > 0) %}
{% if notes|length != 0 %}
<section class="accordion-item" aria-label="{{ __('Notes') }}">
<h2 class="accordion-header" id="notes-heading" title="{{ __('Notes') }}" data-bs-toggle="tooltip">
<div class="accordion-header" id="notes-heading" title="{{ __('Notes') }}" data-bs-toggle="tooltip">
<button class="accordion-button {{ notes_show ? "" : "collapsed" }}" type="button" data-bs-toggle="collapse" data-bs-target="#notes" aria-expanded="true" aria-controls="notes">
<i class="ti ti-notes me-1"></i>
<i class="ti ti-notes"></i>
<span class="item-title">
{{ __('Entity notes') }}
</span>
<span class="badge bg-secondary text-secondary-fg ms-2">{{ notes|length }}</span>
</button>
</h2>
</div>
<div id="notes" class="accordion-collapse collapse {{ notes_show ? "show" : "" }}" aria-labelledby="notes-heading">
<div class="accordion-body row m-0 mt-n2">
{% for note in notes %}
Expand All @@ -324,9 +324,9 @@
{% if item_commonitilobject is defined and item_commonitilobject is not null %}
{% set items_show = headers_states['items'] is not defined or headers_states['items'] == "true" ? true : false %}
<section class="accordion-item" aria-label="{{ _n('Item', 'Items', get_plural_number()) }}">
<h2 class="accordion-header" id="items-heading" title="{{ _n('Item', 'Items', get_plural_number()) }}" data-bs-toggle="tooltip">
<div class="accordion-header" id="items-heading" title="{{ _n('Item', 'Items', get_plural_number()) }}" data-bs-toggle="tooltip">
<button class="accordion-button {{ items_show ? "" : "collapsed" }}" type="button" data-bs-toggle="collapse" data-bs-target="#items" aria-expanded="true" aria-controls="items">
<i class="ti ti-package me-1"></i>
<i class="ti ti-package"></i>
<span class="item-title">
{{ _n('Item', 'Items', get_plural_number()) }}
</span>
Expand All @@ -335,7 +335,7 @@
<span class="required">*</span>
{% endif %}
</button>
</h2>
</div>
<div id="items" class="accordion-collapse collapse {{ items_show ? "show" : "" }}" aria-labelledby="items-heading">
<div class="accordion-body accordion-items row m-0 mt-n2">
{{ item_commonitilobject.itemAddForm(item, params|default({})|merge({entities_id: entities_id})) }}
Expand All @@ -353,17 +353,17 @@
{% set nb_la = (item.fields['slas_id_tto'] > 0 ? 1 : 0) + (item.fields['slas_id_ttr'] > 0 ? 1 : 0) + (item.fields['olas_id_tto'] > 0 ? 1 : 0) + (item.fields['olas_id_ttr'] > 0 ? 1 : 0) %}
{% set servicelevels_show = headers_states['service-levels'] is defined and headers_states['service-levels'] == "true" ? true : false %}
<section class="accordion-item" aria-label="{{ _n('Service level', 'Service levels', get_plural_number()) }}">
<h2 class="accordion-header" id="service-levels-heading" title="{{ _n('Service level', 'Service levels', get_plural_number()) }}" data-bs-toggle="tooltip">
<div class="accordion-header" id="service-levels-heading" title="{{ _n('Service level', 'Service levels', get_plural_number()) }}" data-bs-toggle="tooltip">
<button class="accordion-button {{ servicelevels_show ? "" : "collapsed" }}" type="button" data-bs-toggle="collapse" data-bs-target="#service-levels" aria-expanded="true" aria-controls="service-levels">
<i class="ti ti-alarm me-1"></i>
<i class="ti ti-alarm"></i>
<span class="item-title">
{{ _n('Service level', 'Service levels', get_plural_number()) }}
</span>
{% if nb_la > 0 %}
<span class="badge bg-secondary text-secondary-fg ms-2">{{ nb_la }}</span>
{% endif %}
</button>
</h2>
</div>
<div id="service-levels" class="accordion-collapse collapse {{ servicelevels_show ? "show" : "" }}" aria-labelledby="service-levels-heading">
<div class="accordion-body row m-0 mt-n2">
{{ la_content }}
Expand All @@ -389,17 +389,17 @@
{% endfor %}
{% set analysis_show = headers_states['analysis'] is defined and headers_states['analysis'] == "true" ? true : false %}
<section class="accordion-item" aria-label="{{ __('Analysis') }}">
<h2 class="accordion-header" id="analysis-heading" title="{{ __("Analysis") }}" data-bs-toggle="tooltip">
<div class="accordion-header" id="analysis-heading" title="{{ __("Analysis") }}" data-bs-toggle="tooltip">
<button class="accordion-button {{ analysis_show ? "" : "collapsed" }}" type="button" data-bs-toggle="collapse" data-bs-target="#analysis" aria-expanded="true" aria-controls="analysis">
<i class="ti ti-eyeglass me-1"></i>
<i class="ti ti-eyeglass"></i>
<span class="item-title">
{{ __("Analysis") }}
</span>
{% if nb_analysis > 0 %}
<span class="badge bg-secondary text-secondary-fg ms-2">{{ nb_analysis }}</span>
{% endif %}
</button>
</h2>
</div>
<div id="analysis" class="accordion-collapse collapse {{ analysis_show ? "show" : "" }}" aria-labelledby="analysis-heading">
<div class="accordion-body row m-0 mt-n2">
{% for analysis_field, label in analysis_fields %}
Expand Down Expand Up @@ -436,17 +436,17 @@

{% set plans_show = headers_states['plans'] is defined and headers_states['plans'] == "true" ? true : false %}
<section class="accordion-item" aria-label="{{ __('Plans') }}">
<h2 class="accordion-header" id="plans-heading" title="{{ __("Plans") }}" data-bs-toggle="tooltip">
<div class="accordion-header" id="plans-heading" title="{{ __("Plans") }}" data-bs-toggle="tooltip">
<button class="accordion-button {{ plans_show ? "" : "collapsed" }}" type="button" data-bs-toggle="collapse" data-bs-target="#plans" aria-expanded="true" aria-controls="plans">
<i class="ti ti-checkup-list me-1"></i>
<i class="ti ti-checkup-list"></i>
<span class="item-title">
{{ __("Plans") }}
</span>
{% if nb_plans > 0 %}
<span class="badge bg-secondary text-secondary-fg ms-2">{{ nb_plans }}</span>
{% endif %}
</button>
</h2>
</div>
<div id="plans" class="accordion-collapse collapse {{ plans_show ? "show" : "" }}" aria-labelledby="plans-heading">
<div class="accordion-body row m-0 mt-n2">
{% for plans_field, label in plans_fields %}
Expand All @@ -470,9 +470,9 @@
{% set linked_itilobjects_show = headers_states['linked_itilobjects'] is defined and headers_states['linked_itilobjects'] == "true" ? true : false %}
{% set nb_linked_itilobjects = item.isNewItem() ? 0 : call('CommonITILObject_CommonITILObject::countAllLinks', [item.getType(), item.getId()]) %}
<section class="accordion-item" aria-label="{{ 'CommonITILObject_CommonITILObject'|itemtype_name(nb_linked_itilobjects) }}">
<h2 class="accordion-header" id="linked_itilobjects-heading" title="{{ 'CommonITILObject_CommonITILObject'|itemtype_name(nb_linked_itilobjects) }}" data-bs-toggle="tooltip">
<div class="accordion-header" id="linked_itilobjects-heading" title="{{ 'CommonITILObject_CommonITILObject'|itemtype_name(nb_linked_itilobjects) }}" data-bs-toggle="tooltip">
<button class="accordion-button {{ linked_itilobjects_show ? "" : "collapsed" }}" type="button" data-bs-toggle="collapse" data-bs-target="#linked_itilobjects" aria-expanded="true" aria-controls="linked_itilobjects">
<i class="ti ti-link me-1"></i>
<i class="ti ti-link"></i>
{% if item.isNewItem() and (params['_link']['items_id_2'] ?? 0) > 0 %}
{% set nb_linked_itilobjects = 1 %}
{% endif %}
Expand All @@ -483,7 +483,7 @@
<span class="badge bg-secondary text-secondary-fg ms-2">{{ nb_linked_itilobjects }}</span>
{% endif %}
</button>
</h2>
</div>
<div id="linked_itilobjects" class="accordion-collapse collapse {{ linked_itilobjects_show ? "show" : "" }}" aria-labelledby="linked_itilobjects-heading">
<div class="accordion-body">
{{ include('components/itilobject/linked_itilobjects.html.twig') }}
Expand Down
2 changes: 1 addition & 1 deletion templates/components/notepad/form.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@
<button class="accordion-button collapsed d-flex align-self-center" type="button"
data-bs-toggle="collapse" data-bs-target="#{{ id }}"
aria-expanded="false" aria-controls="{{ id }}">
<i class="ti ti-notes me-1"></i>
<i class="ti ti-notes"></i>
{% set title = '#' ~ note['id'] ~ ' - ' ~ note['date_creation']|formatted_datetime %}
{% if note['date_mod'] != note['date_creation'] %}
{% set title = title ~ ' (' ~ __('Last update on %s')|format(note['date_mod']|formatted_datetime) ~ ')' %}
Expand Down
Loading
Loading