From: Vincent Vanwaelscappel Date: Thu, 27 Mar 2025 14:22:40 +0000 (+0100) Subject: wait #7419 @0:20 X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=db970b9d677280f9a76d9d96554ee6f21b270bd2;p=fluidbook-toolbox.git wait #7419 @0:20 --- diff --git a/.docker/config/mariadb/connections.cnf b/.docker/config/mariadb/connections.cnf index 801de4e20..75c7ac47b 100644 --- a/.docker/config/mariadb/connections.cnf +++ b/.docker/config/mariadb/connections.cnf @@ -1,2 +1,2 @@ [mariadb] -max_connections = 64 +max_connections = 512 diff --git a/.docker/syncprodtodev.exclude b/.docker/syncprodtodev.exclude index dd6248a04..16d237594 100644 --- a/.docker/syncprodtodev.exclude +++ b/.docker/syncprodtodev.exclude @@ -14,4 +14,3 @@ app/public/elearningpackage app/public/fluidbookcollection app/public/quiz protected/youtube - diff --git a/app/Fields/FluidbookFont.php b/app/Fields/FluidbookFont.php index 165e01e0c..5ea0de031 100644 --- a/app/Fields/FluidbookFont.php +++ b/app/Fields/FluidbookFont.php @@ -6,8 +6,6 @@ use Cubist\Backpack\Magic\Fields\SelectFromArray; class FluidbookFont extends SelectFromArray { - - public function getOptions() { $fonts = self::getAvailableFonts(); @@ -25,6 +23,7 @@ class FluidbookFont extends SelectFromArray 'Montserrat' => ['fluidbook_label' => 'Montserrat', 'font_family' => 'Montserrat', 'font_kit' => 'Montserrat', 'fontkit_download_name' => 'montserrat'], 'Metropolis' => ['fluidbook_label' => 'Metropolis', 'font_family' => 'Metropolis', 'font_kit' => 'Metropolis'], 'SourceSans' => ['fluidbook_label' => 'Source Sans', 'font_family' => '"Source Sans 3"', 'font_kit' => 'SourceSans', 'fontkit_download_name' => 'source-sans-3'], + 'Outfit' => ['fluidbook_label' => 'Outfit', 'font_family' => 'Outfit', 'font_kit' => 'Outfit', 'fontkit_download_name' => 'outfit'], 'Arial' => ['fluidbook_label' => 'Arial, Helvetica, sans-serif (' . __('police système') . ')', 'font_family' => 'Arial, Helvetica, sans-serif', 'font_kit' => false], 'sans-serif' => ['fluidbook_label' => __('Police système sans-serif'), 'font_family' => 'sans-serif', 'font_kit' => false], ]; diff --git a/resources/fluidbookpublication/fonts/Montserrat/font.css b/resources/fluidbookpublication/fonts/Montserrat/font.css index b2aca4794..fae807082 100644 --- a/resources/fluidbookpublication/fonts/Montserrat/font.css +++ b/resources/fluidbookpublication/fonts/Montserrat/font.css @@ -1,29 +1,29 @@ @font-face { font-family: 'Montserrat'; font-style: normal; - font-weight: 700; - src: url('700.woff2') format('woff2'); + font-weight: 800; + src: url('800.woff2') format('woff2'); } @font-face { font-family: 'Montserrat'; font-style: normal; - font-weight: 800; - src: url('800.woff2') format('woff2'); + font-weight: 700; + src: url('700.woff2') format('woff2'); } @font-face { font-family: 'Montserrat'; - font-style: normal; - font-weight: 100; - src: url('100.woff2') format('woff2'); + font-style: italic; + font-weight: 300; + src: url('300italic.woff2') format('woff2'); } @font-face { font-family: 'Montserrat'; font-style: italic; - font-weight: 800; - src: url('800italic.woff2') format('woff2'); + font-weight: 900; + src: url('900italic.woff2') format('woff2'); } @font-face { @@ -36,85 +36,78 @@ @font-face { font-family: 'Montserrat'; font-style: normal; - font-weight: 500; - src: url('500.woff2') format('woff2'); + font-weight: 300; + src: url('300.woff2') format('woff2'); } @font-face { font-family: 'Montserrat'; - font-style: normal; - font-weight: 900; - src: url('900.woff2') format('woff2'); + font-style: italic; + font-weight: 200; + src: url('200italic.woff2') format('woff2'); } @font-face { font-family: 'Montserrat'; font-style: normal; - font-weight: 300; - src: url('300.woff2') format('woff2'); + font-weight: 500; + src: url('500.woff2') format('woff2'); } @font-face { font-family: 'Montserrat'; - font-style: italic; - font-weight: 400; - src: url('italic.woff2') format('woff2'); + font-style: normal; + font-weight: 600; + src: url('600.woff2') format('woff2'); } @font-face { font-family: 'Montserrat'; font-style: italic; - font-weight: 700; - src: url('700italic.woff2') format('woff2'); + font-weight: 100; + src: url('100italic.woff2') format('woff2'); } @font-face { font-family: 'Montserrat'; font-style: italic; - font-weight: 200; - src: url('200italic.woff2') format('woff2'); + font-weight: 800; + src: url('800italic.woff2') format('woff2'); } @font-face { font-family: 'Montserrat'; font-style: italic; - font-weight: 100; - src: url('100italic.woff2') format('woff2'); -} - -@font-face { - font-family: 'Montserrat'; - font-style: normal; - font-weight: 600; - src: url('600.woff2') format('woff2'); + font-weight: 500; + src: url('500italic.woff2') format('woff2'); } @font-face { font-family: 'Montserrat'; font-style: italic; - font-weight: 300; - src: url('300italic.woff2') format('woff2'); + font-weight: 600; + src: url('600italic.woff2') format('woff2'); } @font-face { font-family: 'Montserrat'; font-style: italic; - font-weight: 500; - src: url('500italic.woff2') format('woff2'); + font-weight: 400; + src: url('italic.woff2') format('woff2'); } @font-face { font-family: 'Montserrat'; - font-style: italic; + font-style: normal; font-weight: 900; - src: url('900italic.woff2') format('woff2'); + src: url('900.woff2') format('woff2'); } @font-face { font-family: 'Montserrat'; - font-style: italic; - font-weight: 600; - src: url('600italic.woff2') format('woff2'); + font-style: normal; + font-weight: 100; + src: url('100.woff2') format('woff2'); } @font-face { @@ -124,3 +117,10 @@ src: url('regular.woff2') format('woff2'); } +@font-face { + font-family: 'Montserrat'; + font-style: italic; + font-weight: 700; + src: url('700italic.woff2') format('woff2'); +} + diff --git a/resources/fluidbookpublication/fonts/OpenSans/font.css b/resources/fluidbookpublication/fonts/OpenSans/font.css index 0a6cff84b..8c652b42a 100644 --- a/resources/fluidbookpublication/fonts/OpenSans/font.css +++ b/resources/fluidbookpublication/fonts/OpenSans/font.css @@ -1,8 +1,22 @@ @font-face { font-family: 'Open Sans'; font-style: italic; - font-weight: 700; - src: url('700italic.woff2') format('woff2'); + font-weight: 800; + src: url('800italic.woff2') format('woff2'); +} + +@font-face { + font-family: 'Open Sans'; + font-style: normal; + font-weight: 600; + src: url('600.woff2') format('woff2'); +} + +@font-face { + font-family: 'Open Sans'; + font-style: italic; + font-weight: 600; + src: url('600italic.woff2') format('woff2'); } @font-face { @@ -15,15 +29,15 @@ @font-face { font-family: 'Open Sans'; font-style: normal; - font-weight: 500; - src: url('500.woff2') format('woff2'); + font-weight: 300; + src: url('300.woff2') format('woff2'); } @font-face { font-family: 'Open Sans'; font-style: italic; - font-weight: 800; - src: url('800italic.woff2') format('woff2'); + font-weight: 500; + src: url('500italic.woff2') format('woff2'); } @font-face { @@ -36,36 +50,29 @@ @font-face { font-family: 'Open Sans'; font-style: normal; - font-weight: 300; - src: url('300.woff2') format('woff2'); + font-weight: 500; + src: url('500.woff2') format('woff2'); } @font-face { font-family: 'Open Sans'; font-style: normal; - font-weight: 800; - src: url('800.woff2') format('woff2'); + font-weight: 700; + src: url('700.woff2') format('woff2'); } @font-face { font-family: 'Open Sans'; - font-style: italic; - font-weight: 600; - src: url('600italic.woff2') format('woff2'); + font-style: normal; + font-weight: 800; + src: url('800.woff2') format('woff2'); } @font-face { font-family: 'Open Sans'; font-style: italic; - font-weight: 500; - src: url('500italic.woff2') format('woff2'); -} - -@font-face { - font-family: 'Open Sans'; - font-style: normal; - font-weight: 600; - src: url('600.woff2') format('woff2'); + font-weight: 700; + src: url('700italic.woff2') format('woff2'); } @font-face { @@ -75,10 +82,3 @@ src: url('italic.woff2') format('woff2'); } -@font-face { - font-family: 'Open Sans'; - font-style: normal; - font-weight: 700; - src: url('700.woff2') format('woff2'); -} - diff --git a/resources/fluidbookpublication/fonts/Outfit/100.woff2 b/resources/fluidbookpublication/fonts/Outfit/100.woff2 new file mode 100644 index 000000000..e67deb5e2 Binary files /dev/null and b/resources/fluidbookpublication/fonts/Outfit/100.woff2 differ diff --git a/resources/fluidbookpublication/fonts/Outfit/200.woff2 b/resources/fluidbookpublication/fonts/Outfit/200.woff2 new file mode 100644 index 000000000..a0cea95c4 Binary files /dev/null and b/resources/fluidbookpublication/fonts/Outfit/200.woff2 differ diff --git a/resources/fluidbookpublication/fonts/Outfit/300.woff2 b/resources/fluidbookpublication/fonts/Outfit/300.woff2 new file mode 100644 index 000000000..488378e33 Binary files /dev/null and b/resources/fluidbookpublication/fonts/Outfit/300.woff2 differ diff --git a/resources/fluidbookpublication/fonts/Outfit/500.woff2 b/resources/fluidbookpublication/fonts/Outfit/500.woff2 new file mode 100644 index 000000000..275c5aa98 Binary files /dev/null and b/resources/fluidbookpublication/fonts/Outfit/500.woff2 differ diff --git a/resources/fluidbookpublication/fonts/Outfit/600.woff2 b/resources/fluidbookpublication/fonts/Outfit/600.woff2 new file mode 100644 index 000000000..2ec2627e4 Binary files /dev/null and b/resources/fluidbookpublication/fonts/Outfit/600.woff2 differ diff --git a/resources/fluidbookpublication/fonts/Outfit/700.woff2 b/resources/fluidbookpublication/fonts/Outfit/700.woff2 new file mode 100644 index 000000000..130e126cd Binary files /dev/null and b/resources/fluidbookpublication/fonts/Outfit/700.woff2 differ diff --git a/resources/fluidbookpublication/fonts/Outfit/800.woff2 b/resources/fluidbookpublication/fonts/Outfit/800.woff2 new file mode 100644 index 000000000..19c864810 Binary files /dev/null and b/resources/fluidbookpublication/fonts/Outfit/800.woff2 differ diff --git a/resources/fluidbookpublication/fonts/Outfit/900.woff2 b/resources/fluidbookpublication/fonts/Outfit/900.woff2 new file mode 100644 index 000000000..01a226d7f Binary files /dev/null and b/resources/fluidbookpublication/fonts/Outfit/900.woff2 differ diff --git a/resources/fluidbookpublication/fonts/Outfit/font.css b/resources/fluidbookpublication/fonts/Outfit/font.css new file mode 100644 index 000000000..e58218fb2 --- /dev/null +++ b/resources/fluidbookpublication/fonts/Outfit/font.css @@ -0,0 +1,63 @@ +@font-face { + font-family: 'Outfit'; + font-style: normal; + font-weight: 900; + src: url('900.woff2') format('woff2'); +} + +@font-face { + font-family: 'Outfit'; + font-style: normal; + font-weight: 400; + src: url('regular.woff2') format('woff2'); +} + +@font-face { + font-family: 'Outfit'; + font-style: normal; + font-weight: 200; + src: url('200.woff2') format('woff2'); +} + +@font-face { + font-family: 'Outfit'; + font-style: normal; + font-weight: 700; + src: url('700.woff2') format('woff2'); +} + +@font-face { + font-family: 'Outfit'; + font-style: normal; + font-weight: 500; + src: url('500.woff2') format('woff2'); +} + +@font-face { + font-family: 'Outfit'; + font-style: normal; + font-weight: 600; + src: url('600.woff2') format('woff2'); +} + +@font-face { + font-family: 'Outfit'; + font-style: normal; + font-weight: 800; + src: url('800.woff2') format('woff2'); +} + +@font-face { + font-family: 'Outfit'; + font-style: normal; + font-weight: 300; + src: url('300.woff2') format('woff2'); +} + +@font-face { + font-family: 'Outfit'; + font-style: normal; + font-weight: 100; + src: url('100.woff2') format('woff2'); +} + diff --git a/resources/fluidbookpublication/fonts/Outfit/regular.woff2 b/resources/fluidbookpublication/fonts/Outfit/regular.woff2 new file mode 100644 index 000000000..b25031e4d Binary files /dev/null and b/resources/fluidbookpublication/fonts/Outfit/regular.woff2 differ diff --git a/resources/fluidbookpublication/fonts/SourceSans/200.woff2 b/resources/fluidbookpublication/fonts/SourceSans/200.woff2 index ed1d3fdd4..54e3533c5 100644 Binary files a/resources/fluidbookpublication/fonts/SourceSans/200.woff2 and b/resources/fluidbookpublication/fonts/SourceSans/200.woff2 differ diff --git a/resources/fluidbookpublication/fonts/SourceSans/200italic.woff2 b/resources/fluidbookpublication/fonts/SourceSans/200italic.woff2 index a2a6357b8..524640f1c 100644 Binary files a/resources/fluidbookpublication/fonts/SourceSans/200italic.woff2 and b/resources/fluidbookpublication/fonts/SourceSans/200italic.woff2 differ diff --git a/resources/fluidbookpublication/fonts/SourceSans/300.woff2 b/resources/fluidbookpublication/fonts/SourceSans/300.woff2 index 030bb9847..d225cb713 100644 Binary files a/resources/fluidbookpublication/fonts/SourceSans/300.woff2 and b/resources/fluidbookpublication/fonts/SourceSans/300.woff2 differ diff --git a/resources/fluidbookpublication/fonts/SourceSans/300italic.woff2 b/resources/fluidbookpublication/fonts/SourceSans/300italic.woff2 index 671890674..9d983d75c 100644 Binary files a/resources/fluidbookpublication/fonts/SourceSans/300italic.woff2 and b/resources/fluidbookpublication/fonts/SourceSans/300italic.woff2 differ diff --git a/resources/fluidbookpublication/fonts/SourceSans/500.woff2 b/resources/fluidbookpublication/fonts/SourceSans/500.woff2 index a3024033a..2add4a127 100644 Binary files a/resources/fluidbookpublication/fonts/SourceSans/500.woff2 and b/resources/fluidbookpublication/fonts/SourceSans/500.woff2 differ diff --git a/resources/fluidbookpublication/fonts/SourceSans/500italic.woff2 b/resources/fluidbookpublication/fonts/SourceSans/500italic.woff2 index 4c5fa50f2..196d2e496 100644 Binary files a/resources/fluidbookpublication/fonts/SourceSans/500italic.woff2 and b/resources/fluidbookpublication/fonts/SourceSans/500italic.woff2 differ diff --git a/resources/fluidbookpublication/fonts/SourceSans/600.woff2 b/resources/fluidbookpublication/fonts/SourceSans/600.woff2 index 8366ffda1..c7640e163 100644 Binary files a/resources/fluidbookpublication/fonts/SourceSans/600.woff2 and b/resources/fluidbookpublication/fonts/SourceSans/600.woff2 differ diff --git a/resources/fluidbookpublication/fonts/SourceSans/600italic.woff2 b/resources/fluidbookpublication/fonts/SourceSans/600italic.woff2 index 46294cd7b..012b5ccb3 100644 Binary files a/resources/fluidbookpublication/fonts/SourceSans/600italic.woff2 and b/resources/fluidbookpublication/fonts/SourceSans/600italic.woff2 differ diff --git a/resources/fluidbookpublication/fonts/SourceSans/700.woff2 b/resources/fluidbookpublication/fonts/SourceSans/700.woff2 index 574f7c02e..fdc86281a 100644 Binary files a/resources/fluidbookpublication/fonts/SourceSans/700.woff2 and b/resources/fluidbookpublication/fonts/SourceSans/700.woff2 differ diff --git a/resources/fluidbookpublication/fonts/SourceSans/700italic.woff2 b/resources/fluidbookpublication/fonts/SourceSans/700italic.woff2 index 7d2d30846..dbaba7d67 100644 Binary files a/resources/fluidbookpublication/fonts/SourceSans/700italic.woff2 and b/resources/fluidbookpublication/fonts/SourceSans/700italic.woff2 differ diff --git a/resources/fluidbookpublication/fonts/SourceSans/800.woff2 b/resources/fluidbookpublication/fonts/SourceSans/800.woff2 index 91239edbf..e51cb8c78 100644 Binary files a/resources/fluidbookpublication/fonts/SourceSans/800.woff2 and b/resources/fluidbookpublication/fonts/SourceSans/800.woff2 differ diff --git a/resources/fluidbookpublication/fonts/SourceSans/800italic.woff2 b/resources/fluidbookpublication/fonts/SourceSans/800italic.woff2 index edcb1163b..363568968 100644 Binary files a/resources/fluidbookpublication/fonts/SourceSans/800italic.woff2 and b/resources/fluidbookpublication/fonts/SourceSans/800italic.woff2 differ diff --git a/resources/fluidbookpublication/fonts/SourceSans/900.woff2 b/resources/fluidbookpublication/fonts/SourceSans/900.woff2 index 3be55dd4f..df1a248c2 100644 Binary files a/resources/fluidbookpublication/fonts/SourceSans/900.woff2 and b/resources/fluidbookpublication/fonts/SourceSans/900.woff2 differ diff --git a/resources/fluidbookpublication/fonts/SourceSans/900italic.woff2 b/resources/fluidbookpublication/fonts/SourceSans/900italic.woff2 index 68009469e..1ebbac00a 100644 Binary files a/resources/fluidbookpublication/fonts/SourceSans/900italic.woff2 and b/resources/fluidbookpublication/fonts/SourceSans/900italic.woff2 differ diff --git a/resources/fluidbookpublication/fonts/SourceSans/font.css b/resources/fluidbookpublication/fonts/SourceSans/font.css index 208d96fd4..01e83b559 100644 --- a/resources/fluidbookpublication/fonts/SourceSans/font.css +++ b/resources/fluidbookpublication/fonts/SourceSans/font.css @@ -1,29 +1,36 @@ @font-face { font-family: 'Source Sans 3'; - font-style: normal; - font-weight: 600; - src: url('600.woff2') format('woff2'); + font-style: italic; + font-weight: 500; + src: url('500italic.woff2') format('woff2'); } @font-face { font-family: 'Source Sans 3'; - font-style: normal; + font-style: italic; font-weight: 200; - src: url('200.woff2') format('woff2'); + src: url('200italic.woff2') format('woff2'); } @font-face { font-family: 'Source Sans 3'; - font-style: italic; - font-weight: 700; - src: url('700italic.woff2') format('woff2'); + font-style: normal; + font-weight: 300; + src: url('300.woff2') format('woff2'); } @font-face { font-family: 'Source Sans 3'; font-style: normal; + font-weight: 900; + src: url('900.woff2') format('woff2'); +} + +@font-face { + font-family: 'Source Sans 3'; + font-style: italic; font-weight: 800; - src: url('800.woff2') format('woff2'); + src: url('800italic.woff2') format('woff2'); } @font-face { @@ -33,11 +40,18 @@ src: url('600italic.woff2') format('woff2'); } +@font-face { + font-family: 'Source Sans 3'; + font-style: normal; + font-weight: 800; + src: url('800.woff2') format('woff2'); +} + @font-face { font-family: 'Source Sans 3'; font-style: italic; - font-weight: 200; - src: url('200italic.woff2') format('woff2'); + font-weight: 400; + src: url('italic.woff2') format('woff2'); } @font-face { @@ -50,8 +64,8 @@ @font-face { font-family: 'Source Sans 3'; font-style: italic; - font-weight: 800; - src: url('800italic.woff2') format('woff2'); + font-weight: 300; + src: url('300italic.woff2') format('woff2'); } @font-face { @@ -68,39 +82,25 @@ src: url('900italic.woff2') format('woff2'); } -@font-face { - font-family: 'Source Sans 3'; - font-style: normal; - font-weight: 900; - src: url('900.woff2') format('woff2'); -} - @font-face { font-family: 'Source Sans 3'; font-style: italic; - font-weight: 500; - src: url('500italic.woff2') format('woff2'); + font-weight: 700; + src: url('700italic.woff2') format('woff2'); } @font-face { font-family: 'Source Sans 3'; font-style: normal; - font-weight: 300; - src: url('300.woff2') format('woff2'); -} - -@font-face { - font-family: 'Source Sans 3'; - font-style: italic; - font-weight: 300; - src: url('300italic.woff2') format('woff2'); + font-weight: 600; + src: url('600.woff2') format('woff2'); } @font-face { font-family: 'Source Sans 3'; - font-style: italic; - font-weight: 400; - src: url('italic.woff2') format('woff2'); + font-style: normal; + font-weight: 200; + src: url('200.woff2') format('woff2'); } @font-face { diff --git a/resources/fluidbookpublication/fonts/SourceSans/italic.woff2 b/resources/fluidbookpublication/fonts/SourceSans/italic.woff2 index 8f49b37f0..abe62bbcf 100644 Binary files a/resources/fluidbookpublication/fonts/SourceSans/italic.woff2 and b/resources/fluidbookpublication/fonts/SourceSans/italic.woff2 differ diff --git a/resources/fluidbookpublication/fonts/SourceSans/regular.woff2 b/resources/fluidbookpublication/fonts/SourceSans/regular.woff2 index 9b30ac9d5..2850fe163 100644 Binary files a/resources/fluidbookpublication/fonts/SourceSans/regular.woff2 and b/resources/fluidbookpublication/fonts/SourceSans/regular.woff2 differ