From a081527d1f5210a52652ffd443fb0c8f3679c030 Mon Sep 17 00:00:00 2001 From: "vincent@cubedesigners.com" Date: Wed, 11 Sep 2013 14:16:49 +0000 Subject: [PATCH] --- inc/ws/Util/html5/class.ws.html5.compiler.php | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/inc/ws/Util/html5/class.ws.html5.compiler.php b/inc/ws/Util/html5/class.ws.html5.compiler.php index af38b4777..2018bb846 100644 --- a/inc/ws/Util/html5/class.ws.html5.compiler.php +++ b/inc/ws/Util/html5/class.ws.html5.compiler.php @@ -974,8 +974,8 @@ class wsHTML5Compiler { $navTop = ($cssHeight - 40 - 100) / 2; - $res[] = '.portrait #pages,.portrait .doublePage.page,.page,.portrait #shadow,#shadow.single,.doublePage._3d{width:' . $w . ';max-width:' . $w . ';height:' . $h . ';max-height:' . $h . '}'; - $res[] = '.doublePage,#pages,#links,.landscape #shadow.double{width:' . $w2 . ';max-width:' . $w2 . ';height:' . $h . ';max-height:' . $h . '}'; + $res[] = '.portrait #pages,.portrait .doublePage.page,.page,.doublePage._3d,#shadow>div{width:' . $w . ';max-width:' . $w . ';height:' . $h . ';max-height:' . $h . '}'; + $res[] = '.doublePage,#pages,#links{width:' . $w2 . ';max-width:' . $w2 . ';height:' . $h . ';max-height:' . $h . '}'; $res[] = '.landscape .doublePage._2d.axis_x.next{' . self::writeCSSUA('transform', 'translate3d(' . $w2 . ',0,0)') . '}'; $res[] = '.landscape .doublePage._2d.axis_x.prev{' . self::writeCSSUA('transform', 'translate3d(-' . $w2 . ',0,0)') . '}'; $res[] = '.portrait .doublePage._2d.axis_x.next{' . self::writeCSSUA('transform', 'translate3d(' . $w . ',0,0)') . '}'; @@ -985,8 +985,7 @@ class wsHTML5Compiler { $res[] = '.doublePage._3d{left:' . $w . ';}'; $res[] = '#links.right{left:-' . $w . ';}'; - $res[] = '.landscape #shadow.single.right{left: ' . $w . ';}'; - $res[] = '.landscape #shadow.single.right{left: ' . $w . ';}'; + $res[] = '.landscape #shadow>div.right{left: ' . $w . ';}'; $res[] = '.landscape .page.right{left:' . $w . '}'; if ($this->theme->parametres->displayPageNumber) { $res[] = '#pagesnumbers{top:' . $h . ';color:' . self::colorToCSS($this->theme->parametres->colorPageNumber) . '}'; @@ -1024,13 +1023,18 @@ class wsHTML5Compiler { $res[] = $shade; // Search field + $searchColor=self::colorToCSS($this->theme->parametres->couleurS); + $searchBackColor=self::colorToCSS($this->theme->parametres->searchFieldColor); $search = '#q{'; - $search.='color:' . self::colorToCSS($this->theme->parametres->couleurS) . ';'; - $search.='background-color:' . self::colorToCSS($this->theme->parametres->searchFieldColor) . ';'; + $search.='color:' .$searchColor . ';'; + $search.='background-color:' . $searchBackColor . ';'; if ($this->theme->parametres->searchShadeAlpha > 0) { $search.=self::writeCSSUA('box-shadow', '1px 1px 4px rgba(0,0,0,' . ($this->theme->parametres->searchShadeAlpha / 100) . ')') . ' inset;'; } $search.='}'; + $search.='#searchHints,.hint{color:'.$searchColor.';background-color:'.$searchBackColor.';}'; + $search.='.hint:hover{color:'.$searchBackColor.';background-color:'.$searchColor.';}'; + $res[] = $search; // Background @@ -1074,7 +1078,7 @@ class wsHTML5Compiler { // Book shadow $shadowColor = self::colorToCSS($this->theme->parametres->bookShadeColor); if ($shadowColor != 'transparent') { - $res[] = '#shadow{' . self::writeCSSUA('box-shadow', '0 0 20px ' . $shadowColor) . '}'; + $res[] = '#shadow>div{' . self::writeCSSUA('box-shadow', '0 0 20px ' . $shadowColor) . '}'; } // Links Styles -- 2.39.5