From 805163a13887ea569ce0f34faf5e47b97d8deb43 Mon Sep 17 00:00:00 2001 From: "stephen@cubedesigners.com" Date: Tue, 3 Oct 2017 09:45:01 +0000 Subject: [PATCH] Merge master changes to burgermenu branch. WIP #807 @0.5 --- .../burgermenu/class.ws.html5.compiler.php | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/inc/ws/Util/html5/burgermenu/class.ws.html5.compiler.php b/inc/ws/Util/html5/burgermenu/class.ws.html5.compiler.php index 1541e237b..6a206ed98 100644 --- a/inc/ws/Util/html5/burgermenu/class.ws.html5.compiler.php +++ b/inc/ws/Util/html5/burgermenu/class.ws.html5.compiler.php @@ -273,6 +273,7 @@ class wsHTML5Compiler { $time = $currenttime - $this->logtime; $log = $step . ' | ' . round($time, 3) . 's' . "\n"; fwrite($this->logfp, $log); + fflush($this->logfp); $this->logtime = $currenttime; } @@ -1066,7 +1067,11 @@ class wsHTML5Compiler { $ext = CubeIT_Files::getExtension($referencesFile); if ($ext == 'xlsx') { $this->config->basketReferences = wsUtil::excelToArray($referencesFile); + if ($this->book->parametres->customLinkClass == 'AtlanticDownloadLink') { + $this->config->basketReferences = wsUtil::atlanticReferences($this->config->basketReferences, $this->vdir . '/local/', array($this, 'log')); + } } + $this->log("Done cart references"); } } $this->config->rasterizePages = cubeArray::parseRange($this->config->rasterizePages); @@ -1291,7 +1296,9 @@ class wsHTML5Compiler { $lessVariables['book-page-width'] = $w; $lessVariables['book-page-height'] = $h; - $res[] = '.portrait #pages,.portrait .doublePage.page,.page,.doublePage._3d,#shadow>div{width:' . $w . ';max-width:' . $w . ';height:' . $h . ';max-height:' . $h . '}'; + $lessVariables['shadow-opacity'] = wsHTML5::colorToArray($this->theme->parametres->bookShadeColor)['opacity'] * 1.2; + + $res[] = '.portrait #pages,.portrait .doublePage.page,.page,.doublePage._3d{width:' . $w . ';max-width:' . $w . ';height:' . $h . ';max-height:' . $h . '}'; $res[] = '.doublePage,#pages,#links,#searchHighlights{width:' . $w2 . ';max-width:' . $w2 . ';height:' . $h . ';max-height:' . $h . '}'; $res[] = '.landscape .doublePage._2d.axis_x.next{' . wsHTML5::writeCSSUA('transform', 'translate3d(' . $w2 . ',0,0)') . '}'; $res[] = '.landscape .doublePage._2d.axis_x.prev{' . wsHTML5::writeCSSUA('transform', 'translate3d(-' . $w2 . ',0,0)') . '}'; @@ -1302,7 +1309,6 @@ class wsHTML5Compiler { $res[] = '.doublePage._3d{left:' . $w . ';}'; $res[] = '#links.right{left:-' . $w . ';}'; - $res[] = '.landscape #shadow>div.right{left: ' . $w . ';}'; $res[] = '.landscape .page.right{left:' . $w . '}'; $lessVariables['page-number-color'] = wsHTML5::colorToCSS($this->theme->parametres->colorPageNumber); @@ -1333,7 +1339,7 @@ class wsHTML5Compiler { // Theme $shade = '.page .shade{'; - $shade .= 'opacity:' . ($this->theme->parametres->shadeAlpha / 100) . ';'; + $shade .= 'opacity:' . min(($this->theme->parametres->shadeAlpha * 2) / 100, 1) . ';'; $shade .= '}'; $res[] = $shade; @@ -1396,13 +1402,6 @@ class wsHTML5Compiler { // Audio description buttons $res[] = '.audio-description-button{background-color:' . wsHTML5::colorToCSS($this->theme->parametres->couleurA) . ';}'; - - // Book shadow - $shadowColor = wsHTML5::colorToCSS($this->theme->parametres->bookShadeColor); - if ($shadowColor != 'transparent') { - $res[] = '#shadow>div{' . wsHTML5::writeCSSUA('box-shadow', '0 0 20px ' . $shadowColor) . '}'; - } - $lessVariables['links-color'] = wsHTML5::colorToCSS($this->theme->parametres->linksColor); // Links Styles -- 2.39.5