wait #7419 @0:20

diff --git a/.docker/config/mariadb/connections.cnf b/.docker/config/mariadb/connections.cnf
index 801de4e2080e95f0384ee898bd58cb291c296c25..75c7ac47b133fd2c59060343ae4d73c7610c0f0c 100644 (file)
--- 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 dd6248a04938dbeef102f1725879c9b7622bd24c..16d2375945c39e615d9a48d450c92a59f49709bd 100644 (file)
--- 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 165e01e0ce8f5923a26945d913ff06d3da0e1520..5ea0de031ac8307f8466ffcd20bdcc6ceb81f56c 100644 (file)
--- 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 b2aca479415205863bc61ebee94680b946ded208..fae8070821a341dc288df88b28e195a797b581f5 100644 (file)
--- 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 0a6cff84b0bff88d7ae016328d355d5e321896fd..8c652b42adb72b1bc8b3c46265a0ffe741f001f2 100644 (file)
--- 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 (file)
index 0000000..e67deb5
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 (file)
index 0000000..a0cea95
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 (file)
index 0000000..488378e
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 (file)
index 0000000..275c5aa
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 (file)
index 0000000..2ec2627
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 (file)
index 0000000..130e126
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 (file)
index 0000000..19c8648
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 (file)
index 0000000..01a226d
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 (file)
index 0000000..e58218f
--- /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 (file)
index 0000000..b25031e
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 ed1d3fdd44beb222cb7e6cf3f5a4dfdd5c3521bb..54e3533c5616e9e61b8e3ac6afc4bed7c1617ff9 100644 (file)
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 a2a6357b87d073139b37267baaf9ea151db38572..524640f1ceb5c693a5ef4e87ce94173d8ee8140f 100644 (file)
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 030bb9847f0d35d3e7062282b28e7d045e8d6ca2..d225cb7136a47969dc7ad4d44eefcb42c99ec8e6 100644 (file)
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 67189067410854053e4d03767e8d2aaca8f29c8a..9d983d75c1193994ad7f991646596a121735d4da 100644 (file)
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 a3024033a500b6f8f0caf980b2f934635b6bda00..2add4a12741cd6546ed4ed3331479e13a2acca0c 100644 (file)
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 4c5fa50f2224c2a9a3d47f9b6124d6d9d0f29898..196d2e496604b09d470a710efdfcc5b865b2d556 100644 (file)
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 8366ffda1dbd918dcd50f40001985539357a862b..c7640e1636e4a05d254128c0972c9cda5e9741cd 100644 (file)
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 46294cd7be04bb2c1973a5e3aef04d13069a5d6c..012b5ccb3d07e414c2f22250a91ae350f88731a0 100644 (file)
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 574f7c02e334aa64b1fafff32d2e0e782f30517b..fdc86281a5b8d215fb2830a6a675778a7ec13199 100644 (file)
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 7d2d308463c37fb3168c6cb72d959ee48ef33307..dbaba7d6788e654c1b2ccbdde12c5dcab6d40377 100644 (file)
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 91239edbf9f16c72778a205dc3efe344ebb54448..e51cb8c785160b82877f3ffb6bf816976b82070d 100644 (file)
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 edcb1163ba434e279cfb64e20e86d855e19e3d83..363568968e8dab84b20b23afbe5a5a070dd75023 100644 (file)
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 3be55dd4f310e5fee9421a306e6b4ffb415f495b..df1a248c2ac4a8d9216a0c1e9729208b6304eeb5 100644 (file)
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 68009469e199428c274377acbbb5b8b1afdb3d62..1ebbac00a94513723f98089e61fd90b4b559816e 100644 (file)
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 208d96fd499cbc0d05746101b7a62953d4aa8560..01e83b559d88a37b3b874376de13b9b2394eadad 100644 (file)
--- 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 8f49b37f0acb215034cd5dab51008c60bad8f825..abe62bbcf58f872491f82203b80776c943d12b3f 100644 (file)
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 9b30ac9d591856eff47155b1b2a52e41d4bfcdf6..2850fe163255184f2fa9990d87640c0ff08ea29d 100644 (file)
Binary files a/resources/fluidbookpublication/fonts/SourceSans/regular.woff2 and b/resources/fluidbookpublication/fonts/SourceSans/regular.woff2 differ