From: vincent@cubedesigners.com Date: Thu, 2 May 2019 16:48:37 +0000 (+0000) Subject: wip #2656 @2 X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=3cd98b4411cb0d6ddd8709042af69693eee379a3;p=cubeextranet.git wip #2656 @2 --- diff --git a/inc/ws/Util/html5/mobilefirst/class.ws.html5.compiler.php b/inc/ws/Util/html5/mobilefirst/class.ws.html5.compiler.php index 26ca03a98..5696eaa25 100644 --- a/inc/ws/Util/html5/mobilefirst/class.ws.html5.compiler.php +++ b/inc/ws/Util/html5/mobilefirst/class.ws.html5.compiler.php @@ -294,7 +294,10 @@ class wsHTML5Compiler if ($this->book->parametres->mobileNavigationType === 'mobilefirst') { $this->initMobileFirst(); + }else{ + } + $this->initConfig(); $this->log('Defined dimensions'); } @@ -1165,7 +1168,7 @@ class wsHTML5Compiler if (!$ignore) { $ignore = array(); } else { - $ignore = split(',', $ignore); + $ignore = explode(',', $ignore); } if ($this->book->parametres->externalChaptersHTML != '') { @@ -1755,8 +1758,6 @@ class wsHTML5Compiler $cssHeight = $this->cssHeight; $cssScale = $this->cssScale; $w2 = ($cssWidth * 2) . 'px'; - - $h = $cssHeight . 'px'; $wm = ($this->width * $this->multiply) . 'px'; @@ -1783,22 +1784,6 @@ class wsHTML5Compiler $lessVariables['shadow-opacity'] = wsHTML5::colorToArray($this->theme->parametres->bookShadeColor)['opacity'] * 1.2; $lessVariables['edges-display'] = $this->_lessBoolean($this->theme->parametres->usePageEdges); - $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)') . '}'; - $res[] = '.portrait .doublePage._2d.axis_x.next{' . wsHTML5::writeCSSUA('transform', 'translate3d(' . $w . ',0,0)') . '}'; - $res[] = '.portrait .doublePage._2d.axis_x.prev{' . wsHTML5::writeCSSUA('transform', 'translate3d(-' . $w . ',0,0)') . '}'; - $res[] = '.doublePage._2d.axis_y.next{' . wsHTML5::writeCSSUA('transform', 'translate3d(0,' . $h . ',0)') . '}'; - $res[] = '.doublePage._2d.axis_y.prev{' . wsHTML5::writeCSSUA('transform', 'translate3d(0,-' . $h . ',0)') . '}'; - - - $left = $w; - - $res[] = '.doublePage._3d{left:' . $left . ';}'; - $res[] = '#links.right{left:-' . $left . ';}'; - $res[] = '.landscape .page.right{left:' . $left . '}'; - $lessVariables['page-number-color'] = wsHTML5::colorToCSS($this->theme->parametres->colorPageNumber); $lessVariables['display-page-number'] = $this->_lessBoolean($this->theme->parametres->displayPageNumber); $lessVariables['page-transition-duration'] = $this->book->parametres->mobileTransitionDuration . 's'; @@ -1941,6 +1926,7 @@ class wsHTML5Compiler #tooltip $lessVariables['tooltip-background'] = wsHTML5::colorToCSS($this->theme->parametres->tooltipBackColor); $lessVariables['tooltip-color'] = wsHTML5::colorToCSS($this->theme->parametres->tooltipTextColor); + $lessVariables['tooltip-font-size'] = 14 * ($this->theme->parametres->tooltipTextSize / 100); #fonts foreach ($this->cssfont as $hash => $item) {