From 9c9d574273a02ffa1810710232f0bbf27b758263 Mon Sep 17 00:00:00 2001 From: Vincent Vanwaelscappel Date: Wed, 30 Jul 2025 18:47:30 +0200 Subject: [PATCH] wip #7673 @0.5 --- app/Fluidbook/Compiler/Compiler.php | 2 +- resources/views/extranet/totals.blade.php | 2 +- .../fields/fluidbook_composition.blade.php | 15 +- resources/views/fluidbook_stats/API.blade.php | 203 +++++++++--------- .../views/fluidbook_stats/stats.blade.php | 14 +- resources/views/team/leave/calendar.blade.php | 10 +- .../crud/inc/datatables_logic.blade.php | 4 +- .../crud/inc/export_buttons.blade.php | 41 ++-- 8 files changed, 143 insertions(+), 148 deletions(-) diff --git a/app/Fluidbook/Compiler/Compiler.php b/app/Fluidbook/Compiler/Compiler.php index cfdef504b..e98246be9 100644 --- a/app/Fluidbook/Compiler/Compiler.php +++ b/app/Fluidbook/Compiler/Compiler.php @@ -1962,7 +1962,7 @@ class Compiler extends Base implements CompilerInterface, IVirtualDirectoryError $menuColor = new Color($this->themeSettings->couleurB); $menuColor->setAlpha(1); $menuTextColor = Color::colorToCSS($this->themeSettings->subTextColor); - $menuBreakpoint = empty($this->fluidbookSettings->menuBreakpoint) ? '1023px' : $this->fluidbookSettings->menuBreakpoint; + $menuBreakpoint = empty($this->fluidbookSettings->menuBreakpoint) ? '1023px' : (is_int($this->fluidbookSettings->menuBreakpoint) ? $this->fluidbookSettings->menuBreakpoint . 'px' : $this->fluidbookSettings->menuBreakpoint); $this->lessVariables['menu-breakpoint'] = $menuBreakpoint; $this->lessVariables['menu-background'] = $menuColor->toCSS(); diff --git a/resources/views/extranet/totals.blade.php b/resources/views/extranet/totals.blade.php index 3ff814ba8..4b5a63061 100644 --- a/resources/views/extranet/totals.blade.php +++ b/resources/views/extranet/totals.blade.php @@ -155,7 +155,7 @@ @push('after_scripts') {{-- Charting library --}} - + - - - - @endpush + + + @push('crud_fields_styles') + href="/cdnproxy/cdnjs.cloudflare.com/ajax/libs/jquery-contextmenu/2.9.2/jquery.contextMenu.min.css"/> - - - - - + + + + + - + + diff --git a/resources/views/vendor/backpack/crud/inc/export_buttons.blade.php b/resources/views/vendor/backpack/crud/inc/export_buttons.blade.php index a5a6b7b92..464949a83 100644 --- a/resources/views/vendor/backpack/crud/inc/export_buttons.blade.php +++ b/resources/views/vendor/backpack/crud/inc/export_buttons.blade.php @@ -1,12 +1,12 @@ @if ($crud->exportButtons()) - - - - - - - - + + + + + + + +