wip #6606 @0:20

diff --git a/app/Models/FluidbookPublication.php b/app/Models/FluidbookPublication.php
index 0630596345a6a2a6401b9ada222e6d40ce7dd1d2..d4d71f46ca28817b08936b24df5c30d292a1f917 100644 (file)
--- a/app/Models/FluidbookPublication.php
+++ b/app/Models/FluidbookPublication.php
@@ -267,7 +267,7 @@ class FluidbookPublication extends ToolboxSettingsModel
         $this->setComposedAttributes();
         $this->checkHash();
 
-        $this->generateThumbnailsPreview(true);
+        $this->generateThumbnailsPreview();
         if ($this->_compositionUpdated) {
             FluidbookImagesPreprocess::dispatch($this->id);
         }

diff --git a/public/packages/fluidbook/toolbox/css/delivery.css b/public/packages/fluidbook/toolbox/css/delivery.css
index 80a52d1f405196ae7b38b8054e58c04ba1d92125..1c5c6547fc6a3170f55e402126bdf44ceba64b9f 100644 (file)
--- a/public/packages/fluidbook/toolbox/css/delivery.css
+++ b/public/packages/fluidbook/toolbox/css/delivery.css
@@ -20,6 +20,15 @@ body {
 .fw-semibold {
   font-weight: 600;
 }
+.featherlight .featherlight-close-icon {
+  background-color: rgba(27, 42, 78, 0.05) !important;
+  width: 64px !important;
+  height: 48px;
+  top: 30px !important;
+  right: 30px !important;
+  border-radius: 4px;
+  color: rgba(27, 42, 78, 0.4);
+}
 .delivery-anchor {
   margin-bottom: 55px;
 }
@@ -37,13 +46,18 @@ body {
   margin-bottom: 30px;
 }
 .delivery-glimpses .block {
-  background-color: rgba(70, 127, 207, 0.5);
+  background-color: rgba(70, 127, 207, 0.05);
   height: 354px;
   display: flex;
   justify-content: center;
   align-items: center;
   flex-direction: column;
 }
+.delivery-glimpses .preview-block {
+  border: 1px solid rgba(70, 127, 207, 0.2);
+  border-radius: 1px;
+  overflow: hidden;
+}
 .delivery-glimpses .preview-desktop {
   width: 100%;
   max-width: 454px;

diff --git a/public/packages/fluidbook/toolbox/css/delivery.css.map b/public/packages/fluidbook/toolbox/css/delivery.css.map
index 4df6b063e0fa8a5deb278fae557cfa9fde18fde5..eccadecf61b27026651ea337f0ad84130a687370 100644 (file)
--- a/public/packages/fluidbook/toolbox/css/delivery.css.map
+++ b/public/packages/fluidbook/toolbox/css/delivery.css.map
@@ -1 +1 @@
-{"version":3,"sources":["delivery.less"],"names":[],"mappings":"AAAA;AAAK;EACD,uBAAA;;AAGJ;EACI,qBAAA;;AAGJ,OAAQ;EACJ,iBAAA;;AAGJ;EACI,aAAA;;AACA,OAAC;EACG,4BAA4B,uBAA5B;;AAIR;EACI,QAAA;;AAGJ;EACI,gBAAA;;AAIA,SAAC;EACG,mBAAA;;AADJ,SAAC,OAEG,GAAE,IAAI;EACF,cAAc,kBAAd;;AAHR,SAAC,OAKG,GAAE;EACE,YAAA;EACA,oBAAA;;AAPR,SAAC,OASG;EACI,OAAO,WAAP;;AAGR,SAAC;EACG,mBAAA;;AADJ,SAAC,SAEG;EACI,yCAAA;EACA,aAAA;EACA,aAAA;EACA,uBAAA;EACA,mBAAA;EACA,sBAAA;;AARR,SAAC,SAUG;EACI,WAAA;EACA,gBAAA;;AAZR,SAAC,SAcG;EACI,WAAA;EACA,gBAAA;;AAhBR,SAAC,SAkBG;EACI,eAAA;;AAnBR,SAAC,SAqBG;EACI,kBAAA;;AAGR,SAAC;EACG,gBAAA;EACA,WAAA;EACA,iBAAA;EACA,gBAAA;EACA,SAAA;EACA,wBAAA;EACA,aAAA;;AACA,SARH,aAQI;EACG,cAAA;;AATR,SAAC,aAWG;EACI,aAAA;EACA,kBAAkB,WAAlB;EACA,kBAAA;EACA,mBAAA;EACA,kBAAA;;AAGR,SAAC;EACG,yCAAA;EACA,WAAA;EACA,YAAA;EACA,kBAAA;;AACA,SALH,QAKI;EACG,yBAAA;;AADJ,SALH,QAKI,iBAEG;EACI,2BAAA;;AAHR,SALH,QAKI,iBAKG;EACI,4BAAA;;AAXZ,SAAC,QAcG;EACI,WAAA;EACA,WAAA;EACA,aAAA;EACA,kBAAA;EACA,QAAA;;AAnBR,SAAC,QAqBG;EACI,kBAAA;EACA,eAAA;EACA,cAAA;;AAIR,SAAC;EACG,aAAA;EACA,gBAAA;EACA,kBAAA;;AAHJ,SAAC,aAIG;EACI,WAAA;EACA,YAAA;EACA,kBAAA;EACA,mBAAA;EACA,SAAA;EACA,QAAA;EACA,WAAW,qBAAX;;AAIR,SAAC,aACG;EACI,WAAA;EACA,SAAA;;AAKZ;EACI,SAAA;EACA,WAAA;EACA,WAAA;EACA,YAAA;EACA,qBAAA;EACA,kBAAA;;AAGJ;EACI,aAAa,eAAe,6BAA5B;EACA,aAAa,cAAe,2BAA5B;EACA,YAAY,eAAe,6BAA3B;EACA,WAAW,YAAe,uBAA1B;EACA,WAAW,cAAe,2BAA1B;EACA,WAAW,YAAe,uBAA1B;EACA,YAAY,YAAe,uBAA3B;EACA,aAAa,YAAe,uBAA5B;EACA,aAAa,YAAe,uBAA5B;EACA,aAAa,eAAe,6BAA5B;;EAGA,iBAAiB,eAAe,8BAAhC;EACA,gBAAgB,cAAe,gCAA/B;EACA,cAAc,eAAe,4BAA7B;EACA,aAAa,YAAe,6BAA5B;EACA,aAAa,cAAe,2BAA5B;EACA,cAAc,YAAe,yBAA7B;EACA,gBAAgB,YAAe,yBAA/B;EACA,iBAAiB,YAAe,yBAAhC;;EAGA,eAAe,YAAe,gCAA9B","file":"delivery.css"}
\ No newline at end of file
+{"version":3,"sources":["delivery.less"],"names":[],"mappings":"AAAA;AAAK;EACD,uBAAA;;AAGJ;EACI,qBAAA;;AAGJ,OAAQ;EACJ,iBAAA;;AAGJ;EACI,aAAA;;AACA,OAAC;EACG,4BAA4B,uBAA5B;;AAIR;EACI,QAAA;;AAGJ;EACI,gBAAA;;AAGJ,aAAc;EACV,wCAAA;EACA,sBAAA;EACA,YAAA;EACA,oBAAA;EACA,sBAAA;EACA,kBAAA;EACA,4BAAA;;AAIA,SAAC;EACG,mBAAA;;AADJ,SAAC,OAEG,GAAE,IAAI;EACF,cAAc,kBAAd;;AAHR,SAAC,OAKG,GAAE;EACE,YAAA;EACA,oBAAA;;AAPR,SAAC,OASG;EACI,OAAO,WAAP;;AAGR,SAAC;EACG,mBAAA;;AADJ,SAAC,SAEG;EACI,0CAAA;EACA,aAAA;EACA,aAAA;EACA,uBAAA;EACA,mBAAA;EACA,sBAAA;;AARR,SAAC,SAUG;EACI,yCAAA;EACA,kBAAA;EACA,gBAAA;;AAbR,SAAC,SAeG;EACI,WAAA;EACA,gBAAA;;AAjBR,SAAC,SAmBG;EACI,WAAA;EACA,gBAAA;;AArBR,SAAC,SAuBG;EACI,eAAA;;AAxBR,SAAC,SA0BG;EACI,kBAAA;;AAGR,SAAC;EACG,gBAAA;EACA,WAAA;EACA,iBAAA;EACA,gBAAA;EACA,SAAA;EACA,wBAAA;EACA,aAAA;;AACA,SARH,aAQI;EACG,cAAA;;AATR,SAAC,aAWG;EACI,aAAA;EACA,kBAAkB,WAAlB;EACA,kBAAA;EACA,mBAAA;EACA,kBAAA;;AAGR,SAAC;EACG,yCAAA;EACA,WAAA;EACA,YAAA;EACA,kBAAA;;AACA,SALH,QAKI;EACG,yBAAA;;AADJ,SALH,QAKI,iBAEG;EACI,2BAAA;;AAHR,SALH,QAKI,iBAKG;EACI,4BAAA;;AAXZ,SAAC,QAcG;EACI,WAAA;EACA,WAAA;EACA,aAAA;EACA,kBAAA;EACA,QAAA;;AAnBR,SAAC,QAqBG;EACI,kBAAA;EACA,eAAA;EACA,cAAA;;AAIR,SAAC;EACG,aAAA;EACA,gBAAA;EACA,kBAAA;;AAHJ,SAAC,aAIG;EACI,WAAA;EACA,YAAA;EACA,kBAAA;EACA,mBAAA;EACA,SAAA;EACA,QAAA;EACA,WAAW,qBAAX;;AAIR,SAAC,aACG;EACI,WAAA;EACA,SAAA;;AAKZ;EACI,SAAA;EACA,WAAA;EACA,WAAA;EACA,YAAA;EACA,qBAAA;EACA,kBAAA;;AAGJ;EACI,aAAa,eAAe,6BAA5B;EACA,aAAa,cAAe,2BAA5B;EACA,YAAY,eAAe,6BAA3B;EACA,WAAW,YAAe,uBAA1B;EACA,WAAW,cAAe,2BAA1B;EACA,WAAW,YAAe,uBAA1B;EACA,YAAY,YAAe,uBAA3B;EACA,aAAa,YAAe,uBAA5B;EACA,aAAa,YAAe,uBAA5B;EACA,aAAa,eAAe,6BAA5B;;EAGA,iBAAiB,eAAe,8BAAhC;EACA,gBAAgB,cAAe,gCAA/B;EACA,cAAc,eAAe,4BAA7B;EACA,aAAa,YAAe,6BAA5B;EACA,aAAa,cAAe,2BAA5B;EACA,cAAc,YAAe,yBAA7B;EACA,gBAAgB,YAAe,yBAA/B;EACA,iBAAiB,YAAe,yBAAhC;;EAGA,eAAe,YAAe,gCAA9B","file":"delivery.css"}
\ No newline at end of file

diff --git a/public/packages/fluidbook/toolbox/css/delivery.less b/public/packages/fluidbook/toolbox/css/delivery.less
index 1526e853bdb2e2753506e50119c5bf39db1d59df..f41b257c68d3b0451fde169b864c0921971a511e 100644 (file)
--- a/public/packages/fluidbook/toolbox/css/delivery.less
+++ b/public/packages/fluidbook/toolbox/css/delivery.less
@@ -25,6 +25,16 @@ html,body {
     font-weight: 600;
 }
 
+.featherlight .featherlight-close-icon {
+    background-color: rgba(27,42,78,.05) !important;
+    width: 64px !important;
+    height: 48px;
+    top: 30px !important;
+    right: 30px !important;
+    border-radius: 4px;
+    color: rgba(27,42,78,.4);
+}
+
 .delivery {
     &-anchor {
         margin-bottom: 55px;
@@ -42,13 +52,18 @@ html,body {
     &-glimpses {
         margin-bottom: 30px;
         .block {
-            background-color: rgba(70,127,207,.5);
+            background-color: rgba(70,127,207,.05);
             height: 354px;
             display: flex;
             justify-content: center;
             align-items: center;
             flex-direction: column;
         }
+        .preview-block {
+            border: 1px solid rgba(70,127,207,.2);
+            border-radius: 1px;
+            overflow: hidden;
+        }
         .preview-desktop {
             width: 100%;
             max-width: 454px;

diff --git a/resources/views/fluidbook_publication/delivery.blade.php b/resources/views/fluidbook_publication/delivery.blade.php
index 42ba9e014b237d88899daaf800b7b6348f339ecf..7fb53d35cc211592bd2f7cbd899ca65e7c379c3b 100644 (file)
--- a/resources/views/fluidbook_publication/delivery.blade.php
+++ b/resources/views/fluidbook_publication/delivery.blade.php
@@ -112,14 +112,18 @@
                             <div class="preview col-md-6">
                                 <p>Version Desktop</p>
                                 <div class="block">
-                                    <img class="preview-desktop" src="{{ $fluidbookDesktopPreview }}" />
+                                    <div class="preview-block">
+                                        <img class="preview-desktop" src="{{ $fluidbookDesktopPreview }}" />
+                                    </div>
                                     <a href="{{ $fluidbook->getPreviewURL() }}" target="_blank" class="btn btn-primary">Voir</a>
                                 </div>
                             </div>
                             <div class="preview col-md-3">
                                 <p>Version Mobile</p>
                                 <div class="block">
-                                    <img class="preview-mobile" src="{{ $fluidbookMobilePreview }}" />
+                                    <div class="preview-block">
+                                        <img class="preview-mobile" src="{{ $fluidbookMobilePreview }}" />
+                                    </div>
                                     <a href="#" data-featherlight="#scanBoxMobile" class="btn btn-primary">Voir</a>
                                 </div>
                                 @include('fluidbook_publication.qrcode_popup', ['id' => 'scanBoxMobile', 'text' => 'Mobile', 'qrcode' => $qrCodeMobile])
@@ -128,7 +132,9 @@
                                 <div class="preview col-md-3">
                                     <p>Version Mobile-first</p>
                                     <div class="block">
-                                        <img class="preview-mobile" src="{{ $fluidbookMobileFirstPreview }}" />
+                                        <div class="preview-block">
+                                            <img class="preview-mobile" src="{{ $fluidbookMobileFirstPreview }}" />
+                                        </div>
                                         <a href="#" data-featherlight="#scanBoxMobileFirst" class="btn btn-primary">Voir</a>
                                     </div>
                                     @include('fluidbook_publication.qrcode_popup', ['id' => 'scanBoxMobileFirst', 'text' => 'Mobile-first', 'qrcode' => $qrCodeMobileFirst])